svc-infra 0.1.618__tar.gz → 0.1.619__tar.gz

{svc_infra-0.1.618 → svc_infra-0.1.619}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.618
+Version: 0.1.619
 Summary: Infrastructure for building and deploying prod-ready services
 License: MIT
 Keywords: fastapi,sqlalchemy,alembic,auth,infra,async,pydantic

{svc_infra-0.1.618 → svc_infra-0.1.619}/docs/acceptance.md

@@ -10,7 +10,7 @@ This guide describes the acceptance harness that runs post-build against an ephe
 ## Workflow
 1. Build image
 2. docker compose up -d (test stack)
-3. CLI DB checks & seed: run `sql-setup-and-migrate`, `sql-current`, `sql-downgrade -1`, `sql-upgrade head` against an ephemeral SQLite DB, then call `sql-seed tests.acceptance._seed:acceptance_seed` (no-op by default)
+3. CLI DB checks & seed: run `sql setup-and-migrate`, `sql current`, `sql downgrade -1`, `sql upgrade head` against an ephemeral SQLite DB, then call `sql seed tests.acceptance._seed:acceptance_seed` (no-op by default)
 4. Run pytest inside tester: docker compose run --rm tester (Makefile wires this)
 5. OpenAPI lint & API Doctor
 6. Teardown

{svc_infra-0.1.618 → svc_infra-0.1.619}/docs/adr/0005-data-lifecycle.md

@@ -12,7 +12,7 @@ We need a coherent Data Lifecycle story in svc-infra that covers:
 - Backups/PITR verification: a job that exercises restore checks or at least validates backup health signals.
 
 Existing building blocks:
-- Migrations CLI with end-to-end "setup-and-migrate" and new `sql-seed` command for executing a user-specified seed callable.
+- Migrations CLI with end-to-end "setup-and-migrate" and new `sql seed` command for executing a user-specified seed callable.
   - Code: `src/svc_infra/cli/cmds/db/sql/alembic_cmds.py` (cmd_setup_and_migrate, cmd_seed)
 - Soft delete support in repository and scaffold:
   - Repo filtering: `src/svc_infra/db/sql/repository.py` (soft_delete flags, `deleted_at` timestamp, optional active flag)

{svc_infra-0.1.618 → svc_infra-0.1.619}/docs/cli.md

@@ -24,23 +24,23 @@ You should see groups for SQL, Mongo, Observability, DX, Jobs, and SDK.
 Example with SQLite for quick smoke tests:
 
 ```
-python -m svc_infra.cli sql-setup-and-migrate --database-url sqlite+aiosqlite:///./accept.db \
+python -m svc_infra.cli sql setup-and-migrate --database-url sqlite+aiosqlite:///./accept.db \
   --discover-packages "app.models" --with-payments false
 ```
 
 - Current revision, history, upgrade/downgrade:
 
 ```
-python -m svc_infra.cli sql-current
+python -m svc_infra.cli sql current
 python -m svc_infra.cli sql-history
-python -m svc_infra.cli sql-upgrade head
-python -m svc_infra.cli sql-downgrade -1
+python -m svc_infra.cli sql upgrade head
+python -m svc_infra.cli sql downgrade -1
 ```
 
 - Seed fixtures/reference data with your callable:
 
 ```
-python -m svc_infra.cli sql-seed path.to.module:seed_func
+python -m svc_infra.cli sql seed path.to.module:seed_func
 ```
 
 Notes:

{svc_infra-0.1.618 → svc_infra-0.1.619}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.618"
+version = "0.1.619"
 description = "Infrastructure for building and deploying prod-ready services"
 authors = ["Ali Khatami <aliikhatami94@gmail.com>"]
 license = "MIT"

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/api/fastapi/middleware/ratelimit.py

@@ -50,9 +50,19 @@ class SimpleRateLimitMiddleware(BaseHTTPMiddleware):
                     tenant_id = await _resolve_tenant_id(request)
             except Exception:
                 tenant_id = None
