remdb 0.3.114__py3-none-any.whl → 0.3.172__py3-none-any.whl

rem/cli/commands/configure.py

@@ -110,7 +110,7 @@ def prompt_llm_config(use_defaults: bool = False) -> dict:
     config = {}
 
     # Default values
-    default_model = "anthropic:claude-sonnet-4-5-20250929"
+    default_model = "openai:gpt-4.1"
     default_temperature = 0.5
 
     if use_defaults:
@@ -124,9 +124,9 @@ def prompt_llm_config(use_defaults: bool = False) -> dict:
         # Default model
         click.echo("\nDefault LLM model (format: provider:model-id)")
         click.echo("Examples:")
+        click.echo("  - openai:gpt-4.1")
         click.echo("  - anthropic:claude-sonnet-4-5-20250929")
-        click.echo("  - openai:gpt-4o")
-        click.echo("  - openai:gpt-4o-mini")
+        click.echo("  - openai:gpt-4.1-mini")
 
         config["default_model"] = click.prompt(
             "Default model", default=default_model
@@ -405,9 +405,7 @@ def configure_command(install: bool, claude_desktop: bool, show: bool, edit: boo
 
                 # Create a context for the command and invoke it
                 ctx = click.Context(migrate)
-                ctx.invoke(migrate, install_only=False, models_only=False,
-                          background_indexes=False, connection=None,
-                          sql_dir=Path("rem/sql"))
+                ctx.invoke(migrate, background_indexes=False)
 
                 click.echo("✅ Database installation complete")
 
@@ -424,7 +422,6 @@ def configure_command(install: bool, claude_desktop: bool, show: bool, edit: boo
 
         try:
             import shutil
-            from pathlib import Path
             from fastmcp.mcp_config import update_config_file, StdioMCPServer
 
             # Find Claude Desktop config path

rem/cli/commands/db.py

@@ -126,29 +126,51 @@ def migrate(background_indexes: bool):
 async def _migrate_async(background_indexes: bool):
     """Async implementation of migrate command."""
     from ...settings import settings
+    from ...utils.sql_paths import (
+        get_package_sql_dir,
+        get_user_sql_dir,
+        list_all_migrations,
+    )
 
     click.echo()
     click.echo("REM Database Migration")
     click.echo("=" * 60)
 
-    # Find SQL directory
-    sql_dir = Path(settings.sql_dir)
-    migrations_dir = sql_dir / "migrations"
+    # Find package SQL directory
+    try:
+        package_sql_dir = get_package_sql_dir()
+        click.echo(f"Package SQL: {package_sql_dir}")
+    except FileNotFoundError as e:
+        click.secho(f"✗ {e}", fg="red")
+        raise click.Abort()
+
+    # Check for user migrations
+    user_sql_dir = get_user_sql_dir()
+    if user_sql_dir:
+        click.echo(f"User SQL: {user_sql_dir}")
+
+    # Get all migrations (package + user)
+    all_migrations = list_all_migrations()
+
+    if not all_migrations:
+        click.secho("✗ No migration files found", fg="red")
+        raise click.Abort()
 
-    click.echo(f"SQL Directory: {sql_dir}")
+    click.echo(f"Found {len(all_migrations)} migration(s)")
     click.echo()
 
-    # Standard migration files
-    migrations = [
-        (migrations_dir / "001_install.sql", "Core Infrastructure"),
-        (migrations_dir / "002_install_models.sql", "Entity Tables"),
-    ]
+    # Add background indexes if requested
+    migrations_to_apply = [(f, f.stem) for f in all_migrations]
 
     if background_indexes:
-        migrations.append((sql_dir / "background_indexes.sql", "Background Indexes"))
-
-    # Check files exist
-    for file_path, description in migrations:
+        bg_indexes = package_sql_dir / "background_indexes.sql"
+        if bg_indexes.exists():
+            migrations_to_apply.append((bg_indexes, "Background Indexes"))
+        else:
+            click.secho("⚠ background_indexes.sql not found, skipping", fg="yellow")
+
+    # Check all files exist (they should, but verify)
+    for file_path, description in migrations_to_apply:
         if not file_path.exists():
             click.secho(f"✗ {file_path.name} not found", fg="red")
             if "002" in file_path.name:
@@ -162,8 +184,8 @@ async def _migrate_async(background_indexes: bool):
     conn_str = settings.postgres.connection_string
     total_time = 0.0
 
-    for file_path, description in migrations:
-        click.echo(f"Applying: {description} ({file_path.name})")
+    for file_path, description in migrations_to_apply:
+        click.echo(f"Applying: {file_path.name}")
 
         sql_content = file_path.read_text(encoding="utf-8")
         start_time = time.time()
@@ -469,6 +491,13 @@ async def _load_async(file_path: Path, user_id: str | None, dry_run: bool):
     is_flag=True,
     help="Generate incremental migration file from diff",
 )
+@click.option(
+    "--strategy",
+    "-s",
+    type=click.Choice(["additive", "full", "safe"]),
+    default="additive",
+    help="Migration strategy: additive (no drops, default), full (all changes), safe (additive + type widenings)",
+)
 @click.option(
     "--models",
     "-m",
@@ -491,6 +520,7 @@ async def _load_async(file_path: Path, user_id: str | None, dry_run: bool):
 def diff(
     check: bool,
     generate: bool,
+    strategy: str,
     models: Path | None,
     output_dir: Path | None,
     message: str,
@@ -502,23 +532,30 @@ def diff(
     - Your Pydantic models (the target schema)
     - The current database (what's actually deployed)
 
+    Strategies:
+        additive  Only ADD columns/tables/indexes (safe, no data loss) [default]
+        full      All changes including DROPs (use with caution)
+        safe      Additive + safe column type changes (widenings only)
+
     Examples:
-        rem db diff                    # Show what would change
-        rem db diff --check            # CI mode: exit 1 if drift detected
-        rem db diff --generate         # Create migration file from diff
+        rem db diff                        # Show additive changes only
+        rem db diff --strategy full        # Show all changes including drops
+        rem db diff --generate             # Create migration file
+        rem db diff --check                # CI mode: exit 1 if drift
 
     Workflow:
         1. Develop locally, modify Pydantic models
         2. Run 'rem db diff' to see changes
         3. Run 'rem db diff --generate' to create migration
-        4. Review generated SQL, then 'rem db migrate'
+        4. Review generated SQL, then 'rem db apply <file>'
     """
-    asyncio.run(_diff_async(check, generate, models, output_dir, message))
+    asyncio.run(_diff_async(check, generate, strategy, models, output_dir, message))
 
 
 async def _diff_async(
     check: bool,
     generate: bool,
+    strategy: str,
     models: Path | None,
     output_dir: Path | None,
     message: str,
@@ -529,9 +566,10 @@ async def _diff_async(
     click.echo()
     click.echo("REM Schema Diff")
     click.echo("=" * 60)
+    click.echo(f"Strategy: {strategy}")
 
     # Initialize diff service
-    diff_service = DiffService(models_dir=models)
+    diff_service = DiffService(models_dir=models, strategy=strategy)
 
     try:
         # Compute diff
@@ -543,10 +581,16 @@ async def _diff_async(
         if not result.has_changes:
             click.secho("✓ No schema drift detected", fg="green")
             click.echo("  Database matches Pydantic models")
+            if result.filtered_count > 0:
+                click.echo()
+                click.secho(f"  ({result.filtered_count} destructive change(s) hidden by '{strategy}' strategy)", fg="yellow")
+                click.echo("  Use --strategy full to see all changes")
             return
 
         # Show changes
         click.secho(f"⚠ Schema drift detected: {result.change_count} change(s)", fg="yellow")
+        if result.filtered_count > 0:
+            click.secho(f"   ({result.filtered_count} destructive change(s) hidden by '{strategy}' strategy)", fg="yellow")
         click.echo()
         click.echo("Changes:")
         for line in result.summary:
@@ -581,7 +625,7 @@ async def _diff_async(
                 click.echo()
                 click.echo("Next steps:")
                 click.echo("  1. Review the generated SQL file")
-                click.echo("  2. Run: rem db migrate")
+                click.echo("  2. Run: rem db apply <file>")
             else:
                 click.echo("No migration file generated (no changes)")