Parse the supporting metadata and send to backend while publishing a node

Author: coderfromthenorth93

comfy_cli/registry/api.py

@@ -54,10 +54,18 @@ def publish_node_version(self, node_config: PyProjectConfig, token) -> PublishNo
                 "name": node_config.tool_comfy.display_name,
                 "license": license_json,
                 "repository": node_config.project.urls.repository,
+                "supported_os": node_config.project.supported_os,
+                "supported_accelerators": node_config.project.supported_accelerators,
+                "supported_comfyui_version": node_config.project.supported_comfyui_version,
+                "supported_comfyui_frontend_version": node_config.project.supported_comfyui_frontend_version,
             },
             "node_version": {
                 "version": node_config.project.version,
                 "dependencies": node_config.project.dependencies,
+                "supported_os": node_config.project.supported_os,
+                "supported_accelerators": node_config.project.supported_accelerators,
+                "supported_comfyui_version": node_config.project.supported_comfyui_version,
+                "supported_comfyui_frontend_version": node_config.project.supported_comfyui_frontend_version,
             },
         }
         print(request_body)

comfy_cli/registry/config_parser.py

@@ -1,4 +1,5 @@
 import os
+import re
 import subprocess
 from typing import Optional
 
@@ -87,6 +88,84 @@ def sanitize_node_name(name: str) -> str:
     return name
 
 
+def validate_and_extract_os_classifiers(classifiers: list) -> list:
+    os_classifiers = [c for c in classifiers if c.startswith("Operating System :: ")]
+    if not os_classifiers:
+        return []
+
+    os_values = [c[len("Operating System :: "):] for c in os_classifiers]
+    
+    valid_os_prefixes = {"Microsoft", "POSIX", "MacOS", "OS Independent"}
+    has_invalid_os = False
+    
+    for os_value in os_values:
+        if not any(os_value.startswith(prefix) for prefix in valid_os_prefixes):
+            has_invalid_os = True
+            break
+    
+    if has_invalid_os:
+        typer.echo(
+            'Warning: Invalid Operating System classifier found. Operating System classifiers must start with one of: "Microsoft", "POSIX", "MacOS", "OS Independent". '
+            'Examples: "Operating System :: Microsoft :: Windows", "Operating System :: POSIX :: Linux", "Operating System :: MacOS", "Operating System :: OS Independent". '
+            'No OS information will be populated.'
+        )
+        return []
+    else:
+        return os_values
+
+
+def validate_and_extract_accelerator_classifiers(classifiers: list) -> list:    
+    accelerator_classifiers = [c for c in classifiers if c.startswith("Environment ::")]
+    if not accelerator_classifiers:
+        return []
+    
+    accelerator_values = [c[len("Environment :: "):] for c in accelerator_classifiers]
+    
+    valid_accelerators = {
+        "GPU :: NVIDIA CUDA",
+        "GPU :: AMD ROCm",
+        "GPU :: Intel Arc", 
+        "NPU :: Huawei Ascend",
+        "GPU :: Apple Metal",
+    }
+    has_invalid_accelerator = False
+    
+    for accelerator_value in accelerator_values:
+        if accelerator_value not in valid_accelerators:
+            has_invalid_accelerator = True
+            break
+    
+    if has_invalid_accelerator:
+        typer.echo(
+            'Warning: Invalid Environment classifier found. Environment classifiers must be one of: '
+            '"Environment :: GPU :: NVIDIA CUDA", "Environment :: GPU :: AMD ROCm", "Environment :: GPU :: Intel Arc", '
+            '"Environment :: NPU :: Huawei Ascend", "Environment :: GPU :: Apple Metal". '
+            'No accelerator information will be populated.'
+        )
+        return []
+    else:
+        return accelerator_values
+
+
+def validate_version(version: str, field_name: str) -> str:
+    if not version:
+        return version
+    
+    version_pattern = r'^(?:(==|>=|<=|!=|~=|>|<|<>|=)\s*)?(\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+)?)?$'
+    
+    if not re.match(version_pattern, version):
+        typer.echo(
+            f'Warning: Invalid {field_name} format: "{version}". '
+            f'Version must follow the pattern: [operator][version] where operator is optional (==, >=, <=, !=, ~=, >, <, <>, =) '
+            f'and version is in format major.minor.patch[-suffix]. '
+            f'Examples: ">=1.0.0", "==2.1.0-beta", "1.5.2". '
+            f'No {field_name} will be populated.'
+        )
+        return ""
+    
+    return version
+
+
 def initialize_project_config():
     create_comfynode_config()
 
@@ -157,6 +236,26 @@ def extract_node_configuration(
     urls_data = project_data.get("urls", {})
     comfy_data = data.get("tool", {}).get("comfy", {})
 
+    dependencies = project_data.get("dependencies", [])
+    supported_comfyui_frontend_version = ""
+    for dep in dependencies:
+        if isinstance(dep, str) and dep.startswith("comfyui-frontend-package"):
+            supported_comfyui_frontend_version = dep
+            break
+
+    # Remove the ComfyUI-frontend dependency from the dependencies list
+    dependencies = [
+        dep for dep in dependencies if not (isinstance(dep, str) and dep.startswith("comfyui-frontend-package"))
+    ]
+
+    supported_comfyui_version = data.get("tool", {}).get("requires-comfyui", "")
+
+    classifiers = project_data.get("classifiers", [])
+    supported_os = validate_and_extract_os_classifiers(classifiers)
+    supported_accelerators = validate_and_extract_accelerator_classifiers(classifiers)
+    supported_comfyui_version = validate_version(supported_comfyui_version, "requires-comfyui")
+    supported_comfyui_frontend_version = validate_version(supported_comfyui_frontend_version, "comfyui-frontend-package")
+
     license_data = project_data.get("license", {})
     if isinstance(license_data, str):
         license = License(text=license_data)
@@ -182,14 +281,18 @@ def extract_node_configuration(
         description=project_data.get("description", ""),
         version=project_data.get("version", ""),
         requires_python=project_data.get("requires-python", ""),
-        dependencies=project_data.get("dependencies", []),
+        dependencies=dependencies,
         license=license,
         urls=URLs(
             homepage=urls_data.get("Homepage", ""),
             documentation=urls_data.get("Documentation", ""),
             repository=urls_data.get("Repository", ""),
             issues=urls_data.get("Issues", ""),
         ),
+        supported_os=supported_os,
+        supported_accelerators=supported_accelerators,
+        supported_comfyui_version=supported_comfyui_version,
+        supported_comfyui_frontend_version=supported_comfyui_frontend_version,
     )
 
     comfy = ComfyConfig(

comfy_cli/registry/types.py

@@ -69,7 +69,10 @@ class ProjectConfig:
     dependencies: List[str] = field(default_factory=list)
     license: License = field(default_factory=License)
     urls: URLs = field(default_factory=URLs)
-
+    supported_os: List[str] = field(default_factory=list)
+    supported_accelerators: List[str] = field(default_factory=list)
+    supported_comfyui_version: str = ""
+    supported_comfyui_frontend_version: str = ""
 
 @dataclass
 class PyProjectConfig: