Minor fixes for database migrations with aerich

.vscode/settings.json

@@ -7,8 +7,5 @@
     },
     "files.associations": {
         "*.env.default": "shellscript"
-    },
-    "cSpell.words": [
-        "aerich"
-    ]
-}
+    }
+}

src/dipdup/aerich.py

@@ -1,12 +1,12 @@
 from typing import TYPE_CHECKING
 
-
 if TYPE_CHECKING:
-    from aerich import Command as AerichCommand
     from collections.abc import Iterable
     from pathlib import Path
     from types import ModuleType
 
+    from aerich import Command as AerichCommand
+
 
 async def create_aerich_command(db_url: str, package: str, migrations_dir: 'Path') -> 'AerichCommand':
     """Create and return an `AerichCommand` instance

src/dipdup/cli.py

@@ -590,11 +590,12 @@ async def schema(ctx: click.Context) -> None:
         migrations_dir = DipDupPackage(config.package_path).migrations
 
         if not migrations_dir.exists():
-            echo(
-                f"""Database migrations is not initialize at {migrations_dir}.
-                 Run `dipdup schema init` or just run `dipdup run` and it'll be initialized automatically."""
+            from dipdup.exceptions import ProjectPackageError
+
+            raise ProjectPackageError(
+                f"""Database migrations are not initialized at {migrations_dir}.
+              Run `dipdup schema init` or `dipdup run` to the run the indexer and it'll be initialized automatically."""
             )
-            raise click.Abort()
 
         from dipdup.aerich import create_aerich_command
 

src/dipdup/database.py

@@ -69,14 +69,12 @@ async def tortoise_wrapper(
 
     model_modules: dict[str, Iterable[str | ModuleType]] = {
         'int_models': ['dipdup.models'],
-        'models': ['dipdup.models'],
     }
 
     if models:
         if not models.endswith('.models'):
             models += '.models'
-        # NOTE: The only way we can append to the list without getting yelled at by mypy
-        model_modules['models'] = [models, *model_modules['models']]
+        model_modules['models'] = [models, 'dipdup.models']
 
     # NOTE: Must be called before entering Tortoise context
     decimal_precision = decimal_precision or guess_decimal_precision(models)

src/dipdup/dipdup.py

@@ -940,6 +940,7 @@ async def _initialize_migrations(self) -> None:
                 raise
         except FileExistsError as e:
             from pathlib import Path
+
             if Path(e.filename).is_relative_to(migrations_dir):
                 _logger.debug("Database migrations already initialized at '%s'", migrations_dir)
 

src/dipdup/exceptions.py

@@ -76,7 +76,7 @@ class DatasourceError(Error):
     def _help(self) -> str:
         return f"""
             `{self.datasource}` datasource returned an error:
-            
+
             "{self.msg}"
 
             See https://dipdup.io/docs/getting-started/datasources