Merge branch 'dev/nkendallbar/logic-properties-panel' into 'main'

REMIX-4815: Logic properties panel Improvements

See merge request lightspeedrtx/lightspeed-kit!1067

Author: nxkb

CHANGELOG.md

@@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - REMIX-4766: Added input validation to ensure a valid graph prim name is provided for new graphs
 - REMIX-4804: Fixed Remix Logic Graph Creation Logic Inconstancy Across Editor, Property Panel, and Right Click Menus
 - Cleanup Github runners before packaging Toolkit
+- REMIX-4815: Fixed default values, tooltips, and flexible type handling in the Remix Logic properties panel
 
 ### Removed
 - Removed Waypoint support based on deprecated kit sample waypoint extension

source/extensions/lightspeed.trex.logic.core/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versioning is used: https://semver.org/
-version = "1.0.0"
+version = "1.1.0"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["Nicolas Kendall-Bar <[email protected]>"]

source/extensions/lightspeed.trex.logic.core/docs/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.1.0]
+### Added
+- Added `get_ogn_default_value()` utility for retrieving OGN attribute defaults as USD types
+
+### Fixed
+- Fixed duplicate graph entries when multiple paths contain the same graph
+
 ## [1.0.0]
 ### Added
 - Created extension for managing logic graphs

source/extensions/lightspeed.trex.logic.core/lightspeed/trex/logic/core/__init__.py