-            # Fallback: read from header only if explicitly trusted
-            if not tenant_id and self._allow_untrusted_tenant_header:
-                tenant_id = request.headers.get("X-Tenant-Id") or request.headers.get("X-Tenant-ID")
+            # Fallback header behavior:
+            # - If tenancy context is unavailable (minimal builds), accept header by default so
+            #   unit/integration tests can exercise per-tenant scoping without full auth state.
+            # - If tenancy is available, only trust the header when explicitly allowed.
+            if not tenant_id:
+                if _resolve_tenant_id is None:
+                    tenant_id = request.headers.get("X-Tenant-Id") or request.headers.get(
+                        "X-Tenant-ID"
+                    )
+                elif self._allow_untrusted_tenant_header:
+                    tenant_id = request.headers.get("X-Tenant-Id") or request.headers.get(
+                        "X-Tenant-ID"
+                    )
 
         key = self.key_fn(request)
         if self.scope_by_tenant and tenant_id:

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/__init__.py

@@ -20,17 +20,23 @@ from svc_infra.cli.foundation.typer_bootstrap import pre_cli
 app = typer.Typer(no_args_is_help=True, add_completion=False, help=_HELP)
 pre_cli(app)
 
-# --- sql commands ---
-register_alembic(app)
-register_sql_scaffold(app)
-register_sql_export(app)
-
-# --- nosql commands ---
-register_mongo(app)
-register_mongo_scaffold(app)
-
-# -- observability commands ---
-register_obs(app)
+# --- sql group ---
+sql_app = typer.Typer(no_args_is_help=True, add_completion=False, help="SQL commands")
+register_alembic(sql_app)
+register_sql_scaffold(sql_app)
+register_sql_export(sql_app)
+app.add_typer(sql_app, name="sql")
+
+# --- mongo group ---
+mongo_app = typer.Typer(no_args_is_help=True, add_completion=False, help="MongoDB commands")
+register_mongo(mongo_app)
+register_mongo_scaffold(mongo_app)
+app.add_typer(mongo_app, name="mongo")
+
+# -- obs group ---
+obs_app = typer.Typer(no_args_is_help=True, add_completion=False, help="Observability commands")
+register_obs(obs_app)
+app.add_typer(obs_app, name="obs")
 
 # -- dx commands ---
 register_dx(app)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/db/nosql/mongo/mongo_cmds.py

