Merge branch 'master' into feat/partner-nodes/tripo-remove-refine

Author: bigcat88

app/database/db.py

@@ -4,7 +4,7 @@
 from app.logger import log_startup_warning
 from utils.install_util import get_missing_requirements_message
 from filelock import FileLock, Timeout
-from comfy.cli_args import args
+from comfy.cli_args import args, database_default_path
 
 _DB_AVAILABLE = False
 Session = None
@@ -57,19 +57,66 @@ def get_alembic_config():
 
     config = Config(config_path)
     config.set_main_option("script_location", scripts_path)
-    config.set_main_option("sqlalchemy.url", args.database_url)
+    config.set_main_option("sqlalchemy.url", get_database_url())
 
     return config
 
 
+def get_database_url():
+    if args.database_url is not None:
+        return args.database_url
+
+    import folder_paths
+
+    db_path = os.path.join(folder_paths.get_user_directory(), "comfyui.db")
+    return f"sqlite:///{db_path}"
+
+
+def get_legacy_default_db_path():
+    return database_default_path
+
+
 def get_db_path():
-    url = args.database_url
+    url = get_database_url()
     if url.startswith("sqlite:///"):
-        return url.split("///")[1]
+        return url.split("///", 1)[1]
     else:
         raise ValueError(f"Unsupported database URL '{url}'.")
 
 
+def copy_legacy_default_db(db_path):
+    if args.database_url is not None:
+        return
+
+    legacy_db_path = get_legacy_default_db_path()
+    if legacy_db_path is None:
+        return
+
+    if os.path.abspath(legacy_db_path) == os.path.abspath(db_path):
+        return
+
+    if os.path.exists(db_path) or not os.path.exists(legacy_db_path):
+        return
+
+    backup_path = legacy_db_path + ".bak"
+    if os.path.exists(backup_path):
+        return
+
+    os.replace(legacy_db_path, backup_path)
+    shutil.copy(backup_path, db_path)
+    logging.info(
+        f"Renamed legacy database '{legacy_db_path}' to '{backup_path}' and copied it to '{db_path}'"
+    )
+
+
+def prepare_file_db_path(db_path):
+    db_dir = os.path.dirname(db_path)
+    if db_dir:
+        os.makedirs(db_dir, exist_ok=True)
+
+    copy_legacy_default_db(db_path)
+
+
 _db_lock = None
 
 def _acquire_file_lock(db_path):
@@ -97,7 +144,7 @@ def _is_memory_db(db_url):
 
 
 def init_db():
-    db_url = args.database_url
+    db_url = get_database_url()
     logging.debug(f"Database URL: {db_url}")
 
     if _is_memory_db(db_url):
@@ -134,6 +181,7 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 def _init_file_db(db_url):
     """Initialize a file-backed SQLite database using Alembic migrations."""
     db_path = get_db_path()
+    prepare_file_db_path(db_path)
     db_exists = os.path.exists(db_path)
 
     config = get_alembic_config()

comfy/cli_args.py

@@ -268,7 +268,7 @@ def is_valid_directory(path: str) -> str:
 database_default_path = os.path.abspath(
     os.path.join(os.path.dirname(__file__), "..", "user", "comfyui.db")
 )
-parser.add_argument("--database-url", type=str, default=f"sqlite:///{database_default_path}", help="Specify the database URL, e.g. for an in-memory database you can use 'sqlite:///:memory:'.")
+parser.add_argument("--database-url", type=str, default=None, help="Specify the database URL, e.g. for an in-memory database you can use 'sqlite:///:memory:'. Defaults to 'comfyui.db' in the effective user directory.")
 parser.add_argument("--enable-assets", action="store_true", help="Enable the assets system (API routes, database synchronization, and background scanning).")
 parser.add_argument("--enable-asset-hashing", action="store_true", help="Compute blake3 content hashes when scanning assets. Hashing enables future asset-portability features (deduplication, cross-machine model resolution) but adds startup cost and per-output cost on large models directories. Off by default; enable to opt in.")
 parser.add_argument("--feature-flag", type=str, action='append', default=[], metavar="KEY[=VALUE]", help="Set a server feature flag. Use KEY=VALUE to set an explicit value, or bare KEY to set it to true. Can be specified multiple times. Boolean values (true/false) and numbers are auto-converted. Examples: --feature-flag show_signin_button=true  or  --feature-flag show_signin_button")

