comfygit-core 0.4.0__tar.gz → 0.4.2__tar.gz

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfygit-core
-Version: 0.4.0
+Version: 0.4.2
 Summary: ComfyGit Core - Git-based ComfyUI environment manager
 Project-URL: Documentation, https://docs.comfygit.org/
 Project-URL: Repository, https://github.com/comfygit-ai/comfygit

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfygit-core"
-version = "0.4.0"
+version = "0.4.2"
 description = "ComfyGit Core - Git-based ComfyUI environment manager"
 readme = "README.md"
 requires-python = ">=3.10"

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/src/comfygit_core/analyzers/workflow_dependency_parser.py

@@ -7,9 +7,10 @@ from typing import TYPE_CHECKING
 from comfygit_core.repositories.workflow_repository import WorkflowRepository
 
 from ..configs.comfyui_models import MULTI_MODEL_WIDGET_CONFIGS
-from ..configs.model_config import ModelConfig
+from ..configs.model_config import ModelConfig, ModelLoaderWidgetMapping
 from ..logging.logging_config import get_logger
 from ..models.workflow import (
+    NodeInput,
     Workflow,
     WorkflowDependencies,
     WorkflowNode,
@@ -37,7 +38,7 @@ class WorkflowDependencyParser:
         builtin_versions_repository: ComfyUIBuiltinVersionsRepository | None = None,
         version_agnostic: bool = False,
     ):
-        self.model_config = model_config or ModelConfig.load()
+        self.model_config = model_config or ModelConfig.load(cec_path=cec_path)
         self.cec_path = cec_path
         self.builtin_versions_repository = builtin_versions_repository
         self.version_agnostic = version_agnostic
@@ -115,8 +116,7 @@ class WorkflowDependencyParser:
 
         Uses explicit extraction strategies:
         1. Extract from properties.models (preferred - has URLs for auto-download)
-        2. Extract from known multi-model node widget configs
-        3. Extract from known single-model loader widget config
+        2. Extract from configured/generated model-loader widget metadata
 
         Args:
             node_id: Scoped node ID from workflow.nodes dict key (e.g., "uuid:12" for subgraph nodes)
@@ -129,14 +129,11 @@ class WorkflowDependencyParser:
         if property_models:
             refs.extend(self._extract_from_properties_models(node_id, node_info, property_models))
 
-        # Strategy 2: Multi-model nodes (explicit widget indices from config)
-        if node_info.type in MULTI_MODEL_WIDGET_CONFIGS:
-            widget_refs = self._extract_multi_model_widgets(node_id, node_info)
-            refs = self._merge_model_refs(refs, widget_refs)
-
-        # Strategy 3: Standard single-model loaders
-        elif self.model_config.is_model_loader_node(node_info.type):
-            widget_refs = self._extract_single_model_widget(node_id, node_info)
+        # Strategy 2: Generated/static model loader widget metadata
+        if self.model_config.is_model_loader_node(node_info.type):
+            widget_refs = self._extract_model_loader_widgets(node_id, node_info)
+            if not widget_refs:
+                widget_refs = self._extract_static_fallback_widgets(node_id, node_info)
             refs = self._merge_model_refs(refs, widget_refs)
 
         return refs
@@ -181,42 +178,117 @@ class WorkflowDependencyParser:
                 return idx
         return None
 
-    def _extract_multi_model_widgets(self, node_id: str, node_info: WorkflowNode) -> list[WorkflowNodeWidgetRef]:
-        """Extract models from multi-model nodes using MULTI_MODEL_WIDGET_CONFIGS.
+    def _find_widget_index_for_input_name(
+        self,
+        inputs: list[NodeInput],
+        widget_name: str,
+    ) -> int | None:
+        """Find frontend widget index from ComfyUI input metadata."""
+        widget_idx = 0
+        for input_info in inputs:
+            if input_info.link is not None:
+                continue
+
+            widget_metadata = input_info.widget or {}
+            if widget_metadata:
+                candidate_names = {input_info.name}
+                metadata_name = widget_metadata.get("name")
+                if isinstance(metadata_name, str):
+                    candidate_names.add(metadata_name)
+
+                if widget_name in candidate_names:
+                    return widget_idx
+
+                widget_idx += 1
+
+        return None
+
+    def _resolve_model_widget_index(
+        self,
+        node_info: WorkflowNode,
+        mapping: ModelLoaderWidgetMapping,
+        mapping_count: int,
+    ) -> int | None:
+        if mapping.widget_name:
+            index = self._find_widget_index_for_input_name(
+                node_info.inputs,
+                mapping.widget_name,
+            )
+            if index is not None:
+                return index
+
+        if mapping.widget_index is not None:
+            return mapping.widget_index
 
-        Note: Unlike pattern matching, multi-model configs explicitly define which
-        widgets contain models, so we trust them without extension filtering.
-        This allows CheckpointLoader to capture both .safetensors and .yaml configs.
-        """
-        refs = []
-        widget_indices = MULTI_MODEL_WIDGET_CONFIGS.get(node_info.type, [])
         widgets = node_info.widgets_values or []
