quickscale-cli 0.74.2__tar.gz → 0.75.0__tar.gz

{quickscale_cli-0.74.2 → quickscale_cli-0.75.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickscale-cli
-Version: 0.74.2
+Version: 0.75.0
 Summary: Command-line interface for QuickScale Django project generator
 License: Apache-2.0
 Keywords: django,cli,project-generator,saas
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=8.3.1,<9.0.0)
-Requires-Dist: quickscale-core (>=0.74.2,<0.75.0)
+Requires-Dist: quickscale-core (>=0.75.0,<0.76.0)
 Project-URL: Documentation, https://github.com/Experto-AI/quickscale/tree/main/docs
 Project-URL: Homepage, https://github.com/Experto-AI/quickscale
 Project-URL: Repository, https://github.com/Experto-AI/quickscale
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 [![Coverage](https://img.shields.io/badge/coverage-90%25-green.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
 [![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Version](https://img.shields.io/badge/version-0.74.0-green.svg)](https://github.com/Experto-AI/quickscale/releases)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/Experto-AI/quickscale?color=green)](https://github.com/Experto-AI/quickscale/releases)
 [![Code style: Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 > **You are here**: **QuickScale README** (Project Overview)
@@ -107,6 +107,10 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 5. Build your unique client application
 6. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
 
+`quickscale.yml` now uses explicit identity fields:
+- `project.slug`: filesystem/service slug (for directory names)
+- `project.package`: Python package/import name (for Django module paths)
+
 ℹ️ The [MVP Feature Matrix](./docs/technical/decisions.md#mvp-feature-matrix-authoritative) is the single source of truth for what's in or out.
 
 ### What You Get
@@ -203,7 +207,7 @@ If you want to contribute to QuickScale development, see the [Development Guide]
 
 # 2. Create your project configuration
 quickscale plan myapp
-# → Accept defaults: theme (showcase_html), no modules, Docker enabled
+# → Accept defaults: theme (showcase_react), no modules, Docker enabled
 
 # 3. Generate and enter the project
 cd myapp
@@ -306,7 +310,7 @@ quickscale apply
 ### Option 1: Docker (Recommended for production parity)
 
 ```bash
-# Start all services (web + database)
+# Start all services (backend + database)
 quickscale up
 
 # Run migrations
@@ -316,7 +320,7 @@ quickscale manage migrate
 quickscale manage createsuperuser
 
 # View logs
-quickscale logs -f web
+quickscale logs -f backend
 
 # Open a shell in the container
 quickscale shell

{quickscale_cli-0.74.2 → quickscale_cli-0.75.0}/README.md

@@ -5,7 +5,7 @@
 [![Coverage](https://img.shields.io/badge/coverage-90%25-green.svg)](https://github.com/Experto-AI/quickscale/actions/workflows/ci.yml)
 [![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Version](https://img.shields.io/badge/version-0.74.0-green.svg)](https://github.com/Experto-AI/quickscale/releases)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/Experto-AI/quickscale?color=green)](https://github.com/Experto-AI/quickscale/releases)
 [![Code style: Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 > **You are here**: **QuickScale README** (Project Overview)
@@ -82,6 +82,10 @@ See [decisions.md - Glossary section](./docs/technical/decisions.md#document-res
 5. Build your unique client application
 6. Deploy to Railway with `quickscale deploy railway` (or use standard Django deployment)
 
+`quickscale.yml` now uses explicit identity fields:
+- `project.slug`: filesystem/service slug (for directory names)
+- `project.package`: Python package/import name (for Django module paths)
+
 ℹ️ The [MVP Feature Matrix](./docs/technical/decisions.md#mvp-feature-matrix-authoritative) is the single source of truth for what's in or out.
 
 ### What You Get
@@ -178,7 +182,7 @@ If you want to contribute to QuickScale development, see the [Development Guide]
 
 # 2. Create your project configuration
 quickscale plan myapp
-# → Accept defaults: theme (showcase_html), no modules, Docker enabled
+# → Accept defaults: theme (showcase_react), no modules, Docker enabled
 
 # 3. Generate and enter the project
 cd myapp
@@ -281,7 +285,7 @@ quickscale apply
 ### Option 1: Docker (Recommended for production parity)
 
 ```bash
-# Start all services (web + database)
+# Start all services (backend + database)
 quickscale up
 
 # Run migrations
@@ -291,7 +295,7 @@ quickscale manage migrate
 quickscale manage createsuperuser
 
 # View logs
-quickscale logs -f web
+quickscale logs -f backend
 
 # Open a shell in the container
 quickscale shell

{quickscale_cli-0.74.2 → quickscale_cli-0.75.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quickscale-cli"
-version = "0.74.2"
+version = "0.75.0"
 description = "Command-line interface for QuickScale Django project generator"
 authors = ["Experto AI <victor@experto.ai>"]
 license = "Apache-2.0"
@@ -25,7 +25,7 @@ packages = [{include = "quickscale_cli", from = "src"}]
 [tool.poetry.dependencies]
 python = "^3.12"
 click = "^8.3.1"
-quickscale-core = "^0.74.2"
+quickscale-core = "^0.75.0"
 
 [tool.poetry.group.dev.dependencies]
 # Dev dependencies centralized in root pyproject.toml

{quickscale_cli-0.74.2 → quickscale_cli-0.75.0}/src/quickscale_cli/_version.py

@@ -1,2 +1,2 @@
 # Auto-generated by scripts/version_tool.sh
-__version__ = "0.74.2"
+__version__ = "0.75.0"

{quickscale_cli-0.74.2 → quickscale_cli-0.75.0}/src/quickscale_cli/commands/apply_command.py

@@ -7,10 +7,12 @@ import subprocess
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
+from typing import Any, cast
 
 import click
 
 from quickscale_cli.commands.module_commands import embed_module
+from quickscale_cli.utils.module_wiring_manager import regenerate_managed_wiring
 from quickscale_cli.schema.config_schema import (
     ConfigValidationError,
     QuickScaleConfig,
@@ -43,6 +45,15 @@ class ApplyContext:
     delta: ConfigDelta
 
 
+@dataclass
+class EmbedModulesResult:
+    """Result for module embedding step."""
+
+    success: bool
+    embedded_modules: list[str]
+    failed_module: str | None = None
+
+
 def _run_command(
     cmd: list[str],
     cwd: Path,
@@ -89,7 +100,10 @@ def _run_command(
 def _generate_project(config: QuickScaleConfig, output_path: Path) -> bool:
     """Generate project using ProjectGenerator"""
     try:
-        click.echo(f"⏳ Generating project: {config.project.name}...")
+        click.echo(
+            f"⏳ Generating project: {config.project.slug} "
+            f"(package: {config.project.package})..."
+        )
 
         # Validate theme availability
         if config.project.theme == "showcase_htmx":
@@ -110,7 +124,13 @@ def _generate_project(config: QuickScaleConfig, output_path: Path) -> bool:
             return False
 
         generator = ProjectGenerator(theme=config.project.theme)
-        generator.generate(config.project.name, output_path)
+        # mypy can resolve an older installed quickscale-core signature here.
+        generate_project = cast(Any, generator.generate)
+        generate_project(
+            config.project.slug,
+            output_path,
+            package_name=config.project.package,
+        )
 
         click.secho(f"✅ Project generated: {output_path}", fg="green")
         return True
@@ -160,7 +180,11 @@ def _git_commit(project_path: Path, message: str) -> bool:
     return success
 
 
-def _embed_module(project_path: Path, module_name: str) -> bool:
+def _embed_module(
+    project_path: Path,
+    module_name: str,
+    skip_auth_migration_check: bool = False,
+) -> bool:
     """Embed a module using the embed_module function with non-interactive mode"""
     click.echo(f"⏳ Embedding module: {module_name}...")
 
@@ -169,6 +193,8 @@ def _embed_module(project_path: Path, module_name: str) -> bool:
             module=module_name,
             project_path=project_path,
             non_interactive=True,
+            allow_unverifiable_auth_state=True,
+            skip_auth_migration_check=skip_auth_migration_check,
         )
 
         if success:
@@ -200,6 +226,15 @@ def _run_migrations(project_path: Path) -> bool:
     )[0]
 
 
+def _run_migrations_in_docker(project_path: Path) -> bool:
+    """Run Django migrations inside the backend Docker container."""
+    return _run_command(
+        ["quickscale", "manage", "migrate"],
+        project_path,
+        "Running migrations (Docker)",
+    )[0]
+
+
 def _start_docker(
     project_path: Path, build: bool = True, verbose: bool = False
 ) -> bool:
@@ -352,7 +387,10 @@ def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
         click.secho(
             f"❌ Configuration file not found: {config_path}", fg="red", err=True
         )
-        click.echo("\n💡 Create a configuration with: quickscale plan <name>", err=True)
+        click.echo(
+            "\n💡 Create a configuration with: quickscale plan <project-slug>",
+            err=True,
+        )
         raise click.Abort()
 
     click.echo(f"\n📋 Reading configuration: {config_path}")
@@ -367,18 +405,19 @@ def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
         raise click.Abort()
 
 
-def _determine_output_path(config_path: Path, project_name: str) -> Path:
+def _determine_output_path(config_path: Path, project_slug: str) -> Path:
     """Determine output directory for project."""
     config_path = config_path.resolve()
-    if config_path.parent.name == project_name:
+    if config_path.parent.name == project_slug:
         return config_path.parent
-    return Path.cwd() / project_name
+    return Path.cwd() / project_slug
 
 
 def _display_config_summary(qs_config: QuickScaleConfig) -> None:
     """Display configuration summary."""
     click.echo("\n🚀 Applying configuration:")
-    click.echo(f"   Project: {qs_config.project.name}")
+    click.echo(f"   Project slug: {qs_config.project.slug}")
+    click.echo(f"   Python package: {qs_config.project.package}")
     click.echo(f"   Theme: {qs_config.project.theme}")
     if qs_config.modules:
         click.echo(f"   Modules: {', '.join(qs_config.modules.keys())}")
@@ -495,7 +534,7 @@ def _generate_with_existing_config(
                     item.unlink()
 
     temp_dir = Path(tempfile.mkdtemp())
-    temp_project = temp_dir / qs_config.project.name
+    temp_project = temp_dir / qs_config.project.slug
 
     if not _generate_project(qs_config, temp_project):
         shutil.rmtree(temp_dir)
@@ -541,37 +580,48 @@ def _embed_modules_step(
     modules_to_embed: list[str],
     no_modules: bool,
     existing_state: QuickScaleState | None,
-) -> list[str]:
-    """Embed modules and return list of successfully embedded modules."""
+) -> EmbedModulesResult:
+    """Embed modules with fail-fast semantics."""
     embedded_modules: list[str] = []
 
     if no_modules or not modules_to_embed:
         if existing_state and not modules_to_embed:
             click.echo("⏭️  No new modules to embed")
-        return embedded_modules
+        return EmbedModulesResult(success=True, embedded_modules=embedded_modules)
+
+    skip_auth_migration_check = existing_state is None
 
     for module_name in modules_to_embed:
-        if not _embed_module(output_path, module_name):
-            click.secho(
-                f"⚠️  Module embedding failed for {module_name}, continuing...",
-                fg="yellow",
-            )
-            # Commit any partial changes to allow subsequent modules to be embedded
+        if not _embed_module(
+            output_path,
+            module_name,
+            skip_auth_migration_check=skip_auth_migration_check,
+        ):
             if not is_working_directory_clean(output_path):
                 _git_commit(output_path, f"Partial module: {module_name} (incomplete)")
+            click.secho(
+                f"❌ Module embedding failed for required module: {module_name}",
+                fg="red",
+                err=True,
+            )
+            return EmbedModulesResult(
+                success=False,
+                embedded_modules=embedded_modules,
+                failed_module=module_name,
+            )
         else:
             embedded_modules.append(module_name)
             _git_commit(output_path, f"Add module: {module_name}")
 
-    return embedded_modules
+    return EmbedModulesResult(success=True, embedded_modules=embedded_modules)
 
 
-def _run_post_generation_steps(output_path: Path) -> None:
-    """Run poetry install and migrations."""
+def _run_post_generation_steps(output_path: Path, run_migrations: bool = True) -> None:
+    """Run poetry install and optionally migrations."""
     if not _run_poetry_install(output_path):
         click.secho("⚠️  Poetry install failed, continuing...", fg="yellow")
 
-    if not _run_migrations(output_path):
+    if run_migrations and not _run_migrations(output_path):
         click.secho("⚠️  Migrations failed, continuing...", fg="yellow")
 
 
@@ -590,7 +640,8 @@ def _save_project_state(
             new_state = QuickScaleState(
                 version="1",
                 project=ProjectState(
-                    name=qs_config.project.name,
+                    slug=qs_config.project.slug,
+                    package=qs_config.project.package,
                     theme=qs_config.project.theme,
                     created_at=datetime.now().isoformat(),
                     last_applied=datetime.now().isoformat(),
@@ -624,7 +675,10 @@ def _save_project_state(
 
 
 def _display_next_steps(
-    output_path: Path, qs_config: QuickScaleConfig, no_docker: bool
+    output_path: Path,
+    qs_config: QuickScaleConfig,
+    no_docker: bool,
+    docker_started: bool | None = None,
 ) -> None:
     """Display success message and next steps."""
     click.echo("\n" + "=" * 50)
@@ -633,12 +687,17 @@ def _display_next_steps(
 
     click.echo("\n📋 Next steps:")
     if output_path != Path.cwd():
-        click.echo(f"  cd {qs_config.project.name}")
+        click.echo(f"  cd {qs_config.project.slug}")
 
     if qs_config.docker.start and not no_docker:
-        click.echo("  # Docker services should be running")
-        click.echo("  quickscale logs web  # View logs")
-        click.echo("  quickscale ps        # Check status")
+        if docker_started is False:
+            click.echo("  # Docker auto-start failed during apply")
+            click.echo("  quickscale up --build  # Retry Docker startup")
+            click.echo("  quickscale logs        # View failure details")
+        else:
+            click.echo("  # Docker services should be running")
+            click.echo("  quickscale logs backend  # View logs")
+            click.echo("  quickscale ps        # Check status")
     else:
         click.echo("  quickscale up        # Start Docker services")
         click.echo("  # Or run without Docker:")
@@ -657,7 +716,7 @@ def _prepare_apply_context(config_path: Path) -> ApplyContext:
     qs_config = _load_and_validate_config(config_path)
 
     # Determine output path
-    output_path = _determine_output_path(config_path, qs_config.project.name)
+    output_path = _determine_output_path(config_path, qs_config.project.slug)
 
     # Load existing state if project exists
     state_manager = StateManager(output_path)
@@ -684,6 +743,57 @@ def _prepare_apply_context(config_path: Path) -> ApplyContext:
     )
 
 
+def _regenerate_managed_wiring_for_apply(
+    ctx: ApplyContext,
+    embedded_modules: list[str],
+) -> bool:
+    """Regenerate managed module wiring files after embed/config changes."""
+    desired_module_names = sorted(ctx.qs_config.modules.keys())
+    if ctx.existing_state is None:
+        selected_modules = embedded_modules
+    else:
+        # Existing state may include unchanged modules that should remain wired.
+        selected_modules = sorted(
+            set(ctx.delta.modules_unchanged) | set(embedded_modules)
+        )
+
+    # If no desired modules are configured, explicitly render empty managed files.
+    if not desired_module_names:
+        selected_modules = []
+
+    options = {
+        module_name: module_config.options
+        for module_name, module_config in ctx.qs_config.modules.items()
+    }
+
+    success, message = regenerate_managed_wiring(
+        ctx.output_path,
+        module_names=selected_modules,
+        option_overrides=options,
+        project_package=ctx.qs_config.project.package,
+    )
+    if success:
+        click.secho("✅ Managed module wiring regenerated", fg="green")
+        return True
+
+    click.secho(f"❌ Managed wiring regeneration failed: {message}", fg="red", err=True)
+    return False
+
+
+def _print_apply_failure_summary(failed_step: str, reason: str) -> None:
+    """Print explicit failure summary and skipped steps."""
+    click.echo("\n" + "=" * 50)
+    click.secho("❌ Apply failed", fg="red", bold=True)
+    click.echo("=" * 50)
+    click.echo(f"\nFailed step: {failed_step}")
+    click.echo(f"Reason: {reason}")
+    click.echo("\nSkipped downstream steps:")
+    click.echo("  • poetry install")
+    click.echo("  • migrations")
+    click.echo("  • docker start")
+    click.echo("  • success completion output")
+
+
 def _execute_apply_steps(
     ctx: ApplyContext,
     force: bool,
@@ -714,25 +824,75 @@ def _execute_apply_steps(
         if ctx.existing_state
         else list(ctx.qs_config.modules.keys())
     )
-    embedded_modules = _embed_modules_step(
+    embed_result = _embed_modules_step(
         ctx.output_path, modules_to_embed, no_modules, ctx.existing_state
     )
+    embedded_modules = embed_result.embedded_modules
+
+    if not embed_result.success:
+        # Persist successful partial embeds (explicit no-rollback contract).
+        _save_project_state(
+            ctx.output_path,
+            ctx.qs_config,
+            ctx.existing_state,
+            embedded_modules,
+            ctx.delta,
+        )
+        _print_apply_failure_summary(
+            failed_step="module embedding",
+            reason=f"required module '{embed_result.failed_module}' failed to embed",
+        )
+        raise click.Abort()
+
+    # Deterministic managed wiring generation for selected modules.
+    if not _regenerate_managed_wiring_for_apply(ctx, embedded_modules):
+        _save_project_state(
+            ctx.output_path,
+            ctx.qs_config,
+            ctx.existing_state,
+            embedded_modules,
+            ctx.delta,
+        )
+        _print_apply_failure_summary(
+            failed_step="managed module wiring generation",
+            reason="unable to render settings/modules.py and urls_modules.py",
+        )
+        raise click.Abort()
 
-    # Run post-generation steps
-    _run_post_generation_steps(ctx.output_path)
+    should_auto_start_docker = not no_docker and ctx.qs_config.docker.start
+
+    # Run post-generation steps. Defer migrations until after Docker startup
+    # when auto-start is enabled, so PostgreSQL is reachable.
+    _run_post_generation_steps(
+        ctx.output_path,
+        run_migrations=not should_auto_start_docker,
+    )
 
     # Apply mutable configuration changes
     if ctx.existing_state and ctx.delta.has_mutable_config_changes:
-        if not _apply_mutable_config(ctx.output_path, ctx.delta, ctx.manifests):
-            click.secho("⚠️  Some config changes failed to apply", fg="yellow")
+        click.secho(
+            "✅ Mutable configuration changes applied via managed wiring",
+            fg="green",
+        )
 
     # Start Docker
-    if not no_docker and ctx.qs_config.docker.start:
-        if not _start_docker(
+    docker_started: bool | None = None
+    if should_auto_start_docker:
+        docker_started = _start_docker(
             ctx.output_path, ctx.qs_config.docker.build, verbose_docker
-        ):
+        )
+        if not docker_started:
             click.secho("⚠️  Docker start failed, continuing...", fg="yellow")
 
+    # For Docker auto-start projects, run migrations in the backend container
+    # so database connectivity uses the internal Docker network.
+    if should_auto_start_docker:
+        if docker_started:
+            if not _run_migrations_in_docker(ctx.output_path):
+                click.secho("⚠️  Migrations failed, continuing...", fg="yellow")
+        elif not _run_migrations(ctx.output_path):
+            click.secho("⚠️  Migrations failed, continuing...", fg="yellow")
+
     # Save state
     _save_project_state(
         ctx.output_path,
@@ -743,7 +903,7 @@ def _execute_apply_steps(
     )
 
     # Display next steps
-    _display_next_steps(ctx.output_path, ctx.qs_config, no_docker)
+    _display_next_steps(ctx.output_path, ctx.qs_config, no_docker, docker_started)
 
 
 @click.command()
@@ -796,10 +956,11 @@ def apply(
       1. Validate configuration
       2. Generate project
       3. Initialize git + initial commit
-      4. Embed modules (if configured)
-      5. Run poetry install
-      6. Run migrations
+      4. Embed modules (if configured, fail-fast on required module failure)
+      5. Regenerate managed module wiring files
+      6. Run poetry install
       7. Start Docker (if configured)
+      8. Run migrations (after Docker auto-start when enabled)
     """
     # Prepare context
     ctx = _prepare_apply_context(Path(config))