diff --git a/alembic_db/README.md b/alembic_db/README.md index 3b808c7ca..4b2a67ad2 100644 --- a/alembic_db/README.md +++ b/alembic_db/README.md @@ -1,4 +1,4 @@ ## Generate new revision -1. Update models in `/app/database/models.py` +1. Update models in `/comfy/app/database/models.py` 2. Run `alembic revision --autogenerate -m "{your message}"` diff --git a/alembic_db/env.py b/alembic_db/env.py index 4d7770679..73d51eccf 100644 --- a/alembic_db/env.py +++ b/alembic_db/env.py @@ -8,7 +8,7 @@ from alembic import context config = context.config -from app.database.models import Base +from comfy.app.database.models import Base target_metadata = Base.metadata # other values from the config, defined by the needs of env.py, diff --git a/comfy/app/database/__init__.py b/comfy/app/database/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/comfy/app/database/db.py b/comfy/app/database/db.py index 1de8b80ed..3089e3ba0 100644 --- a/comfy/app/database/db.py +++ b/comfy/app/database/db.py @@ -1,33 +1,19 @@ import logging import os import shutil -from app.logger import log_startup_warning -from utils.install_util import get_missing_requirements_message -from comfy.cli_args import args -_DB_AVAILABLE = False +from ...cli_args import args + Session = None +from alembic import command +from alembic.config import Config +from alembic.runtime.migration import MigrationContext +from alembic.script import ScriptDirectory +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -try: - from alembic import command - from alembic.config import Config - from alembic.runtime.migration import MigrationContext - from alembic.script import ScriptDirectory - from sqlalchemy import create_engine - from sqlalchemy.orm import sessionmaker - - _DB_AVAILABLE = True -except ImportError as e: - log_startup_warning( - f""" ------------------------------------------------------------------------- -Error importing dependencies: {e} -{get_missing_requirements_message()} -This error is happening because ComfyUI now uses a local sqlite database. ------------------------------------------------------------------------- -""".strip() - ) +_DB_AVAILABLE = True def dependencies_available():