quickscale-cli 0.85.0__tar.gz → 0.86.0__tar.gz

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickscale-cli
-Version: 0.85.0
+Version: 0.86.0
 Summary: Command-line interface for QuickScale Django project generator
 License-Expression: Apache-2.0
 Keywords: django,cli,project-generator,saas
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 6.0
 Requires-Dist: click (>=8.3.1,<9.0.0)
-Requires-Dist: quickscale-core (>=0.85.0,<0.86.0)
+Requires-Dist: quickscale-core (>=0.86.0,<0.87.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

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "quickscale-cli"
-version = "0.85.0"
+version = "0.86.0"
 description = "Command-line interface for QuickScale Django project generator"
 requires-python = ">=3.13,<3.15"
 readme = "README.md"
@@ -32,7 +32,7 @@ packages = [{include = "quickscale_cli", from = "src"}]
 [tool.poetry.dependencies]
 python = ">=3.13,<3.15"
 click = "^8.3.1"
-quickscale-core = "^0.85.0"
+quickscale-core = "^0.86.0"
 
 [tool.poetry.group.dev.dependencies]
 # Dev dependencies centralized in root pyproject.toml

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/_version.py

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

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/commands/apply_command.py

@@ -21,7 +21,14 @@ from quickscale_cli.analytics_contract import (
     resolve_analytics_module_options,
     validate_analytics_module_options,
 )
-from quickscale_cli.billing_contract import validate_billing_module_options
+from quickscale_cli.billing_contract import (
+    DEFAULT_BILLING_CURRENCY,
+    DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR,
+    DEFAULT_BILLING_SECRET_KEY_ENV_VAR,
+    DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR,
+    resolve_billing_module_options,
+    validate_billing_module_options,
+)
 from quickscale_cli.backups_contract import (
     BACKUPS_REMOTE_ACCESS_KEY_ID_ENV_VAR_OPTION,
     BACKUPS_REMOTE_SECRET_ACCESS_KEY_ENV_VAR_OPTION,
@@ -40,6 +47,9 @@ from quickscale_cli.notifications_contract import (
     resolve_notifications_module_options,
     validate_notifications_module_options,
 )
+from quickscale_cli.commands.implied_module_defaults import (
+    get_implied_module_default_configs,
+)
 from quickscale_cli.module_catalog import (
     find_not_ready_modules,
     get_module_readiness_reason,
@@ -64,6 +74,7 @@ from quickscale_cli.utils.module_dependency_sync import (
 from quickscale_cli.utils.module_wiring_manager import regenerate_managed_wiring
 from quickscale_cli.schema.config_schema import (
     ConfigValidationError,
+    ModuleConfig,
     QuickScaleConfig,
     generate_yaml,
     validate_config,
@@ -681,6 +692,21 @@ def _sanitize_loaded_module_configs(qs_config: QuickScaleConfig) -> list[str]:
     return sanitized_modules
 
 
+def _materialize_implied_module_configs(qs_config: QuickScaleConfig) -> list[str]:
+    """Add explicit module config blocks required by selected modules."""
+    implied_configs = get_implied_module_default_configs(qs_config.modules.keys())
+    if not implied_configs:
+        return []
+
+    for module_name, options in implied_configs.items():
+        qs_config.modules[module_name] = ModuleConfig(
+            name=module_name,
+            options=sanitize_module_options(module_name, options),
+        )
+
+    return list(implied_configs.keys())
+
+
 def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
     """Load and validate configuration from file."""
     if not config_path.exists():
@@ -699,16 +725,24 @@ def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
         qs_config = validate_config(yaml_content)
         original_data = yaml.safe_load(yaml_content) or {}
         original_modules = original_data.get("modules") or {}
-        _sanitize_loaded_module_configs(qs_config)
+        sanitized_modules = _sanitize_loaded_module_configs(qs_config)
+        implied_modules = _materialize_implied_module_configs(qs_config)
         normalized_yaml = generate_yaml(qs_config)
         normalized_data = yaml.safe_load(normalized_yaml) or {}
         normalized_modules = normalized_data.get("modules") or {}
         if normalized_modules != original_modules:
             config_path.write_text(normalized_yaml)
-            click.secho(
-                "✅ Sanitized legacy module config keys in quickscale.yml",
-                fg="green",
-            )
+            if sanitized_modules:
+                click.secho(
+                    "✅ Sanitized legacy module config keys in quickscale.yml",
+                    fg="green",
+                )
+            if implied_modules:
+                click.secho(
+                    "✅ Added implied module config to quickscale.yml: "
+                    + ", ".join(implied_modules),
+                    fg="green",
+                )
         _validate_module_prerequisites(qs_config)
         return qs_config
     except ConfigValidationError as e:
@@ -721,6 +755,25 @@ def _load_and_validate_config(config_path: Path) -> QuickScaleConfig:
 
 def _validate_module_prerequisites(qs_config: QuickScaleConfig) -> None:
     """Validate actionable module-specific prerequisites before apply proceeds."""
+    if "orgs" in qs_config.modules and "auth" not in qs_config.modules:
+        click.secho(
+            "\n❌ Organizations requires the auth module before apply can continue:",
+            fg="red",
+            err=True,
+        )
+        click.echo(
+            "  • Add 'auth' under modules in quickscale.yml before applying orgs.",
+            err=True,
+        )
+        click.echo(
+            "\n💡 Organizations relies on the QuickScale auth login flow and "
+            "django-allauth account adapter hooks. Re-run 'quickscale plan "
+            "--reconfigure --configure-modules' or edit quickscale.yml to add "
+            "auth, then re-run 'quickscale apply'.",
+            err=True,
+        )
+        raise click.Abort()
+
     billing_config = qs_config.modules.get("billing")
     if billing_config is not None:
         billing_issues = validate_billing_module_options(billing_config.options or {})
@@ -1044,6 +1097,95 @@ def _sync_analytics_env_example(
     return True
 
 
+def _render_billing_env_example_block(
+    options: Mapping[str, Any] | None,
+) -> str:
+    """Render the managed billing section for `.env.example`."""
+    resolved = resolve_billing_module_options(options)
+    publishable_key_env_var = str(
+        resolved.get(
+            "publishable_key_env_var",
+            DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR,
+        )
+        or DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR
+    ).strip()
+    secret_key_env_var = str(
+        resolved.get(
+            "secret_key_env_var",
+            DEFAULT_BILLING_SECRET_KEY_ENV_VAR,
+        )
+        or DEFAULT_BILLING_SECRET_KEY_ENV_VAR
+    ).strip()
+    webhook_secret_env_var = str(
+        resolved.get(
+            "webhook_secret_env_var",
+            DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR,
+        )
+        or DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR
+    ).strip()
+    billing_currency = str(
+        resolved.get("billing_currency", DEFAULT_BILLING_CURRENCY)
+        or DEFAULT_BILLING_CURRENCY
+    ).strip()
+
+    return "\n".join(
+        [
+            "# QuickScale Billing (managed)",
+            "# Runtime Stripe variables for the backend billing module.",
+            f"# Billing currency from quickscale.yml: {billing_currency}",
+            f"{publishable_key_env_var}=",
+            f"{secret_key_env_var}=",
+            f"{webhook_secret_env_var}=",
+            "# End QuickScale Billing",
+        ]
+    )
+
+
+def _sync_billing_env_example(
+    output_path: Path,
+    qs_config: QuickScaleConfig,
+) -> bool:
+    """Keep `.env.example` aligned with the billing env-var names."""
+    billing_config = qs_config.modules.get("billing")
+    env_example_path = output_path / ".env.example"
+    if billing_config is None or not env_example_path.exists():
+        return True
+
+    start_marker = "# QuickScale Billing (managed)"
+    end_marker = "# End QuickScale Billing"
+    rendered_block = _render_billing_env_example_block(billing_config.options or {})
+
+    try:
+        content = env_example_path.read_text()
+    except OSError as e:
+        click.secho(
+            f"⚠️  Failed to read .env.example for billing wiring: {e}",
+            fg="yellow",
+        )
+        return False
+
+    if start_marker in content and end_marker in content:
+        before, remainder = content.split(start_marker, maxsplit=1)
+        _, after = remainder.split(end_marker, maxsplit=1)
+        replacement = rendered_block + after
+        updated_content = before + replacement
+    else:
+        suffix = "" if content.endswith("\n") else "\n"
+        updated_content = content + suffix + "\n" + rendered_block + "\n"
+
+    try:
+        env_example_path.write_text(updated_content)
+    except OSError as e:
+        click.secho(
+            f"⚠️  Failed to update .env.example for billing wiring: {e}",
+            fg="yellow",
+        )
+        return False
+
+    click.secho("✅ Updated .env.example with billing env vars", fg="green")
+    return True
+
+
 def _normalize_backups_gitignore_entry(local_directory: str) -> str | None:
     """Return a safe repo-relative ignore entry for backup artifacts."""
     if any(
@@ -2219,6 +2361,14 @@ def _execute_apply_steps(
             reason="Unable to update .env.example with the configured analytics env-var names.",
         )
 
+    if not _sync_billing_env_example(ctx.output_path, ctx.qs_config):
+        _abort_after_post_embed_failure(
+            ctx,
+            embedded_modules,
+            failed_step="billing env example sync",
+            reason="Unable to update .env.example with the configured billing env-var names.",
+        )
+
     if not _sync_project_module_dependencies_for_apply(
         ctx.output_path,
         ctx.qs_config,

quickscale_cli-0.86.0/src/quickscale_cli/commands/implied_module_defaults.py

@@ -0,0 +1,23 @@
+"""Helpers for materializing implicit module configs in CLI flows."""
+
+from collections.abc import Collection
+from typing import Any
+
+from quickscale_cli.commands.module_config import get_default_notifications_config
+
+
+def get_implied_module_default_configs(
+    module_names: Collection[str],
+) -> dict[str, dict[str, Any]]:
+    """Return module config blocks that should be made explicit automatically."""
+    names = set(module_names)
+    implied_configs: dict[str, dict[str, Any]] = {}
+
+    if "billing" in names and "orgs" not in names:
+        implied_configs["orgs"] = {}
+        names.add("orgs")
+
+    if "orgs" in names and "notifications" not in names:
+        implied_configs["notifications"] = get_default_notifications_config()
+
+    return implied_configs

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/commands/module_config.py

@@ -1973,6 +1973,16 @@ def apply_social_configuration(
     click.echo("  • Providers: " + ", ".join(list(resolved["provider_allowlist"])))
 
 
+# ============================================================================
+# ORGS MODULE
+# ============================================================================
+
+
+def get_default_orgs_config() -> dict[str, Any]:
+    """Return default configuration for the orgs module."""
+    return {"mode": "solo"}
+
+
 # ============================================================================
 # MODULE CONFIGURATORS REGISTRY
 # ============================================================================

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/commands/module_wiring_specs.py

@@ -16,6 +16,13 @@ from quickscale_cli.backups_contract import (
     DEFAULT_BACKUPS_REMOTE_SECRET_ACCESS_KEY_ENV_VAR,
     normalize_backups_module_options,
 )
+from quickscale_cli.billing_contract import (
+    DEFAULT_BILLING_CURRENCY,
+    DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR,
+    DEFAULT_BILLING_SECRET_KEY_ENV_VAR,
+    DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR,
+    normalize_billing_module_options,
+)
 from quickscale_cli.notifications_contract import (
     NOTIFICATIONS_LIVE_EMAIL_BACKEND,
     notifications_runtime_email_backend,
@@ -106,6 +113,25 @@ def _auth_wiring(options: Mapping[str, Any]) -> ModuleWiringSpec:
     )
 
 
+def _orgs_wiring(options: Mapping[str, Any]) -> ModuleWiringSpec:
+    mode = str(options.get("mode", "solo")).strip().lower() or "solo"
+    if mode not in {"solo", "saas"}:
+        mode = "solo"
+
+    root_include = (("", "quickscale_modules_orgs.urls"),)
+
+    return ModuleWiringSpec(
+        apps=("quickscale_modules_orgs",),
+        middleware=("quickscale_modules_orgs.middleware.TenantMiddleware",),
+        settings={
+            "ACCOUNT_ADAPTER": "quickscale_modules_orgs.adapters.OrgsAccountAdapter",
+            "QUICKSCALE_MODE": mode,
+        },
+        pre_home_url_includes=root_include if mode == "solo" else (),
+        url_includes=root_include if mode == "saas" else (),
+    )
+
+
 def _blog_wiring(options: Mapping[str, Any]) -> ModuleWiringSpec:
     posts_per_page = int(options.get("posts_per_page", 10))
     enable_rss = bool(options.get("enable_rss", True))
@@ -607,8 +633,36 @@ def _social_wiring(
     )
 
 
+def _billing_wiring(options: Mapping[str, Any]) -> ModuleWiringSpec:
+    opts = normalize_billing_module_options(options)
+
+    settings: dict[str, Any] = {
+        "QUICKSCALE_BILLING_ENABLED": bool(opts.get("enabled", True)),
+        "QUICKSCALE_BILLING_PUBLISHABLE_KEY_ENV_VAR": str(
+            opts.get("publishable_key_env_var", DEFAULT_BILLING_PUBLISHABLE_KEY_ENV_VAR)
+        ),
+        "QUICKSCALE_BILLING_SECRET_KEY_ENV_VAR": str(
+            opts.get("secret_key_env_var", DEFAULT_BILLING_SECRET_KEY_ENV_VAR)
+        ),
+        "QUICKSCALE_BILLING_WEBHOOK_SECRET_ENV_VAR": str(
+            opts.get("webhook_secret_env_var", DEFAULT_BILLING_WEBHOOK_SECRET_ENV_VAR)
+        ),
+        "QUICKSCALE_BILLING_CURRENCY": str(
+            opts.get("billing_currency", DEFAULT_BILLING_CURRENCY)
+        ),
+    }
+
+    return ModuleWiringSpec(
+        apps=("rest_framework", "quickscale_modules_billing"),
+        settings=settings,
+        url_includes=(("", "quickscale_modules_billing.urls"),),
+    )
+
+
 MODULE_WIRING_BUILDERS = {
     "auth": _auth_wiring,
+    "orgs": _orgs_wiring,
+    "billing": _billing_wiring,
     "blog": _blog_wiring,
     "listings": _listings_wiring,
     "crm": _crm_wiring,

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/commands/plan_command.py

@@ -13,6 +13,9 @@ import click
 
 from quickscale_cli.auth_contract import format_auth_desired_config_contract
 from quickscale_cli.backups_contract import sanitize_module_options
+from quickscale_cli.commands.implied_module_defaults import (
+    get_implied_module_default_configs,
+)
 from quickscale_cli.commands.module_config import MODULE_CONFIGURATORS
 from quickscale_cli.module_catalog import (
     ModuleCatalogEntry,
@@ -236,6 +239,32 @@ def _merge_module_names(*module_groups: list[str]) -> list[str]:
     return merged
 
 
+def _materialize_implied_module_configs(
+    module_names: list[str],
+    module_options: dict[str, dict[str, Any]],
+) -> tuple[list[str], dict[str, dict[str, Any]], list[str]]:
+    """Add explicit config blocks for modules that are implied by selection."""
+    present_module_names = _merge_module_names(
+        module_names, list(module_options.keys())
+    )
+    implied_configs = get_implied_module_default_configs(present_module_names)
+    if not implied_configs:
+        return present_module_names, module_options, []
+
+    merged_module_names = _merge_module_names(
+        present_module_names,
+        list(implied_configs.keys()),
+    )
+    merged_module_options = dict(module_options)
+    for module_name, options in implied_configs.items():
+        merged_module_options[module_name] = _copy_module_options(
+            options,
+            module_name=module_name,
+        )
+
+    return merged_module_names, merged_module_options, list(implied_configs.keys())
+
+
 def _get_existing_module_options(
     project_path: Path,
     existing_config: QuickScaleConfig | None,
@@ -655,6 +684,15 @@ def _handle_add_modules(
         for module_name in new_modules:
             existing_options.setdefault(module_name, {})
 
+    all_modules, existing_options, implied_modules = (
+        _materialize_implied_module_configs(
+            all_modules,
+            existing_options,
+        )
+    )
+    if implied_modules:
+        new_modules = _merge_module_names(new_modules, implied_modules)
+
     if existing_config is not None:
         docker_config = existing_config.docker
         project_config = existing_config.project
@@ -816,6 +854,11 @@ def _handle_reconfigure(
             )
         )
 
+    all_modules, module_options, _ = _materialize_implied_module_configs(
+        all_modules,
+        module_options,
+    )
+
     # Configure Docker
     docker_start, docker_build, docker_create_superuser = _configure_docker()
 
@@ -1134,6 +1177,11 @@ def plan(
             )
         )
 
+    selected_modules, module_options, _ = _materialize_implied_module_configs(
+        selected_modules,
+        module_options,
+    )
+
     # Build configuration
     modules = _build_module_configs(selected_modules, module_options)
 

{quickscale_cli-0.85.0 → quickscale_cli-0.86.0}/src/quickscale_cli/module_catalog.py

@@ -70,6 +70,11 @@ MODULE_CATALOG: tuple[ModuleCatalogEntry, ...] = (
         description="Stripe integration with credits-first pricing and dashboard routes",
         ready=True,
     ),
+    ModuleCatalogEntry(
+        name="orgs",
+        description="Organizations and multi-tenant foundations with memberships and invitations",
+        ready=True,
+    ),
     ModuleCatalogEntry(
         name="teams",
         description="Multi-tenancy and team management",