Merge branch 'dev/ptrottier/fix_nodes' into 'main'

Fixed Nodes for latest ComfyUI Releases

See merge request lightspeedrtx/lss-ai-tools/comfyui-rtx_remix!25

Author: SmokedPete

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+- Update nodes to be compatible with the renamed models
 
 ### Fixed
 

nodes/ingestion.py

@@ -108,7 +108,7 @@ def ingest_texture(
                 headers=HEADER_LSS_REMIX_VERSION_1_0,
             )
             check_response_status_code(r)
-            output_folder = json.loads(r.text).get("asset_path", {})
+            output_folder = json.loads(r.text).get("directory_path", {})
 
         full_output_folder, filename, _counter, _subfolder, _filename_prefix = folder_paths.get_save_image_path(
             texture_name, folder_paths.get_output_directory(), texture[0].shape[1], texture[0].shape[0]

nodes/layers.py

@@ -108,6 +108,10 @@ def execute(
         parent_layer_id: str | None = None,
         directories: str = "",
     ) -> tuple[str]:
+        # Handle None case for parent_layer_id
+        if parent_layer_id is None:
+            parent_layer_id = ""
+        
         layer_id_dir = pathlib.Path(parent_layer_id).parent
         if directories:
             layer_id_dir = layer_id_dir / directories
@@ -169,7 +173,7 @@ def create_layer(
         set_edit_target: bool = True,
         parent_layer_id: str | None = None,
         create_or_insert: bool = True,
-    ) -> str:
+    ) -> tuple[str]:
         if not self.enable_this_node:  # noqa
             return ("",)
         payload = {
@@ -314,7 +318,9 @@ def execute(
         regex_filter: str = "",
     ) -> tuple[list[str], list[str], bool]:
         if not self.enable_this_node:  # noqa
-            return ([], [], False)
+            # Return non-empty lists even when disabled to avoid ComfyUI empty list bug
+            return ([""], [""], False)
+        
         layer_types_list = [t.strip() for t in layer_types.split(",")]
         params = {
             "layer_types": layer_types_list,
@@ -334,13 +340,14 @@ def execute(
         check_response_status_code(r)
 
         layer_ids: list[str] = []
-        layer_types: list[str] = []
+        layer_types_output: list[str] = []
 
         layers = json.loads(r.text).get("layers", [])
         if not layers and crash_if_not_exist:
             raise ValueError("No layers found. Please check the parameters of your node")
         if not layers and not crash_if_not_exist:
-            return (layer_ids, layer_types, False)
+            # Return non-empty lists with placeholder values to avoid ComfyUI empty list bug
+            return ([""], [""], False)
 
         seen: set[str] = set()
         layers_to_process = collections.deque(layers)
@@ -353,11 +360,17 @@ def execute(
             seen.add(layer_id)
             if not regex_filter or re.match(regex_filter, layer_id):
                 layer_ids.append(layer_id)
-                layer_types.append(stringify_layer_type(layer["layer_type"]))
+                layer_types_output.append(stringify_layer_type(layer["layer_type"]))
             if sublayers:
                 layers_to_process.extend(layer["children"])
 
-        return (layer_ids, layer_types, bool(layer_ids))
+        # Ensure we never return empty lists to avoid ComfyUI execution bug
+        if not layer_ids:
+            layer_ids = [""]
+            layer_types_output = [""]
+            return (layer_ids, layer_types_output, False)
+
+        return (layer_ids, layer_types_output, bool(layer_ids))
 
     @classmethod
     def IS_CHANGED(cls, **kwargs):  # noqa N802

nodes/textures.py

@@ -150,7 +150,7 @@ def get_texture_prims_assets(
             payload["asset_hashes"] = [item.strip() for item in asset_hashes.split(",")]
         if texture_types is not None:
             payload["texture_types"] = [item.strip() for item in texture_types.split(",")]
-        if layer_id is not None:
+        if layer_id is not None and layer_id.strip():
             payload["layer_identifier"] = posix(layer_id)
 
         address, port = self.context  # noqa
@@ -350,7 +350,7 @@ def get_attr_from_texture_type(self, usd_attribute: str, texture_type: str):
             headers=HEADER_LSS_REMIX_VERSION_1_0,
         )
         check_response_status_code(r)
-        result_texture_types = json.loads(r.text).get("asset_paths", [])
+        result_texture_types = json.loads(r.text).get("prim_paths", [])
 
         if not result_texture_types:
             raise ValueError(

nodes/utils.py

@@ -53,12 +53,17 @@ def check_response_status_code(response: requests.Response) -> None:
     try:
         response.raise_for_status()
     except requests.exceptions.HTTPError as err:
-        r = response.json()
-        _logger.error(f"Requested URL: {response.url}\n" f"Raw Response: \n\n{pprint.pformat(r)}\n")  # noqa
+        # Only try to parse JSON when there's an error
+        try:
+            r = response.json()
+            _logger.error(f"Requested URL: {response.url}\n" f"Raw Response: \n\n{pprint.pformat(r)}\n")  # noqa
+        except (ValueError, requests.exceptions.JSONDecodeError):
+            # If response is not JSON, just log the text
+            _logger.error(f"Requested URL: {response.url}\n" f"Raw Response: \n\n{response.text}\n")  # noqa
         raise err
 
 
 def posix(layer_id: str | None) -> str:
     if layer_id is None:
-        return layer_id
+        return ""
     return pathlib.Path(layer_id).as_posix()

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-rtx-remix"
 description = "Use ComfyUI with RTX Remix to remaster classic games [a/https://github.com/NVIDIAGameWorks/rtx-remix](https://github.com/NVIDIAGameWorks/rtx-remix)"
-version = "1.0.0"
+version = "1.0.1"
 license = {file = "LICENSE"}
 dependencies = ["numpy", "pillow>=10.0.1", "requests", "torch"]