Merge branch 'main' into draft-v4

Author: ltdrdata

comfyui_manager/legacy/share_3rdparty.py

@@ -337,8 +337,7 @@ async def share_art(request):
         content_type = assetFileType
 
         try:
-            from matrix_client.api import MatrixHttpApi
-            from matrix_client.client import MatrixClient
+            from nio import AsyncClient, LoginResponse, UploadResponse
 
             homeserver = 'matrix.org'
             if matrix_auth:
@@ -347,31 +346,81 @@ async def share_art(request):
             if not homeserver.startswith("https://"):
                 homeserver = "https://" + homeserver
 
-            client = MatrixClient(homeserver)
-            try:
-                token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
-                if not token:
-                    return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-            except Exception:
+            client = AsyncClient(homeserver, matrix_auth['username'])
+
+            # Login
+            login_resp = await client.login(matrix_auth['password'])
+            if not isinstance(login_resp, LoginResponse) or not login_resp.access_token:
+                await client.close()
                 return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
 
-            matrix = MatrixHttpApi(homeserver, token=token)
+            # Upload asset
             with open(asset_filepath, 'rb') as f:
-                mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
-
-            workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
-
+                upload_resp, _maybe_keys = await client.upload(f, content_type=content_type, filename=filename)
+                asset_data = f.seek(0) or f.read()  # get size for info below
+            if not isinstance(upload_resp, UploadResponse) or not upload_resp.content_uri:
+                await client.close()
+                return web.json_response({"error": "Failed to upload asset to Matrix."}, content_type='application/json', status=500)
+            mxc_url = upload_resp.content_uri
+
+            # Upload workflow JSON
+            import io
+            workflow_json_bytes = json.dumps(prompt['workflow']).encode('utf-8')
+            workflow_io = io.BytesIO(workflow_json_bytes)
+            upload_workflow_resp, _maybe_keys = await client.upload(workflow_io, content_type='application/json', filename='workflow.json')
+            workflow_io.seek(0)
+            if not isinstance(upload_workflow_resp, UploadResponse) or not upload_workflow_resp.content_uri:
+                await client.close()
+                return web.json_response({"error": "Failed to upload workflow to Matrix."}, content_type='application/json', status=500)
+            workflow_json_mxc_url = upload_workflow_resp.content_uri
+
+            # Send text message
             text_content = ""
             if title:
                 text_content += f"{title}\n"
             if description:
                 text_content += f"{description}\n"
             if credits:
                 text_content += f"\ncredits: {credits}\n"
-            matrix.send_message(comfyui_share_room_id, text_content)
-            matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
-            matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
-        except Exception:
+            await client.room_send(
+                room_id=comfyui_share_room_id,
+                message_type="m.room.message",
+                content={"msgtype": "m.text", "body": text_content}
+            )
+
+            # Send image
+            await client.room_send(
+                room_id=comfyui_share_room_id,
+                message_type="m.room.message",
+                content={
+                    "msgtype": "m.image",
+                    "body": filename,
+                    "url": mxc_url,
+                    "info": {
+                        "mimetype": content_type,
+                        "size": len(asset_data)
+                    }
+                }
+            )
+
+            # Send workflow JSON file
+            await client.room_send(
+                room_id=comfyui_share_room_id,
+                message_type="m.room.message",
+                content={
+                    "msgtype": "m.file",
+                    "body": "workflow.json",
+                    "url": workflow_json_mxc_url,
+                    "info": {
+                        "mimetype": "application/json",
+                        "size": len(workflow_json_bytes)
+                    }
+                }
+            )
+
+            await client.close()
+
+        except:
             import traceback
             traceback.print_exc()
             return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)

custom-node-list.json

@@ -5182,6 +5182,16 @@
             "install_type": "git-clone",
             "description": "Nodes:Bing Image Grabber, Zephyr chat, Hermes Chat"
         },