comfy_api_nodes/apis/meshy.py

@@ -14,6 +14,7 @@ class InputShouldRemesh(TypedDict):
 class InputShouldTexture(TypedDict):
     should_texture: str
     enable_pbr: bool
+    texture_resolution: str
     texture_prompt: str
     texture_image: Input.Image | None
 
@@ -25,7 +26,7 @@ class MeshyTaskResponse(BaseModel):
 class MeshyTextToModelRequest(BaseModel):
     mode: str = Field("preview")
     prompt: str = Field(..., max_length=600)
-    art_style: str = Field(..., description="'realistic' or 'sculpture'")
+    art_style: str = Field(...)
     ai_model: str = Field(...)
     topology: str | None = Field(..., description="'quad' or 'triangle'")
     target_polycount: int | None = Field(..., ge=100, le=300000)
@@ -35,6 +36,7 @@ class MeshyTextToModelRequest(BaseModel):
     )
     symmetry_mode: str = Field(..., description="'auto', 'off' or 'on'")
     pose_mode: str = Field(...)
+    ultra_mode: bool = Field(False)
     seed: int = Field(...)
     moderation: bool = Field(False)
 
@@ -43,6 +45,7 @@ class MeshyRefineTask(BaseModel):
     mode: str = Field("refine")
     preview_task_id: str = Field(...)
     enable_pbr: bool | None = Field(...)
+    texture_resolution: str = Field(...)
     texture_prompt: str | None = Field(...)
     texture_image_url: str | None = Field(...)
     ai_model: str = Field(...)
@@ -61,7 +64,9 @@ class MeshyImageToModelRequest(BaseModel):
     )
     should_texture: bool = Field(...)
     enable_pbr: bool | None = Field(...)
+    texture_resolution: str | None = Field(None)
     pose_mode: str = Field(...)
+    ultra_mode: bool = Field(False)
     texture_prompt: str | None = Field(None, max_length=600)
     texture_image_url: str | None = Field(None)
     seed: int = Field(...)
@@ -80,6 +85,7 @@ class MeshyMultiImageToModelRequest(BaseModel):
     )
     should_texture: bool = Field(...)
     enable_pbr: bool | None = Field(...)
+    texture_resolution: str | None = Field(None)
     pose_mode: str = Field(...)
     texture_prompt: str | None = Field(None, max_length=600)
     texture_image_url: str | None = Field(None)
@@ -103,8 +109,10 @@ class MeshyTextureRequest(BaseModel):
     ai_model: str = Field(...)
     enable_original_uv: bool = Field(...)
     enable_pbr: bool = Field(...)
-    text_style_prompt: str | None = Field(...)
-    image_style_url: str | None = Field(...)
+    texture_resolution: str = Field(...)
+    text_style_prompt: str | None = Field(None)
+    image_style_url: str | None = Field(None)
+    multiview_image_urls: list[str] | None = Field(None)
 
 
 class MeshyModelsUrls(BaseModel):

comfy_api_nodes/apis/wan.py

@@ -184,6 +184,32 @@ class Wan27Text2VideoTaskCreationRequest(BaseModel):
     parameters: Wan27Text2VideoParametersField = Field(...)
 
 
+class Wan3MediaItem(BaseModel):
+    type: str = Field(...)
+    url: str = Field(...)
+
+
+class Wan3InputField(BaseModel):
+    prompt: str | None = Field(None)
+    media: list[Wan3MediaItem] | None = Field(None)
+
+
+class Wan3ParametersField(BaseModel):
+    resolution: str = Field(...)
+    ratio: str = Field(...)
+    duration: int = Field(..., ge=-1, le=30)
+    seed: int = Field(..., ge=0, le=2147483647)
+    audio: bool = Field(True)
+    prompt_extend: bool = Field(True)
+    watermark: bool = Field(False)
+
+
+class Wan3TaskCreationRequest(BaseModel):
+    model: str = Field(...)
+    input: Wan3InputField = Field(...)
+    parameters: Wan3ParametersField = Field(...)
+
+
 class TaskCreationOutputField(BaseModel):
     task_id: str = Field(...)
     task_status: str = Field(...)