ComfyStream Release 0.0.5

.editorconfig

@@ -9,6 +9,19 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[.gitignore]
+insert_final_newline = unset
+
+[*.py]
+indent_size = 4
+
+[workflows/comfy*/*.json]
+insert_final_newline = unset
+
 [Dockerfile*]
-indent_style = tab
-indent_size = 8
+indent_size = 4
+
+[*.{md,txt,mkdn}]
+indent_size = 4
+indent_size = unset
+trim_trailing_whitespace = false

.github/codeql-config.yaml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - "docker/"

.github/workflows/comfyui-base.yaml

@@ -2,19 +2,13 @@ name: Build and push comfyui-base docker image
 
 on:
   pull_request:
-    paths:
-      - docker/Dockerfile.base
-      - src/comfystream/scripts/
-      - configs/
-      - .github/workflows/comfyui-base.yaml
+    paths-ignore:
+      - "ui/*"
     branches:
       - main
   push:
-    paths:
-      - docker/Dockerfile.base
-      - src/comfystream/scripts/
-      - configs/
-      - .github/workflows/comfyui-base.yaml
+    paths-ignore:
+      - "ui/*"
     branches:
       - main
     tags:

.github/workflows/test.yaml

@@ -0,0 +1,86 @@
+name: Test project
+
+on:
+  pull_request:
+    branches:
+      - "main"
+  push:
+    branches:
+      - "main"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  codeql:
+    name: Perform CodeQL analysis
+    if: ${{ github.repository == 'livepeer/comfystream' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: typescript,javascript,python
+          config-file: ./.github/codeql-config.yaml
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+
+
+  editorconfig:
+    name: Run editorconfig checker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          # Check https://github.com/livepeer/go-livepeer/pull/1891
+          # for ref value discussion
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Install editorconfig-checker
+        uses: editorconfig-checker/action-editorconfig-checker@main
+
+      - name: Run editorconfig checker against the repo
+        if: false
+        # disabled editorconfig lint rule for now
+        run: editorconfig-checker --format github-actions
+
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          # Check https://github.com/livepeer/go-livepeer/pull/1891
+          # for ref value discussion
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install '.[dev]'
+
+      - name: Run tests
+        run: pytest --cov --verbose --showlocals
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CI_CODECOV_TOKEN }}
+          name: ${{ github.event.repository.name }}

configs/nodes.yaml

@@ -73,5 +73,5 @@ nodes:
   comfyui-stream-pack:
     name: "ComfyUI Stream Pack"
     url: "https://github.com/livepeer/ComfyUI-Stream-Pack"
-    branch: "expose_feature_bank_to_comfyui"
+    branch: "main"
     type: "utility"

nodes/web/js/comfystream_ui_preview_node.js

@@ -111,25 +111,10 @@ app.registerExtension({
                     });
                 });
 
-                // Update iframe size
-                this.updateIframeSize();
 
                 return result;
             };
 
-            // Override the resize method to allow both expanding and shrinking
-            nodeType.prototype.onResize = function(size) {
-                // Update the size
-                this.size[0] = size[0];
-                this.size[1] = size[1];
-
-                // Update the iframe size
-                this.updateIframeSize();
-
-                // Force canvas update
-                this.setDirtyCanvas(true, true);
-            };
-
             // Add a helper method to update iframe size
             nodeType.prototype.updateIframeSize = function() {
                 if (this.iframeWidget) {

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfystream"
 description = "Build Live AI Video with ComfyUI"
-version = "0.0.4"
+version = "0.0.5"
 license = { file = "LICENSE" }
 dependencies = [
     "asyncio",
@@ -15,10 +15,11 @@ dependencies = [
     "toml",
     "twilio",
     "prometheus_client",
+    "librosa"
 ]
 
 [project.optional-dependencies]
-dev = ["pytest"]
+dev = ["pytest", "pytest-cov"]
 
 [project.urls]
 repository = "https://github.com/yondonfu/comfystream"
@@ -33,4 +34,4 @@ package-dir = {"" = "src"}
 packages = {find = {where = ["src", "nodes"]}}
 
 [tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
+dependencies = {file = ["requirements.txt"]}

requirements.txt

@@ -5,3 +5,4 @@ aiohttp
 toml
 twilio
 prometheus_client
+librosa

src/comfystream/client.py

@@ -45,7 +45,8 @@ async def run_prompt(self, prompt_index: int):
 
     async def cleanup(self):
         async with self.cleanup_lock:
-            for task in self.running_prompts.values():
+            tasks_to_cancel = list(self.running_prompts.values())
+            for task in tasks_to_cancel:
                 task.cancel()
                 try:
                     await task
@@ -54,7 +55,11 @@ async def cleanup(self):
             self.running_prompts.clear()
 
             if self.comfy_client.is_running:
-                await self.comfy_client.__aexit__()
+                try:
+                    await self.comfy_client.__aexit__()
+                except Exception as e:
+                    logger.error(f"Error during ComfyClient cleanup: {e}")
+
 
             await self.cleanup_queues()
             logger.info("Client cleanup complete")
@@ -110,77 +115,105 @@ async def get_available_nodes(self):
                     for node_id, node in prompt.items() 
                 }
                 nodes_info = {}
-                
+
                 # Only process nodes until we've found all the ones we need
                 for class_type, node_class in nodes.NODE_CLASS_MAPPINGS.items():
                     if not remaining_nodes:  # Exit early if we've found all needed nodes
                         break
-                        
+
                     if class_type not in needed_class_types:
                         continue
-                        
+
                     # Get metadata for this node type (same as original get_node_metadata)
                     input_data = node_class.INPUT_TYPES() if hasattr(node_class, 'INPUT_TYPES') else {}
                     input_info = {}
-                    
+
                     # Process required inputs
                     if 'required' in input_data:
                         for name, value in input_data['required'].items():
-                            if isinstance(value, tuple) and len(value) == 2:
-                                input_type, config = value
-                                input_info[name] = {
-                                    'type': input_type,
-                                    'required': True,
-                                    'min': config.get('min', None),
-                                    'max': config.get('max', None),
-                                    'widget': config.get('widget', None)
-                                }
+                            if isinstance(value, tuple):
+                                if len(value) == 1 and isinstance(value[0], list):
+                                    # Handle combo box case where value is ([option1, option2, ...],)
+                                    input_info[name] = {
+                                        'type': 'combo',
+                                        'value': value[0],  # The list of options becomes the value
+                                    }
+                                elif len(value) == 2:
+                                    input_type, config = value
+                                    input_info[name] = {
+                                        'type': input_type,
+                                        'required': True,
+                                        'min': config.get('min', None),
+                                        'max': config.get('max', None),
+                                        'widget': config.get('widget', None)
+                                    }
+                                elif len(value) == 1:
+                                    # Handle simple type case like ('IMAGE',)
+                                    input_info[name] = {
+                                        'type': value[0]
+                                    }
                             else:
                                 logger.error(f"Unexpected structure for required input {name}: {value}")
-                    
-                    # Process optional inputs
+
+                    # Process optional inputs with same logic
                     if 'optional' in input_data:
                         for name, value in input_data['optional'].items():
-                            if isinstance(value, tuple) and len(value) == 2:
-                                input_type, config = value
-                                input_info[name] = {
-                                    'type': input_type,
-                                    'required': False,
-                                    'min': config.get('min', None),
-                                    'max': config.get('max', None),
-                                    'widget': config.get('widget', None)
-                                }
+                            if isinstance(value, tuple):
+                                if len(value) == 1 and isinstance(value[0], list):
+                                    # Handle combo box case where value is ([option1, option2, ...],)
+                                    input_info[name] = {
+                                        'type': 'combo',
+                                        'value': value[0],  # The list of options becomes the value
+                                    }
+                                elif len(value) == 2:
+                                    input_type, config = value
+                                    input_info[name] = {
+                                        'type': input_type,
+                                        'required': False,
+                                        'min': config.get('min', None),
+                                        'max': config.get('max', None),
+                                        'widget': config.get('widget', None)
+                                    }
+                                elif len(value) == 1:
+                                    # Handle simple type case like ('IMAGE',)
+                                    input_info[name] = {
+                                        'type': value[0]
+                                    }
                             else:
                                 logger.error(f"Unexpected structure for optional input {name}: {value}")
-                    
+
                     # Now process any nodes in our prompt that use this class_type
                     for node_id in list(remaining_nodes):
                         node = prompt[node_id]
                         if node.get('class_type') != class_type:
                             continue
-                            
+
                         node_info = {
                             'class_type': class_type,
                             'inputs': {}
                         }
-                        
+
                         if 'inputs' in node:
                             for input_name, input_value in node['inputs'].items():
+                                input_metadata = input_info.get(input_name, {})
                                 node_info['inputs'][input_name] = {
                                     'value': input_value,
-                                    'type': input_info.get(input_name, {}).get('type', 'unknown'),
-                                    'min': input_info.get(input_name, {}).get('min', None),
-                                    'max': input_info.get(input_name, {}).get('max', None),
-                                    'widget': input_info.get(input_name, {}).get('widget', None)
+                                    'type': input_metadata.get('type', 'unknown'),
+                                    'min': input_metadata.get('min', None),
+                                    'max': input_metadata.get('max', None),
+                                    'widget': input_metadata.get('widget', None)
                                 }
-
+                                # For combo type inputs, include the list of options
+                                if input_metadata.get('type') == 'combo':
+                                    node_info['inputs'][input_name]['value'] = input_metadata.get('value', [])
+
                         nodes_info[node_id] = node_info
                         remaining_nodes.remove(node_id)
 
                     all_prompts_nodes_info[prompt_index] = nodes_info
-            
+
             return all_prompts_nodes_info
-            
+
         except Exception as e:
             logger.error(f"Error getting node info: {str(e)}")
             return {}

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "private": true,
   "scripts": {
     "dev": "cross-env NEXT_PUBLIC_DEV=true next dev",