coloco 0.5.0__tar.gz → 0.5.2__tar.gz

{coloco-0.5.0 → coloco-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coloco
-Version: 0.5.0
+Version: 0.5.2
 Summary: A kit for creating FastAPI + Svelte applications
 Author-Email: Channel Cat <channelcat@gmail.com>
 License: MIT
@@ -10,7 +10,7 @@ Requires-Dist: cyclopts>=3.18.0
 Requires-Dist: fastapi>=0.115.0
 Requires-Dist: PyJWT>=2.10.1
 Requires-Dist: rich>=14.0.0
-Requires-Dist: tortoise-orm[asyncpg]>=1.1.7
+Requires-Dist: tortoise-orm[asyncpg]==1.1.7
 Requires-Dist: type-less>=0.1.28
 Requires-Dist: uvicorn>=0.31.0
 Description-Content-Type: text/markdown

{coloco-0.5.0 → coloco-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coloco"
-version = "0.5.0"
+version = "0.5.2"
 description = "A kit for creating FastAPI + Svelte applications"
 authors = [
     { name = "Channel Cat", email = "channelcat@gmail.com" },
@@ -11,7 +11,7 @@ dependencies = [
     "fastapi>=0.115.0",
     "PyJWT>=2.10.1",
     "rich>=14.0.0",
-    "tortoise-orm[asyncpg]>=1.1.7",
+    "tortoise-orm[asyncpg]==1.1.7",
     "type-less>=0.1.28",
     "uvicorn>=0.31.0",
 ]
@@ -47,7 +47,6 @@ known-third-party = [
     "fastapi",
     "rich",
     "tortoise-orm",
-    "tortoise-pathway",
     "type-less",
     "uvicorn",
 ]

{coloco-0.5.0 → coloco-0.5.2}/src/coloco/__main__.py

@@ -16,7 +16,7 @@ app.command()(build)
 app.command()(createapp)
 app.command()(serve)
 
-# Add DB if tortoise/aerich are installed
+# Add DB if tortoise is installed
 try:
     from .cli.db import app as db_app
 

{coloco-0.5.0 → coloco-0.5.2}/src/coloco/cli/db.py

@@ -8,9 +8,13 @@ import os
 from tortoise import Tortoise
 from tortoise.cli import cli as tortoise_cli
 from tortoise.log import logger as tortoise_logger
+from tortoise.migrations.autodetector import MigrationAutodetector
+from tortoise.migrations.writer import format_migration_name
 import cyclopts
 
 from ..app import ColocoApp, get_current_app
+from ..db import app_class_to_table_name
+from ..migrations import add_same_run_dependencies
 from .api import DEFAULT_APP, _verify_app
 from .shared.logging import get_cli_logger
 
@@ -42,7 +46,9 @@ def db_command(func):
 
 
 async def get_tortoise(coloco_app: ColocoApp):
-    return await Tortoise.init(config=coloco_app.orm_config)
+    return await Tortoise.init(
+        config=coloco_app.orm_config, table_name_generator=app_class_to_table_name
+    )
 
 
 def prep_tortoise_cli(coloco_app: ColocoApp):
@@ -67,7 +73,46 @@ async def makemigrations(
     await get_tortoise(coloco_app)
 
     ctx, app_labels = prep_tortoise_cli(coloco_app)
-    return await tortoise_cli.makemigrations(ctx, app_labels, empty, name)
+    if empty:
+        return await tortoise_cli.makemigrations(ctx, app_labels, empty, name)
+
+    # Same flow as tortoise_cli.makemigrations, except migrations created in
+    # the same run are linked together (see add_same_run_dependencies) before
+    # being written to disk.
+    tortoise_config = tortoise_cli._load_config(ctx)
+    apps_config = tortoise_cli._select_apps(tortoise_config, app_labels or None)
+    apps_dict = {label: app_config.to_dict() for label, app_config in apps_config.items()}
+    for label, app_config in apps_dict.items():
+        migrations_module, _ = tortoise_cli._ensure_migrations_package(label, app_config)
+        app_config["migrations"] = migrations_module
+
+    config_dict = tortoise_config.to_dict()
+    config_dict["apps"] = apps_dict
+
+    async with tortoise_cli.tortoise_cli_context(config_dict) as tortoise_ctx:
+        if not tortoise_ctx.apps:
+            raise ValueError("Tortoise apps are not initialized")
+        autodetector = MigrationAutodetector(tortoise_ctx.apps, apps_dict)
+        writers = await autodetector.changes()
+
+    if not writers:
+        cli.info("No changes detected")
+        return
+
+    if name:
+        for writer in writers:
+            try:
+                number = int(writer.name.split("_", 1)[0])
+            except ValueError:
+                number = 1
+            writer.name = format_migration_name(number, name)
+
+    # Renaming must happen first so dependencies reference final names
+    add_same_run_dependencies(writers)
+
+    for writer in writers:
+        path = writer.write()
+        cli.info(f"Created [green]{writer.app_label}.{writer.name}[/green] ({path})")
 
 
 @db_command

{coloco-0.5.0 → coloco-0.5.2}/src/coloco/db.py

@@ -43,7 +43,7 @@ def get_orm_config(database_url: str, model_files: list[str]):
     ]
     app_to_models = defaultdict(list)
     for model_module in model_modules:
-        app = model_module.lstrip("src.app.").split(".")[0]
+        app = model_module.removeprefix("src.app.").split(".")[0]
         app_to_models[app].append(model_module)
     return TortoiseConfig(
         connections={"default": ConnectionConfig(db_url=database_url)},

coloco-0.5.2/src/coloco/migrations.py

@@ -0,0 +1,99 @@
+"""
+Cross-app dependency linking for tortoise migrations.
+
+Tortoise's autodetector only records cross-app dependencies on migrations
+already on disk, so when two apps get migrations in the same makemigrations
+run, the migration referencing another app's models would be written without
+the dependency that orders it after that app's migration, and they would
+apply in alphabetical app order.  add_same_run_dependencies links migrations
+created in the same run before they are written, so every migration file
+carries the dependencies that order it.
+"""
+
+from tortoise.fields.relational import (
+    ForeignKeyFieldInstance,
+    ManyToManyFieldInstance,
+    OneToOneFieldInstance,
+)
+from tortoise.migrations.writer import MigrationWriter
+
+from .cli.shared.logging import get_cli_logger
+
+cli = get_cli_logger("coloco.migrations")
+
+_RELATION_FIELDS = (ForeignKeyFieldInstance, OneToOneFieldInstance, ManyToManyFieldInstance)
+
+
+def _iter_relation_references(operations):
+    """Yield (app_label, model_name) for each relation field in operations."""
+    fields = []
+    for operation in operations:
+        fields.extend(field for _, field in getattr(operation, "fields", None) or [])
+        operation_field = getattr(operation, "field", None)
+        if operation_field is not None:
+            fields.append(operation_field)
+
+    for field in fields:
+        if not isinstance(field, _RELATION_FIELDS):
+            continue
+        model_name = field.model_name
+        if isinstance(model_name, str):
+            if "." in model_name:
+                app_label, model = model_name.split(".", 1)
+                yield app_label, model
+        elif model_name._meta.app:
+            yield model_name._meta.app, model_name.__name__
+
+
+def _related_app_labels(writer: MigrationWriter) -> set[str]:
+    """App labels referenced by relation fields in a migration's operations."""
+    labels = {app_label for app_label, _ in _iter_relation_references(writer.operations)}
+    labels.discard(writer.app_label)
+    return labels
+
+
+def _depends_on(source: MigrationWriter, target_app: str, writers_by_app: dict) -> bool:
+    """Whether source already reaches target_app through same-run dependencies."""
+    seen = set()
+    stack = [source]
+    while stack:
+        writer = stack.pop()
+        if writer.app_label in seen:
+            continue
+        seen.add(writer.app_label)
+        if writer.app_label == target_app:
+            return True
+        for dep_app, dep_name in writer.dependencies:
+            dep_writer = writers_by_app.get(dep_app)
+            if dep_writer is not None and dep_writer.name == dep_name:
+                stack.append(dep_writer)
+    return False
+
+
+def add_same_run_dependencies(writers: list[MigrationWriter]) -> None:
+    """
+    Link migrations created in the same run so they apply in topological order.
+
+    Tortoise's autodetector only records cross-app dependencies on migrations
+    already on disk, so a migration referencing a model whose migration is
+    created in the same run would otherwise apply in alphabetical app order.
+    """
+    writers_by_app = {writer.app_label: writer for writer in writers}
+    for writer in writers:
+        for related_app in sorted(_related_app_labels(writer)):
+            related_writer = writers_by_app.get(related_app)
+            if related_writer is None:
+                continue
+            dependency = (related_app, related_writer.name)
+            if dependency in writer.dependencies:
+                continue
+            if _depends_on(related_writer, writer.app_label, writers_by_app):
+                cli.info(
+                    f"[yellow]Apps {writer.app_label} and {related_app} reference "
+                    f"each other; circular migrations cannot be ordered and will "
+                    f"fail to apply. Create the models in one migration and add "
+                    f"the circular foreign keys in a follow-up migration.[/yellow]"
+                )
+                continue
+            writer.dependencies.append(dependency)
+            writer.dependencies.sort()

{coloco-0.5.0 → coloco-0.5.2}/src/coloco/templates/standard/pyproject.toml-tpl

@@ -6,12 +6,9 @@ readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "coloco>={{ coloco_version }}",
-    "tortoise-pathway>=0.2.0",
+    "tortoise-orm>=1.1.7",
 ]
 
 [tool.coloco]
 app = "src.main.app"
 migrations_dir = "+migrations"
-
-[tool.uv.sources]
-tortoise-pathway = { git = "https://github.com/channelcat/tortoise-pathway", rev = "iterate-migration-apply" }