+        if mapping_count == 1 and len(widgets) == 1:
+            return 0
 
-        for widget_idx in widget_indices:
-            if widget_idx < len(widgets) and widgets[widget_idx]:
-                value = widgets[widget_idx]
-                if isinstance(value, str) and value.strip():
-                    refs.append(WorkflowNodeWidgetRef(
-                        node_id=node_id,
-                        node_type=node_info.type,
-                        widget_index=widget_idx,
-                        widget_value=value
-                    ))
-        return refs
+        return None
 
-    def _extract_single_model_widget(self, node_id: str, node_info: WorkflowNode) -> list[WorkflowNodeWidgetRef]:
-        """Extract model from standard single-model loader nodes."""
-        refs = []
-        widget_idx = self.model_config.get_widget_index_for_node(node_info.type)
+    def _extract_model_loader_widgets(
+        self,
+        node_id: str,
+        node_info: WorkflowNode,
+    ) -> list[WorkflowNodeWidgetRef]:
+        """Extract model refs from configured/generated model loader widgets."""
+        refs: list[WorkflowNodeWidgetRef] = []
+        mappings = self.model_config.get_model_loader_widgets(node_info.type)
         widgets = node_info.widgets_values or []
 
-        if widget_idx < len(widgets) and widgets[widget_idx]:
+        for mapping in mappings:
+            widget_idx = self._resolve_model_widget_index(
+                node_info,
+                mapping,
+                len(mappings),
+            )
+            if widget_idx is None or widget_idx >= len(widgets):
+                continue
+
+            value = widgets[widget_idx]
+            if not isinstance(value, str) or not value.strip():
+                continue
+
             refs.append(WorkflowNodeWidgetRef(
                 node_id=node_id,
                 node_type=node_info.type,
                 widget_index=widget_idx,
-                widget_value=widgets[widget_idx]
+                widget_value=value,
+                property_directory=mapping.directories[0] if mapping.directories else None,
             ))
+
+        return refs
+
+    def _extract_static_fallback_widgets(
+        self,
+        node_id: str,
+        node_info: WorkflowNode,
+    ) -> list[WorkflowNodeWidgetRef]:
+        """Fallback for workflows without frontend input widget metadata."""
+        refs: list[WorkflowNodeWidgetRef] = []
+        widgets = node_info.widgets_values or []
+        widget_indices = MULTI_MODEL_WIDGET_CONFIGS.get(
+            node_info.type,
+            [self.model_config.get_widget_index_for_node(node_info.type)],
+        )
+        directories = self.model_config.get_directories_for_node(node_info.type)
+
+        for widget_idx in widget_indices:
+            if widget_idx >= len(widgets):
+                continue
+            value = widgets[widget_idx]
+            if not isinstance(value, str) or not value.strip():
+                continue
+            refs.append(
+                WorkflowNodeWidgetRef(
+                    node_id=node_id,
+                    node_type=node_info.type,
+                    widget_index=widget_idx,
+                    widget_value=value,
+                    property_directory=directories[0] if directories else None,
+                )
+            )
+
         return refs
 
     def _merge_model_refs(

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/src/comfygit_core/caching/workflow_cache.py

@@ -36,7 +36,7 @@ logger = get_logger(__name__)
 # - Resolution: Change node ID format (e.g., subgraph scoping), WorkflowNodeWidgetRef structure, etc.
 # - Model index: Hash algorithm changes (blake3 -> xxhash)
 # Migration: Wipes cache and rebuilds (cache is ephemeral)
-SCHEMA_VERSION = 5  # Invalidate after model hash algorithm change (blake3 -> xxhash)
+SCHEMA_VERSION = 6  # Invalidate after custom-node consensus mapping context change
 
 
 class CachedWorkflowAnalysis:
@@ -766,6 +766,24 @@ class WorkflowCacheRepository:
             for node_type in node_types
             if node_type in custom_map
         }
+        workflow_configs = self.pyproject_manager.workflows.get_all_with_resolutions()
+        consensus_candidates: dict[str, set[str | bool]] = {}
+        for other_name, workflow_data in workflow_configs.items():
+            if other_name == workflow_name:
+                continue
+
+            other_custom_map = workflow_data.get("custom_node_map", {})
+            for node_type in node_types:
+                if node_type in other_custom_map:
+                    package_id = other_custom_map[node_type]
+                    if isinstance(package_id, (str, bool)):
+                        consensus_candidates.setdefault(node_type, set()).add(package_id)
+
+        context["consensus_custom_mappings"] = {
+            node_type: next(iter(package_ids))
+            for node_type, package_ids in consensus_candidates.items()
+            if node_type not in custom_map and len(package_ids) == 1
+        }
         step_elapsed = (time.perf_counter() - step_start) * 1000
         logger.debug(f"[CONTEXT] Step 1 (custom mappings) took {step_elapsed:.2f}ms")
 
