From 7d5160f92c7688519ce2e062be036218bc18cd0d Mon Sep 17 00:00:00 2001 From: pythongosssss <125205205+pythongosssss@users.noreply.github.com> Date: Sun, 1 Jun 2025 15:45:15 +0100 Subject: [PATCH] Tidy --- alembic_db/versions/e9c714da8d57_init.py | 4 +--- app/model_processor.py | 6 +++--- comfy/cli_args.py | 2 +- folder_paths.py | 8 ++++---- tests-unit/app_test/model_processor_test.py | 8 ++++---- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/alembic_db/versions/e9c714da8d57_init.py b/alembic_db/versions/e9c714da8d57_init.py index 1a296104..995365f9 100644 --- a/alembic_db/versions/e9c714da8d57_init.py +++ b/alembic_db/versions/e9c714da8d57_init.py @@ -1,7 +1,7 @@ """init Revision ID: e9c714da8d57 -Revises: +Revises: Create Date: 2025-05-30 20:14:33.772039 """ @@ -20,7 +20,6 @@ depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### op.create_table('model', sa.Column('type', sa.Text(), nullable=False), sa.Column('path', sa.Text(), nullable=False), @@ -32,7 +31,6 @@ def upgrade() -> None: sa.Column('date_added', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True), sa.PrimaryKeyConstraint('type', 'path') ) - # ### end Alembic commands ### def downgrade() -> None: diff --git a/app/model_processor.py b/app/model_processor.py index 6cf8fd6f..5018c2fe 100644 --- a/app/model_processor.py +++ b/app/model_processor.py @@ -64,7 +64,7 @@ class ModelProcessor: .filter(Model.path == model_relative_path) .first() ) - + def _ensure_source_url(self, session, model, source_url): if model.source_url is None: model.source_url = source_url @@ -171,9 +171,9 @@ class ModelProcessor: try: if not can_create_session(): return - + dispose_session = False - + if session is None: session = create_session() dispose_session = True diff --git a/comfy/cli_args.py b/comfy/cli_args.py index 154491fe..ce20eb40 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -204,7 +204,7 @@ parser.add_argument( ) database_default_path = os.path.abspath( - os.path.join(os.path.dirname(__file__), "..", "user", "comfyui.db") + 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("--disable-model-processing", action="store_true", help="Disable model file processing, e.g. computing hashes and extracting metadata.") diff --git a/folder_paths.py b/folder_paths.py index 5b5554a3..e4916eff 100644 --- a/folder_paths.py +++ b/folder_paths.py @@ -303,23 +303,23 @@ def get_full_path_or_raise(folder_name: str, filename: str) -> str: def get_relative_path(full_path: str) -> tuple[str, str] | None: """Convert a full path back to a type-relative path. - + Args: full_path: The full path to the file - + Returns: tuple[str, str] | None: A tuple of (model_type, relative_path) if found, None otherwise """ global folder_names_and_paths full_path = os.path.normpath(full_path) - + for model_type, (paths, _) in folder_names_and_paths.items(): for base_path in paths: base_path = os.path.normpath(base_path) if full_path.startswith(base_path): relative_path = os.path.relpath(full_path, base_path) return model_type, relative_path - + return None def get_filename_list_(folder_name: str) -> tuple[list[str], dict[str, float], float]: diff --git a/tests-unit/app_test/model_processor_test.py b/tests-unit/app_test/model_processor_test.py index d1e43d37..692b631b 100644 --- a/tests-unit/app_test/model_processor_test.py +++ b/tests-unit/app_test/model_processor_test.py @@ -195,7 +195,7 @@ def test_ensure_downloaded_hash_mismatch(model_processor, db_session): def test_process_file_without_hash(model_processor, db_session): # Test processing file without provided hash model_processor.file_exists[TEST_DESTINATION_PATH] = True - + with patch.object(model_processor, "_hash_file", return_value=TEST_EXPECTED_HASH): result = model_processor.process_file(TEST_DESTINATION_PATH) assert result is not None @@ -241,13 +241,13 @@ def test_validate_file_extension_valid_extensions(model_processor): def test_process_file_existing_without_source_url(model_processor, db_session): # Test processing an existing file that needs its source URL updated model_processor.file_exists[TEST_DESTINATION_PATH] = True - + create_test_model(db_session, TEST_FILE_NAME, TEST_MODEL_TYPE, TEST_EXPECTED_HASH) result = model_processor.process_file(TEST_DESTINATION_PATH, source_url=TEST_URL) - + assert result is not None assert result.hash == TEST_EXPECTED_HASH assert result.source_url == TEST_URL - + db_model = db_session.query(Model).filter_by(path=TEST_FILE_NAME).first() assert db_model.source_url == TEST_URL