@@ -15,6 +15,7 @@
 * limitations under the License.
 """
 
+from .attributes import get_ogn_default_value
 from .graphs import LogicGraphCore
 
-__all__ = ["LogicGraphCore"]
+__all__ = ["LogicGraphCore", "get_ogn_default_value"]

source/extensions/lightspeed.trex.logic.core/lightspeed/trex/logic/core/attributes.py

@@ -0,0 +1,76 @@
+"""
+* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+"""
+
+import json
+from typing import Any
+
+import omni.graph.core as og
+import omni.graph.tools.ogn as ogn
+
+
+def _get_type_default(og_type: og.AttributeType) -> Any:
+    """Get the default value for an OGN type when no explicit default is defined."""
+    # Arrays default to empty list (except string/path which are uchar[])
+    if og_type.array_depth > 0:
+        if og_type.base_type == og.BaseDataType.UCHAR and og_type.role in (
+            og.AttributeRole.TEXT,
+            og.AttributeRole.PATH,
+        ):
+            return ""
+        return []
+
+    # Determine base value for the type
+    if og_type.base_type == og.BaseDataType.BOOL:
+        val_base = False
+    elif og_type.base_type == og.BaseDataType.TOKEN:
+        val_base = ""
+    else:
+        val_base = 0
+
+    # Vectors/matrices: expand base value
+    if og_type.tuple_count > 1:
+        if og_type.role in (
+            og.AttributeRole.FRAME,
+            og.AttributeRole.MATRIX,
+            og.AttributeRole.TRANSFORM,
+        ):
+            # Identity matrix
+            dim = 2 if og_type.tuple_count == 4 else 3 if og_type.tuple_count == 9 else 4
+            return [[1 if i == j else 0 for j in range(dim)] for i in range(dim)]
+        return [val_base] * og_type.tuple_count
+
+    return val_base
+
+
+def get_ogn_default_value(attr: og.Attribute) -> Any:
+    """Get an OGN attribute's default value as a USD-compatible Python type.
+
+    Uses og.python_value_as_usd() for proper type conversion (Gf.Vec3f, etc.)
+    """
+    og_type = attr.get_resolved_type()
+    default_str = attr.get_metadata(ogn.MetadataKeys.DEFAULT)
+
+    if default_str is not None:
+        try:
+            py_val = json.loads(default_str)
+            return og.python_value_as_usd(og_type, py_val)
+        except (json.JSONDecodeError, TypeError, ValueError):
+            return default_str
+
+    # No explicit default - use type's default value
+    py_val = _get_type_default(og_type)
+    return og.python_value_as_usd(og_type, py_val)

source/extensions/lightspeed.trex.logic.core/lightspeed/trex/logic/core/graphs.py

@@ -81,10 +81,10 @@ def create_graph_at_path(
     @staticmethod
     def get_existing_logic_graphs(stage: Usd.Stage, paths: list[Sdf.Path]) -> list[Usd.Prim]:
         """Get the names of the existing logic graphs under provided paths"""
-        existing_graphs: list[Usd.Prim] = []
+        existing_graphs: set[Usd.Prim] = set()
         for path in paths:
             root_prim = stage.GetPrimAtPath(path)
             for prim in Usd.PrimRange(root_prim):
                 if prim.GetTypeName() == OMNI_GRAPH_TYPE:
-                    existing_graphs.append(prim)
+                    existing_graphs.add(prim)
         return sorted(existing_graphs, key=lambda x: x.GetPath())

source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml

@@ -1,5 +1,5 @@
 [package]
-version = "1.2.5"
+version = "1.3.0"
 authors = ["Nicolas Kendall-Bar <[email protected]>"]
 title = "Remix Logic Properties Widget"
 description = "Properties panel for RemixLogic prim types"

source/extensions/lightspeed.trex.properties_pane.logic.widget/docs/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.3.0]
+### Added
+- Added better support for flexible OGN types (union/any) with read-only display and guidance text
+
+### Changed
+- Improved OGN attribute default value handling with proper USD type conversion
+- Disabled override deletion for OGN node attributes to prevent type removal
+
+### Fixed
+- Fixed panel rebuild targeting correct dynamic content frame
+
 ## [1.2.5]
 ### Changed
 - Replaced text buttons with icon buttons for edit and delete actions
@@ -44,4 +55,3 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [1.0.0]
 ### Added
 - Created
-

source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/setup_ui.py

@@ -30,6 +30,7 @@
 import omni.usd
 from lightspeed.common.constants import OMNI_GRAPH_NODE_TYPE, REGEX_MESH_TO_INSTANCE_SUB, GlobalEventNames
 from lightspeed.events_manager import get_instance as _get_event_manager_instance
+from lightspeed.trex.logic.core.attributes import get_ogn_default_value
 from lightspeed.trex.logic.core.graphs import LogicGraphCore
 from omni.flux.info_icon.widget import InfoIconWidget
 from omni.flux.property_widget_builder.delegates.string_value.file_picker import FilePicker
@@ -329,7 +330,7 @@ def _build_dynamic_content(self) -> None:
                 ui.Label("Existing Graphs", name="PropertiesWidgetLabel", height=0)
                 ui.Spacer(height=ui.Pixel(_SPACING_SM))
 
-            for graph in set(existing_graphs):
+            for graph in existing_graphs:
                 with ui.HStack(height=ui.Pixel(_ROW_HEIGHT), spacing=ui.Pixel(_SPACING_SM)):
                     relative_path = self._get_relative_path(graph.GetPath(), self._valid_target_paths)
                     ui.Label(
@@ -526,19 +527,19 @@ async def _deferred_refresh(
                 if not tooltip:
                     tooltip = attr.get_metadata(ogn.MetadataKeys.DESCRIPTION) or ""
 
-                default_value: Any = attr.get_metadata(ogn.MetadataKeys.DEFAULT)
+                default_value: Any = get_ogn_default_value(attr)
 
                 options: list[str] | None = None
                 allowed_tokens = attr.get_metadata(ogn.MetadataKeys.ALLOWED_TOKENS)
                 if allowed_tokens:
                     options = allowed_tokens.split(",")
 
+                is_input = attr_name.startswith(OGN_ATTR_PREFIX_INPUTS)
                 read_only = True
-                if attr_name.startswith(OGN_ATTR_PREFIX_INPUTS):
+                if is_input:
                     read_only = False
 
                 is_relationship = is_property_relationship(stage, attribute_paths[0])
-
                 if is_relationship:
                     # Build prim picker configuration (filters, path patterns, pagination, etc.)
                     node_path = str(prim.GetPath())
@@ -552,42 +553,63 @@ async def _deferred_refresh(
                         read_only=read_only,
                         ui_metadata=ui_metadata,
                     )
-                elif options:
-                    value_type_name = None
-                    ogn_type: og.AttributeType = attr.get_attribute_data().get_type()
-                    value_type_name_str: str = og.AttributeType.sdf_type_name_from_type(ogn_type)
-                    if value_type_name_str:
-                        value_type_name = Sdf.ValueTypeNames.Find(value_type_name_str)
-                    if not value_type_name:
-                        value_type_name = Sdf.ValueTypeNames.String
-
-                    attr_item = USDAttrListItem(
-                        self._context_name,
-                        attribute_paths,
-                        default_value,
-                        options,
-                        read_only=read_only,
-                        value_type_name=value_type_name,
-                        display_attr_names=[display_name],
-                        display_attr_names_tooltip=[tooltip],
-                    )
                 else:
                     value_type_name = None
-                    ogn_type: og.AttributeType = attr.get_attribute_data().get_type()
+                    ogn_type: og.AttributeType = attr.get_resolved_type()
+                    if ogn_type.base_type == og.BaseDataType.UNKNOWN:
+                        # Fall back to attribute data type for unresolved flexible types
+                        ogn_type = attr.get_attribute_data().get_type()
                     value_type_name_str: str = og.AttributeType.sdf_type_name_from_type(ogn_type)
                     if value_type_name_str:
                         value_type_name = Sdf.ValueTypeNames.Find(value_type_name_str)
                     if not value_type_name:
                         value_type_name = Sdf.ValueTypeNames.String
+                        default_value = str(default_value)
 
-                    attr_item = USDAttributeItem(
-                        self._context_name,
-                        attribute_paths,
-                        read_only=read_only,
-                        value_type_name=value_type_name,
-                        display_attr_names=[display_name],
-                        display_attr_names_tooltip=[tooltip],
+                    extended_type = attr.get_extended_type()
+                    is_flexible_type = extended_type in (
+                        og.ExtendedAttributeType.EXTENDED_ATTR_TYPE_UNION,
+                        og.ExtendedAttributeType.EXTENDED_ATTR_TYPE_ANY,
                     )
+                    if is_flexible_type:
+                        read_only = True
+                        if is_input:
+                            tooltip += "(Flexible Input - Set value and resolve type by connecting to a node's output)"
+                        else:
+                            tooltip += "(Flexible Output Type - Determined by connected input types)"
+                        if ogn_type.base_type == og.BaseDataType.UNKNOWN:
+                            if is_input:
+                                default_value = "Connect to a node output."
+                            else:
+                                default_value = "Unresolved: Connect flexible inputs"
+                        else:
+                            # If type is resolved, get the value from the connected port
+                            upstream_connections = attr.get_upstream_connections()
+                            if upstream_connections:
+                                default_value = upstream_connections[0].get()
+                            else:
+                                default_value = None
+                    if options:
+                        attr_item = USDAttrListItem(
+                            self._context_name,
+                            attribute_paths,
+                            default_value,
+                            options,
+                            read_only=read_only,
+                            value_type_name=value_type_name,
+                            display_attr_names=[display_name],
+                            display_attr_names_tooltip=[tooltip],
+                        )
+                    else:
+                        attr_item = USDAttributeItem(
+                            self._context_name,
+                            attribute_paths,
+                            default_value=default_value,
+                            read_only=read_only,
+                            value_type_name=value_type_name,
+                            display_attr_names=[display_name],
+                            display_attr_names_tooltip=[tooltip],
+                        )
 
                 # Collect items by group (but don't add to items list yet)
                 if group_name not in group_items:
@@ -671,8 +693,8 @@ def _delete_logic_graph(self, graph: Usd.Prim, x, y, b, m) -> None:
             return
         omni.kit.commands.execute("DeletePrimsCommand", paths=[str(graph.GetPath())])
         # Rebuild the UI to reflect the changes in the existing logic graphs
-        if self._root_frame:
-            self._root_frame.rebuild()
+        if self._dynamic_content_frame:
+            self._dynamic_content_frame.rebuild()
 
     @property
     def property_model(self):

source/extensions/omni.flux.property_widget_builder.model.usd/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versionning is used: https://semver.org/
-version = "2.21.2"
+version = "2.22.0"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["Damien Bataille <[email protected]>"]