+        {
+            "author": "concarne000",
+            "title": "ComfyUI-Stacker",
+            "reference": "https://github.com/concarne000/ComfyUI-Stacker",
+            "files": [
+                "https://github.com/concarne000/ComfyUI-Stacker"
+            ],
+            "install_type": "git-clone",
+            "description": "Simple stack push/pop style nodes for images, strings, integers and generic objects (image batches, latents, face models etc)"
+        },
         {
             "author": "Aegis72",
             "title": "AegisFlow Utility Nodes",
@@ -27158,6 +27168,16 @@
             "install_type": "git-clone",
             "description": "ComfyUI-Lightx2vWrapper is an inference wrapper for Lightx2v designed for use with ComfyUI."
         },
+        {
+            "author": "GACLove",
+            "title": "ComfyUI-VFI",
+            "reference": "https://github.com/GACLove/ComfyUI-VFI",
+            "files": [
+                "https://github.com/GACLove/ComfyUI-VFI"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI-RIFE is an inference wrapper for RIFE designed for use with ComfyUI."
+        },
         {
             "author": "Yahweasel",
             "title": "ComfyUI-MinDalle",
@@ -29798,16 +29818,16 @@
             "description": "A custom node extension for ComfyUI that integrates Google's Veo 3 text-to-video generation capabilities."
         },
         {
-            "author": "BuimenLabo",
-            "title": "ComfyUI BuimenLabo - Unified Package",
+            "author": "builmenlabo",
+            "title": "ComfyUI builmenlabo - Unified Package",
             "id": "builmenlabo",
             "reference": "https://github.com/comnote-max/builmenlabo",
             "files": [
                 "https://github.com/comnote-max/builmenlabo"
             ],
             "install_type": "git-clone",
             "description": "Comprehensive collection of ComfyUI custom nodes: 🦙 Advanced LLM text generation with Llama-CPP (CPU/GPU acceleration), 🌐 Smart multi-language prompt translation (Google/DeepL/Yandex/Baidu), 🌍 20-language interface toggle, 📸 AI-powered Gemini pose analysis, 🎛️ Smart ControlNet management. Perfect unified package for AI artists and creators. Blog: https://note.com/hirodream44",
-            "nodename_pattern": "BuimenLabo",
+            "nodename_pattern": "builmenlabo",
             "tags": [
                 "LLM",
                 "translation",
@@ -29831,6 +29851,47 @@
             "install_type": "git-clone",
             "description": "ComfyUI custom nodes for interacting with the Gemini api for image and video generation prompting."
         },
+        {
+            "author": "GeraldWie",
+            "title": "ComfyUI-I2I-slim",
+            "reference": "https://github.com/GeraldWie/ComfyUI-I2I-slim",
+            "files": [
+                "https://github.com/GeraldWie/ComfyUI-I2I-slim"
+            ],
+            "install_type": "git-clone",
+            "description": "A lightweight version of the custom nodes originally developed by [a/ManglerFTW](https://github.com/ManglerFTW/ComfyI2I) for performing image-to-image tasks in ComfyUI."
+        },
+        {
+            "author": "tauraloke",
+            "title": "ComfyUI-Unfake-Pixels",
+            "reference": "https://github.com/tauraloke/ComfyUI-Unfake-Pixels",
+            "files": [
+                "https://github.com/tauraloke/ComfyUI-Unfake-Pixels"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI node for pixel art scaling. Automatically detects the pixel scale using an edge-aware method (Sobel filter + voting on tiles) and downscales the image to that pixel size, reducing color palette."
+        },
+        {
+            "author": "adrianschubek",
+            "title": "comfyui-zeug",
+            "reference": "https://github.com/adrianschubek/comfyui-zeug",
+            "files": [
+                "https://github.com/adrianschubek/comfyui-zeug"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui-zeug (German for 'gear' or 'stuff') is a collection of custom nodes for ComfyUI, designed to enhance functionality and provide additional features."
+        },
+        {
+            "author": "g0kuvonlange",
+            "title": "ComfyUI Load From URL",
+            "reference": "https://github.com/g0kuvonlange/ComfyUI-Load-From-URL",
+            "files": [
+                "https://github.com/g0kuvonlange/ComfyUI-Load-From-URL"
+            ],
+            "install_type": "git-clone",
+            "description": "A simple custom node for ComfyUI to load LoRAs and videos directly from a URL. Ideal for users hosting files on a server with publicly accessible URLs."
+        },
+