Fix CLI async/sync transformation and execution pattern

Fixed the proper async/sync pattern for CLI commands:
- CLI command functions are sync (required by Click)
- Inner functions are async and called with run_async() wrapper
- Proper imports to use async migrators in async CLI, sync in sync CLI
- Fixed unasync transformation issues for CLI execution

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: abrookins

aredis_om/model/cli/migrate.py

@@ -4,8 +4,8 @@
 
 import click
 
-from aredis_om.model.migrations.schema_migrator import SchemaMigrator
-from aredis_om.settings import get_root_migrations_dir
+from ..migrations.schema_migrator import SchemaMigrator
+from ...settings import get_root_migrations_dir
 
 
 def run_async(coro):
@@ -25,29 +25,32 @@ def migrate():
 
 @migrate.command()
 @click.option("--migrations-dir", help="Directory containing schema migration files")
-async def status(migrations_dir: Optional[str]):
+def status(migrations_dir: Optional[str]):
     """Show current schema migration status from files."""
 
-    dir_path = migrations_dir or os.path.join(
-        get_root_migrations_dir(), "schema-migrations"
-    )
-    migrator = SchemaMigrator(migrations_dir=dir_path)
-    status_info = await migrator.status()
+    async def _status():
+        dir_path = migrations_dir or os.path.join(
+            get_root_migrations_dir(), "schema-migrations"
+        )
+        migrator = SchemaMigrator(migrations_dir=dir_path)
+        status_info = await migrator.status()
 
-    click.echo("Schema Migration Status:")
-    click.echo(f"  Total migrations: {status_info['total_migrations']}")
-    click.echo(f"  Applied: {status_info['applied_count']}")
-    click.echo(f"  Pending: {status_info['pending_count']}")
+        click.echo("Schema Migration Status:")
+        click.echo(f"  Total migrations: {status_info['total_migrations']}")
+        click.echo(f"  Applied: {status_info['applied_count']}")
+        click.echo(f"  Pending: {status_info['pending_count']}")
+
+        if status_info["pending_migrations"]:
+            click.echo("\nPending migrations:")
+            for migration_id in status_info["pending_migrations"]:
+                click.echo(f"- {migration_id}")
 
-    if status_info["pending_migrations"]:
-        click.echo("\nPending migrations:")
-        for migration_id in status_info["pending_migrations"]:
-            click.echo(f"- {migration_id}")
+        if status_info["applied_migrations"]:
+            click.echo("\nApplied migrations:")
+            for migration_id in status_info["applied_migrations"]:
+                click.echo(f"- {migration_id}")
 
-    if status_info["applied_migrations"]:
-        click.echo("\nApplied migrations:")
-        for migration_id in status_info["applied_migrations"]:
-            click.echo(f"- {migration_id}")
+    run_async(_status())
 
 
 @migrate.command()
@@ -63,7 +66,7 @@ async def status(migrations_dir: Optional[str]):
     is_flag=True,
     help="Skip confirmation prompt to create directory or run",
 )
