migrate to data models for all routes

comfyui_manager/data_models/__init__.py

@@ -42,7 +42,13 @@ from .generated_models import (
     ManagerPackInstallType,
     ManagerPack,
     InstallPackParams,
+    UpdatePackParams,
     UpdateAllPacksParams,
+    UpdateComfyUIParams,
+    FixPackParams,
+    UninstallPackParams,
+    DisablePackParams,
+    EnablePackParams,
     QueueStatus,
     ManagerMappings,
     ModelMetadata,
@@ -91,7 +97,13 @@ __all__ = [
     "ManagerPackInstallType",
     "ManagerPack",
     "InstallPackParams",
+    "UpdatePackParams",
     "UpdateAllPacksParams",
+    "UpdateComfyUIParams",
+    "FixPackParams",
+    "UninstallPackParams",
+    "DisablePackParams",
+    "EnablePackParams",
     "QueueStatus",
     "ManagerMappings",
     "ModelMetadata",

comfyui_manager/data_models/generated_models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.yaml
-#   timestamp: 2025-06-08T08:07:38+00:00
+#   timestamp: 2025-06-13T00:37:21+00:00
 
 from __future__ import annotations
 
@@ -23,12 +23,6 @@ class Kind(str, Enum):
     install_model = 'install-model'
 
 
-class QueueTaskItem(BaseModel):
-    ui_id: str = Field(..., description='Unique identifier for the task')
-    client_id: str = Field(..., description='Client identifier that initiated the task')
-    kind: Kind = Field(..., description='Type of task being performed')
-
-
 class StatusStr(str, Enum):
     success = 'success'
     error = 'error'
@@ -154,6 +148,49 @@ class UpdateAllPacksParams(BaseModel):
     ui_id: Optional[str] = Field(None, description='Task ID - generated internally')
 
 
+class UpdatePackParams(BaseModel):
+    node_name: str = Field(..., description='Name of the node package to update')
+    node_ver: Optional[str] = Field(
+        None, description='Current version of the node package'
+    )
+
+
+class UpdateComfyUIParams(BaseModel):
+    is_stable: Optional[bool] = Field(
+        True,
+        description='Whether to update to stable version (true) or nightly (false)',
+    )
+    target_version: Optional[str] = Field(
+        None,
+        description='Specific version to switch to (for version switching operations)',
+    )
+
+
+class FixPackParams(BaseModel):
+    node_name: str = Field(..., description='Name of the node package to fix')
+    node_ver: str = Field(..., description='Version of the node package')
+
+
+class UninstallPackParams(BaseModel):
+    node_name: str = Field(..., description='Name of the node package to uninstall')
+    is_unknown: Optional[bool] = Field(
+        False, description='Whether this is an unknown/unregistered package'
+    )
+
+
+class DisablePackParams(BaseModel):
+    node_name: str = Field(..., description='Name of the node package to disable')
+    is_unknown: Optional[bool] = Field(
+        False, description='Whether this is an unknown/unregistered package'
+    )
+
+
+class EnablePackParams(BaseModel):
+    cnr_id: str = Field(
+        ..., description='ComfyUI Node Registry ID of the package to enable'
+    )
+
+
 class QueueStatus(BaseModel):
     total_count: int = Field(
         ..., description='Total number of tasks (pending + running)'
@@ -358,6 +395,23 @@ class BatchExecutionRecord(BaseModel):
     )
 
 
+class QueueTaskItem(BaseModel):
+    ui_id: str = Field(..., description='Unique identifier for the task')
+    client_id: str = Field(..., description='Client identifier that initiated the task')
+    kind: Kind = Field(..., description='Type of task being performed')
+    params: Union[
+        InstallPackParams,
+        UpdatePackParams,
+        UpdateAllPacksParams,
+        UpdateComfyUIParams,
+        FixPackParams,
+        UninstallPackParams,
+        DisablePackParams,
+        EnablePackParams,
+        ModelMetadata,
+    ]
+
+
 class TaskHistoryItem(BaseModel):
     ui_id: str = Field(..., description='Unique identifier for the task')
     client_id: str = Field(..., description='Client identifier that initiated the task')

comfyui_manager/glob/utils/formatting_utils.py

@@ -1,5 +1,6 @@
 import locale
 import sys
+import re
 
 
 def handle_stream(stream, prefix):
@@ -19,3 +20,41 @@ def handle_stream(stream, prefix):
                 print(prefix, msg, end="", file=sys.stderr)
             else:
                 print(prefix, msg, end="")
+
+
+def convert_markdown_to_html(input_text):
+    pattern_a = re.compile(r"\[a/([^]]+)]\(([^)]+)\)")
+    pattern_w = re.compile(r"\[w/([^]]+)]")
+    pattern_i = re.compile(r"\[i/([^]]+)]")
+    pattern_bold = re.compile(r"\*\*([^*]+)\*\*")
+    pattern_white = re.compile(r"%%([^*]+)%%")
+
+    def replace_a(match):
+        return f"<a href='{match.group(2)}' target='blank'>{match.group(1)}</a>"
+
+    def replace_w(match):
+        return f"<p class='cm-warn-note'>{match.group(1)}</p>"
+
+    def replace_i(match):
+        return f"<p class='cm-info-note'>{match.group(1)}</p>"
+
+    def replace_bold(match):
+        return f"<B>{match.group(1)}</B>"
+
+    def replace_white(match):
+        return f"<font color='white'>{match.group(1)}</font>"
+
+    input_text = (
+        input_text.replace("\\[", "&#91;")
+        .replace("\\]", "&#93;")
+        .replace("<", "&lt;")
+        .replace(">", "&gt;")
+    )
+
+    result_text = re.sub(pattern_a, replace_a, input_text)
+    result_text = re.sub(pattern_w, replace_w, result_text)
+    result_text = re.sub(pattern_i, replace_i, result_text)
+    result_text = re.sub(pattern_bold, replace_bold, result_text)
+    result_text = re.sub(pattern_white, replace_white, result_text)
+
+    return result_text.replace("\n", "<BR>")