@@ -774,7 +792,7 @@ class WorkflowCacheRepository:
         step_start = time.perf_counter()
 
         # Read nodes list from workflow config (written by apply_resolution)
-        workflow_config = self.pyproject_manager.workflows.get_all_with_resolutions().get(workflow_name, {})
+        workflow_config = workflow_configs.get(workflow_name, {})
         relevant_packages = set(workflow_config.get('nodes', []))
 
         # Get global package metadata
@@ -797,7 +815,25 @@ class WorkflowCacheRepository:
         workflow_models = self.pyproject_manager.workflows.get_workflow_models(workflow_name)
         model_pyproject_data = {}
         for manifest_model in workflow_models:
-            for ref in manifest_model.nodes:
+            nodes = getattr(manifest_model, "nodes", None) or []
+            if not nodes:
+                key_source = (
+                    getattr(manifest_model, "relative_path", None)
+                    or getattr(manifest_model, "hash", None)
+                    or getattr(manifest_model, "filename", None)
+                    or "unknown"
+                )
+                model_pyproject_data[f"manual:{key_source}"] = {
+                    "hash": manifest_model.hash,
+                    "status": manifest_model.status,
+                    "criticality": manifest_model.criticality,
+                    "sources": manifest_model.sources,
+                    "relative_path": manifest_model.relative_path,
+                    "declared_by": getattr(manifest_model, "declared_by", None),
+                }
+                continue
+
+            for ref in nodes:
                 ref_key = f"{ref.node_id}_{ref.widget_index}"
                 model_pyproject_data[ref_key] = {
                     "hash": manifest_model.hash,

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/src/comfygit_core/configs/__init__.py

@@ -2,7 +2,7 @@
 
 from .comfyui_builtin_nodes import COMFYUI_BUILTIN_NODES
 from .comfyui_models import COMFYUI_MODELS_CONFIG, MULTI_MODEL_WIDGET_CONFIGS
-from .model_config import ModelConfig
+from .model_config import ModelConfig, ModelLoaderWidgetMapping
 from .package_config import PackageConfigManager
 
 __all__ = [
@@ -10,6 +10,6 @@ __all__ = [
     "COMFYUI_MODELS_CONFIG",
     "MULTI_MODEL_WIDGET_CONFIGS",
     "ModelConfig",
+    "ModelLoaderWidgetMapping",
     "PackageConfigManager",
 ]
-

{comfygit_core-0.4.0 → comfygit_core-0.4.2}/src/comfygit_core/configs/comfyui_models.py

@@ -23,6 +23,7 @@ COMFYUI_MODELS_CONFIG = {
     ],
     "standard_directories": [
         "audio_encoders",
+        "background_removal",
         "checkpoints",
         "clip",
         "clip_vision",
@@ -32,10 +33,13 @@ COMFYUI_MODELS_CONFIG = {
         "diffusers",
         "diffusion_models",
         "embeddings",
+        "frame_interpolation",
         "gligen",
         "hypernetworks",
+        "latent_upscale_models",
         "loras",
         "model_patches",
+        "optical_flow",
         "photomaker",
         "style_models",
         "text_encoders",
@@ -51,6 +55,7 @@ COMFYUI_MODELS_CONFIG = {
         "unCLIPCheckpointLoader": ["checkpoints"],
         "ImageOnlyCheckpointLoader": ["checkpoints"],
         "VAELoader": ["vae", "vae_approx"],
+        "AudioEncoderLoader": ["audio_encoders"],
         "LoraLoader": ["loras"],
         "LoraLoaderModelOnly": ["loras"],
         "CLIPLoader": ["clip"],
@@ -63,10 +68,15 @@ COMFYUI_MODELS_CONFIG = {
         "DiffControlNetLoader": ["controlnet"],
         "StyleModelLoader": ["style_models"],
         "UpscaleModelLoader": ["upscale_models"],
+        "LatentUpscaleModelLoader": ["latent_upscale_models"],
         "GLIGENLoader": ["gligen"],
         "HypernetworkLoader": ["hypernetworks"],
         "PhotoMakerLoader": ["photomaker"],
         "DiffusersLoader": ["diffusers"],
+        "FrameInterpolationModelLoader": ["frame_interpolation"],
+        "OpticalFlowLoader": ["optical_flow"],
+        "LoadBackgroundRemovalModel": ["background_removal"],
+        "ModelPatchLoader": ["model_patches"],
     },
     "node_widget_indices": {"CheckpointLoader": 1},
 }