-async def run(
+def run(
     migrations_dir: Optional[str],
     dry_run: bool,
     verbose: bool,
@@ -72,38 +75,43 @@ async def run(
 ):
     """Run pending schema migrations from files."""
 
-    dir_path = migrations_dir or os.path.join(
-        get_root_migrations_dir(), "schema-migrations"
-    )
-
-    if not os.path.exists(dir_path):
-        if yes or click.confirm(f"Create schema migrations directory at '{dir_path}'?"):
-            os.makedirs(dir_path, exist_ok=True)
-        else:
-            click.echo("Aborted.")
-            return
-
-    migrator = SchemaMigrator(migrations_dir=dir_path)
+    async def _run():
+        dir_path = migrations_dir or os.path.join(
+            get_root_migrations_dir(), "schema-migrations"
+        )
 
-    # Show list for confirmation
-    if not dry_run and not yes:
-        status_info = await migrator.status()
-        if status_info["pending_migrations"]:
-            listing = "\n".join(
-                f"- {m}"
-                for m in status_info["pending_migrations"][
-                    : (limit or len(status_info["pending_migrations"]))
-                ]
-            )
-            if not click.confirm(
-                f"Run {min(limit or len(status_info['pending_migrations']), len(status_info['pending_migrations']))} migration(s)?\n{listing}"
+        if not os.path.exists(dir_path):
+            if yes or click.confirm(
+                f"Create schema migrations directory at '{dir_path}'?"
             ):
+                os.makedirs(dir_path, exist_ok=True)
+            else:
                 click.echo("Aborted.")
                 return
 
-    count = await migrator.run(dry_run=dry_run, limit=limit, verbose=verbose)
-    if verbose and not dry_run:
-        click.echo(f"Successfully applied {count} migration(s).")
+        migrator = SchemaMigrator(migrations_dir=dir_path)
+
+        # Show list for confirmation
+        if not dry_run and not yes:
+            status_info = await migrator.status()
+            if status_info["pending_migrations"]:
+                listing = "\n".join(
+                    f"- {m}"
+                    for m in status_info["pending_migrations"][
+                        : (limit or len(status_info["pending_migrations"]))
+                    ]
+                )
+                if not click.confirm(
+                    f"Run {min(limit or len(status_info['pending_migrations']), len(status_info['pending_migrations']))} migration(s)?\n{listing}"
+                ):
+                    click.echo("Aborted.")
+                    return
+
+        count = await migrator.run(dry_run=dry_run, limit=limit, verbose=verbose)
+        if verbose and not dry_run:
+            click.echo(f"Successfully applied {count} migration(s).")
+
+    run_async(_run())
 
 
 @migrate.command()
@@ -112,26 +120,31 @@ async def run(
 @click.option(
     "--yes", "-y", is_flag=True, help="Skip confirmation prompt to create directory"
 )
-async def create(name: str, migrations_dir: Optional[str], yes: bool):
+def create(name: str, migrations_dir: Optional[str], yes: bool):
     """Create a new schema migration snapshot file from current pending operations."""
 
-    dir_path = migrations_dir or os.path.join(
-        get_root_migrations_dir(), "schema-migrations"
-    )
+    async def _create():
+        dir_path = migrations_dir or os.path.join(
+            get_root_migrations_dir(), "schema-migrations"
+        )
+
+        if not os.path.exists(dir_path):
+            if yes or click.confirm(
+                f"Create schema migrations directory at '{dir_path}'?"
+            ):
+                os.makedirs(dir_path, exist_ok=True)
+            else:
+                click.echo("Aborted.")
+                return
 
-    if not os.path.exists(dir_path):
-        if yes or click.confirm(f"Create schema migrations directory at '{dir_path}'?"):
-            os.makedirs(dir_path, exist_ok=True)
+        migrator = SchemaMigrator(migrations_dir=dir_path)
+        filepath = await migrator.create_migration_file(name)
+        if filepath:
+            click.echo(f"Created migration: {filepath}")
         else:
-            click.echo("Aborted.")
-            return
+            click.echo("No pending schema changes detected. Nothing to snapshot.")
 
-    migrator = SchemaMigrator(migrations_dir=dir_path)
-    filepath = await migrator.create_migration_file(name)
-    if filepath:
-        click.echo(f"Created migration: {filepath}")
-    else:
-        click.echo("No pending schema changes detected. Nothing to snapshot.")
+    run_async(_create())
 
 
 @migrate.command()
@@ -147,7 +160,7 @@ async def create(name: str, migrations_dir: Optional[str], yes: bool):
     is_flag=True,
     help="Skip confirmation prompt to create directory or run",
 )
-async def rollback(
+def rollback(
     migration_id: str,
     migrations_dir: Optional[str],
     dry_run: bool,
@@ -156,30 +169,37 @@ async def rollback(
 ):
     """Rollback a specific schema migration by ID."""
 
-    dir_path = migrations_dir or os.path.join(
-        get_root_migrations_dir(), "schema-migrations"
-    )
+    async def _rollback():
+        dir_path = migrations_dir or os.path.join(
+            get_root_migrations_dir(), "schema-migrations"
+        )
 
-    if not os.path.exists(dir_path):
-        if yes or click.confirm(f"Create schema migrations directory at '{dir_path}'?"):
-            os.makedirs(dir_path, exist_ok=True)
-        else:
-            click.echo("Aborted.")
-            return
-
-    migrator = SchemaMigrator(migrations_dir=dir_path)
-
-    if not yes and not dry_run:
-        if not click.confirm(f"Rollback migration '{migration_id}'?"):
-            click.echo("Aborted.")
-            return
-
-    success = await migrator.rollback(migration_id, dry_run=dry_run, verbose=verbose)
-    if success:
-        if verbose:
-            click.echo(f"Successfully rolled back migration: {migration_id}")
-    else:
-        click.echo(
-            f"Migration '{migration_id}' does not support rollback or is not applied.",
-            err=True,
+        if not os.path.exists(dir_path):
+            if yes or click.confirm(
+                f"Create schema migrations directory at '{dir_path}'?"
+            ):
+                os.makedirs(dir_path, exist_ok=True)
+            else:
+                click.echo("Aborted.")
+                return
+
+        migrator = SchemaMigrator(migrations_dir=dir_path)
+
+        if not yes and not dry_run:
+            if not click.confirm(f"Rollback migration '{migration_id}'?"):
+                click.echo("Aborted.")
+                return
+
+        success = await migrator.rollback(
+            migration_id, dry_run=dry_run, verbose=verbose
         )
+        if success:
+            if verbose:
+                click.echo(f"Successfully rolled back migration: {migration_id}")
+        else:
+            click.echo(
+                f"Migration '{migration_id}' does not support rollback or is not applied.",
+                err=True,
+            )
+
+    run_async(_rollback())

aredis_om/model/cli/migrate_data.py

@@ -34,7 +34,7 @@ def migrate_data():
     help="Directory containing migration files (default: <root>/data-migrations)",
 )
 @click.option("--module", help="Python module containing migrations")
-async def status(migrations_dir: str, module: str):
+def status(migrations_dir: str, module: str):
     """Show current migration status."""
 
     async def _status():
@@ -71,7 +71,7 @@ async def _status():
             click.echo(f"Error: {e}", err=True)
             raise click.Abort()
 
-    await _status()
+    run_async(_status())
 
 
 @migrate_data.command()
@@ -86,7 +86,7 @@ async def _status():
 @click.option("--verbose", "-v", is_flag=True, help="Enable verbose output")
 @click.option("--limit", type=int, help="Limit number of migrations to run")
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt")
-async def run(
+def run(
     migrations_dir: str,
     module: str,
     dry_run: bool,
@@ -164,7 +164,7 @@ async def _run():
             click.echo(f"Error: {e}", err=True)
             raise click.Abort()
 
-    await _run()
+    run_async(_run())
 
 
 @migrate_data.command()
@@ -176,7 +176,7 @@ async def _run():
 @click.option(
     "--yes", "-y", is_flag=True, help="Skip confirmation prompt to create directory"
 )
-async def create(name: str, migrations_dir: Optional[str], yes: bool):
+def create(name: str, migrations_dir: Optional[str], yes: bool):
     """Create a new migration file."""
 
     async def _create():
@@ -206,7 +206,7 @@ async def _create():
             click.echo(f"Error creating migration: {e}", err=True)
             raise click.Abort()
 
-    await _create()
+    run_async(_create())
 
 
 @migrate_data.command()
@@ -222,7 +222,7 @@ async def _create():
 )
 @click.option("--verbose", "-v", is_flag=True, help="Enable verbose output")
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt")
-async def rollback(
+def rollback(
     migration_id: str,
     migrations_dir: str,
     module: str,
@@ -284,7 +284,7 @@ async def _rollback():
             click.echo(f"Error: {e}", err=True)
             raise click.Abort()
 
-    await _rollback()
+    run_async(_rollback())
 
 
 if __name__ == "__main__":