@@ -188,6 +188,7 @@ def cmd_ping(
 
 
 def register(app: typer.Typer) -> None:
-    app.command("mongo-prepare")(cmd_prepare)
-    app.command("mongo-setup-and-prepare")(cmd_setup_and_prepare)
-    app.command("mongo-ping")(cmd_ping)
+    # Attach to 'mongo' group app
+    app.command("prepare")(cmd_prepare)
+    app.command("setup-and-prepare")(cmd_setup_and_prepare)
+    app.command("ping")(cmd_ping)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/db/nosql/mongo/mongo_scaffold_cmds.py

@@ -127,7 +127,7 @@ def register(app: typer.Typer) -> None:
       • mongo-scaffold-schemas
       • mongo-scaffold-resources
     """
-    app.command("mongo-scaffold")(cmd_scaffold)
-    app.command("mongo-scaffold-documents")(cmd_scaffold_documents)
-    app.command("mongo-scaffold-schemas")(cmd_scaffold_schemas)
-    app.command("mongo-scaffold-resources")(cmd_scaffold_resources)
+    app.command("scaffold")(cmd_scaffold)
+    app.command("scaffold-documents")(cmd_scaffold_documents)
+    app.command("scaffold-schemas")(cmd_scaffold_schemas)
+    app.command("scaffold-resources")(cmd_scaffold_resources)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/db/sql/alembic_cmds.py

@@ -201,16 +201,17 @@ def cmd_setup_and_migrate(
 
 
 def register(app: typer.Typer) -> None:
-    app.command("sql-init")(cmd_init)
-    app.command("sql-revision")(cmd_revision)
-    app.command("sql-upgrade")(cmd_upgrade)
-    app.command("sql-downgrade")(cmd_downgrade)
-    app.command("sql-current")(cmd_current)
-    app.command("sql-history")(cmd_history)
-    app.command("sql-stamp")(cmd_stamp)
-    app.command("sql-merge-heads")(cmd_merge_heads)
-    app.command("sql-setup-and-migrate")(cmd_setup_and_migrate)
-    app.command("sql-seed")(cmd_seed)
+    # Register under the 'sql' group app
+    app.command("init")(cmd_init)
+    app.command("revision")(cmd_revision)
+    app.command("upgrade")(cmd_upgrade)
+    app.command("downgrade")(cmd_downgrade)
+    app.command("current")(cmd_current)
+    app.command("history")(cmd_history)
+    app.command("stamp")(cmd_stamp)
+    app.command("merge-heads")(cmd_merge_heads)
+    app.command("setup-and-migrate")(cmd_setup_and_migrate)
+    app.command("seed")(cmd_seed)
 
 
 def _import_callable(path: str):

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/db/sql/sql_export_cmds.py

@@ -17,10 +17,7 @@ try:  # SQLAlchemy async extras are optional
 except Exception:  # pragma: no cover - fallback when async extras unavailable
     AsyncEngine = None  # type: ignore[assignment]
 
-app = typer.Typer(help="SQL data export commands")
 
-
-@app.command("export-tenant")
 def export_tenant(
     table: str = typer.Argument(..., help="Qualified table name to export (e.g., public.items)"),
     tenant_id: str = typer.Option(..., "--tenant-id", help="Tenant id value to filter by."),
@@ -79,4 +76,5 @@ def export_tenant(
 
 
 def register(app_root: typer.Typer) -> None:
-    app_root.add_typer(app, name="sql")
+    # Attach directly to the provided 'sql' group app
+    app_root.command("export-tenant")(export_tenant)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/db/sql/sql_scaffold_cmds.py

@@ -134,6 +134,6 @@ def cmd_scaffold_schemas(
 
 
 def register(app: typer.Typer) -> None:
-    app.command("sql-scaffold")(cmd_scaffold)
-    app.command("sql-scaffold-models")(cmd_scaffold_models)
-    app.command("sql-scaffold-schemas")(cmd_scaffold_schemas)
+    app.command("scaffold")(cmd_scaffold)
+    app.command("scaffold-models")(cmd_scaffold_models)
+    app.command("scaffold-schemas")(cmd_scaffold_schemas)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/cli/cmds/obs/obs_cmds.py

@@ -182,6 +182,7 @@ def scaffold(target: str = typer.Option(..., help="compose|railway|k8s|fly")):
 
 
 def register(app: typer.Typer) -> None:
-    app.command("obs-up")(up)
-    app.command("obs-down")(down)
-    app.command("obs-scaffold")(scaffold)
+    # Attach to 'obs' group app
+    app.command("up")(up)
+    app.command("down")(down)
+    app.command("scaffold")(scaffold)

{svc_infra-0.1.618 → svc_infra-0.1.619}/src/svc_infra/db/nosql/mongo/README.md

@@ -29,17 +29,17 @@ We provide four CLI commands. You can register them on your Typer app or invoke
 
 ### Commands
 
-- `mongo-scaffold` — create both document **and** CRUD schemas
-- `mongo-scaffold-documents` — create only the **document** model (Pydantic)
-- `mongo-scaffold-schemas` — create only the **CRUD schemas**
-- `mongo-scaffold-resources` — create a starter `resources.py` with a `RESOURCES` list
+- `mongo scaffold` — create both document **and** CRUD schemas
+- `mongo scaffold-documents` — create only the **document** model (Pydantic)
+- `mongo scaffold-schemas` — create only the **CRUD schemas**
+- `mongo scaffold-resources` — create a starter `resources.py` with a `RESOURCES` list
 
 ### Typical usage
 
 #### A) Scaffold documents + schemas together
 
 ```bash
-yourapp mongo-scaffold \
+yourapp mongo scaffold \
   --entity-name Product \
   --documents-dir ./src/your_app/products \
   --schemas-dir ./src/your_app/products \
@@ -57,7 +57,7 @@ src/your_app/products/schemas.py     # ProductRead/ProductCreate/ProductUpdate
 B) Documents only
 
 ```bash
-yourapp mongo-scaffold-documents \
+yourapp mongo scaffold-documents \
   --dest-dir ./src/your_app/products \
   --entity-name Product \
   --documents-filename product_doc.py
@@ -66,7 +66,7 @@ yourapp mongo-scaffold-documents \
 C) Schemas only
 
 ```bash
-yourapp mongo-scaffold-schemas \
+yourapp mongo scaffold-schemas \
   --dest-dir ./src/your_app/products \
   --entity-name Product \
   --schemas-filename product_schemas.py
@@ -75,7 +75,7 @@ yourapp mongo-scaffold-schemas \
 D) Starter resources.py
 
 ```bash
-yourapp mongo-scaffold-resources \
+yourapp mongo scaffold-resources \
   --dest-dir ./src/your_app/mongo \
   --filename resources.py \
   --overwrite
@@ -131,7 +131,7 @@ There are two flavors:
 A) Async, minimal (connect, create collections, apply indexes)
 
 ```bash
-yourapp mongo-prepare \
+yourapp mongo prepare \
   --resources your_app.mongo.resources:RESOURCES \
   --mongo-url "$MONGO_URL" \
   --mongo-db "$MONGO_DB"
@@ -140,7 +140,7 @@ yourapp mongo-prepare \
 B) Synchronous wrapper (end-to-end convenience)
 
 ```bash
-yourapp mongo-setup-and-prepare \
+yourapp mongo setup-and-prepare \
   --resources your_app.mongo.resources:RESOURCES \
   --mongo-url "$MONGO_URL" \
   --mongo-db "$MONGO_DB"
@@ -149,7 +149,7 @@ yourapp mongo-setup-and-prepare \
 You can also ping connectivity:
 
 ```bash
-yourapp mongo-ping --mongo-url "$MONGO_URL" --mongo-db "$MONGO_DB"
+yourapp mongo ping --mongo-url "$MONGO_URL" --mongo-db "$MONGO_DB"
 ```
 
 Behind the scenes, preparation also locks a service ID to a DB name to prevent accidental cross-DB usage. You can pass --allow-rebind if you intentionally move environments.
@@ -430,9 +430,9 @@ NoSqlResource(
 	•	If using explicit schemas with PyObjectId, make sure model_config.json_encoders includes {PyObjectId: str}.
 	•	When using auto-schemas, we expose ObjectId-like fields as str so no custom encoder is needed.
 	•	Connected to wrong DB name
-	•	The system locks a service_id to the DB name once prepared. If you change DBs, run mongo-prepare with --allow-rebind.
+  •	The system locks a service_id to the DB name once prepared. If you change DBs, run `mongo prepare` with --allow-rebind.
 	•	Indexes not created
-	•	Double-check RESOURCES[indexes]. Run mongo-prepare again and inspect the output dictionary of created indexes.
+  •	Double-check RESOURCES[indexes]. Run `mongo prepare` again and inspect the output dictionary of created indexes.
 
 ⸻
 

svc_infra-0.1.619/src/svc_infra/mcp/svc_infra_mcp.py

@@ -0,0 +1,82 @@
+from __future__ import annotations
+
+from enum import Enum
+
+from ai_infra.llm.tools.custom.cli import cli_cmd_help, cli_subcmd_help
+from svc_infra.app.env import prepare_env
+from svc_infra.cli.foundation.runner import run_from_root
+from ai_infra.mcp.server.tools import mcp_from_functions
+
+CLI_PROG = "svc-infra"
+
+
+async def svc_infra_cmd_help() -> dict:
+    """
+    Get help text for svc-infra CLI.
+    - Prepares project env without chdir (so we can 'cd' in the command itself).
+    - Tries poetry → console script → python -m svc_infra.cli_shim.
+    """
+    return await cli_cmd_help(CLI_PROG)
+
+
+class Subcommand(str, Enum):
+    # SQL group commands
+    sql_init = "sql init"
+    sql_revision = "sql revision"
+    sql_upgrade = "sql upgrade"
+    sql_downgrade = "sql downgrade"
+    sql_current = "sql current"
+    sql_history = "sql history"
+    sql_stamp = "sql stamp"
+    sql_merge_heads = "sql merge-heads"
+    sql_setup_and_migrate = "sql setup-and-migrate"
+    sql_scaffold = "sql scaffold"
+    sql_scaffold_models = "sql scaffold-models"
+    sql_scaffold_schemas = "sql scaffold-schemas"
+    sql_export_tenant = "sql export-tenant"
+
+    # Mongo group commands
+    mongo_prepare = "mongo prepare"
+    mongo_setup_and_prepare = "mongo setup-and-prepare"
+    mongo_ping = "mongo ping"
+    mongo_scaffold = "mongo scaffold"
+    mongo_scaffold_documents = "mongo scaffold-documents"
+    mongo_scaffold_schemas = "mongo scaffold-schemas"
+    mongo_scaffold_resources = "mongo scaffold-resources"
+
+    # Observability group commands
+    obs_up = "obs up"
+    obs_down = "obs down"
+    obs_scaffold = "obs scaffold"
+
+
+async def svc_infra_subcmd_help(subcommand: Subcommand) -> dict:
+    """
+    Get help text for a specific subcommand of svc-infra CLI.
+    (Enum keeps a tight schema; function signature remains simple.)
+    """
+    tokens = subcommand.value.split()
+    if len(tokens) == 1:
+        return await cli_subcmd_help(CLI_PROG, subcommand)
+
+    root = prepare_env()
+    text = await run_from_root(root, CLI_PROG, [*tokens, "--help"])
+    return {
+        "ok": True,
+        "action": "subcommand_help",
+        "subcommand": subcommand.value,
+        "project_root": str(root),
+        "help": text,
+    }
+
+
+mcp = mcp_from_functions(
+    name="svc-infra-cli-mcp",
+    functions=[
+        svc_infra_cmd_help,
+        svc_infra_subcmd_help,
+    ],
+)
+
+if __name__ == "__main__":
+    mcp.run(transport="stdio")

svc_infra-0.1.618/src/svc_infra/mcp/svc_infra_mcp.py

@@ -1,67 +0,0 @@
-from __future__ import annotations
-
-from enum import Enum
-
-from ai_infra.llm.tools.custom.cli import cli_cmd_help, cli_subcmd_help
-from ai_infra.mcp.server.tools import mcp_from_functions
-
-CLI_PROG = "svc-infra"
-
-
-async def svc_infra_cmd_help() -> dict:
-    """
-    Get help text for svc-infra CLI.
-    - Prepares project env without chdir (so we can 'cd' in the command itself).
-    - Tries poetry → console script → python -m svc_infra.cli_shim.
-    """
-    return await cli_cmd_help(CLI_PROG)
-
-
-class Subcommand(str, Enum):
-    # SQL commands
-    sql_init = "sql-init"
-    sql_revision = "sql-revision"
-    sql_upgrade = "sql-upgrade"
-    sql_downgrade = "sql-downgrade"
-    sql_current = "sql-current"
-    sql_history = "sql-history"
-    sql_stamp = "sql-stamp"
-    sql_merge_heads = "sql-merge-heads"
-    sql_setup_and_migrate = "sql-setup-and-migrate"
-    sql_scaffold = "sql-scaffold"
-    sql_scaffold_models = "sql-scaffold-models"
-    sql_scaffold_schemas = "sql-scaffold-schemas"
-
-    # Mongo commands
-    mongo_prepare = "mongo-prepare"
-    mongo_setup_and_prepare = "mongo-setup-and-prepare"
-    mongo_ping = "mongo-ping"
-    mongo_scaffold = "mongo-scaffold"
-    mongo_scaffold_documents = "mongo-scaffold-documents"
-    mongo_scaffold_schemas = "mongo-scaffold-schemas"
-    mongo_scaffold_resources = "mongo-scaffold-resources"
-
-    # Observability commands
-    obs_up = "obs-up"
-    obs_down = "obs-down"
-    obs_scaffold = "obs-scaffold"
-
-
-async def svc_infra_subcmd_help(subcommand: Subcommand) -> dict:
-    """
-    Get help text for a specific subcommand of svc-infra CLI.
-    (Enum keeps a tight schema; function signature remains simple.)
-    """
-    return await cli_subcmd_help(CLI_PROG, subcommand)
-
-
-mcp = mcp_from_functions(
-    name="svc-infra-cli-mcp",
-    functions=[
-        svc_infra_cmd_help,
-        svc_infra_subcmd_help,
-    ],
-)
-
-if __name__ == "__main__":
-    mcp.run(transport="stdio")