svc-infra 0.1.615__py3-none-any.whl → 0.1.617__py3-none-any.whl

svc_infra/api/fastapi/middleware/ratelimit.py

@@ -27,6 +27,10 @@ class SimpleRateLimitMiddleware(BaseHTTPMiddleware):
         limit_resolver=None,
         # If True, automatically scopes the bucket key by tenant id when available
         scope_by_tenant: bool = False,
+        # When True, allows unresolved tenant IDs to fall back to an "X-Tenant-Id" header value.
+        # Disabled by default to avoid trusting arbitrary client-provided headers which could
+        # otherwise be used to evade per-tenant limits when authentication fails.
+        allow_untrusted_tenant_header: bool = False,
         store: RateLimitStore | None = None,
     ):
         super().__init__(app)
@@ -34,6 +38,7 @@ class SimpleRateLimitMiddleware(BaseHTTPMiddleware):
         self.key_fn = key_fn or (lambda r: r.headers.get("X-API-Key") or r.client.host)
         self._limit_resolver = limit_resolver
         self.scope_by_tenant = scope_by_tenant
+        self._allow_untrusted_tenant_header = allow_untrusted_tenant_header
         self.store = store or InMemoryRateLimitStore(limit=limit)
 
     async def dispatch(self, request, call_next):
@@ -45,6 +50,9 @@ 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")
 
         key = self.key_fn(request)
         if self.scope_by_tenant and tenant_id:

svc_infra/bundled_docs/README.md

@@ -0,0 +1,5 @@
+# Bundled Docs
+
+This directory contains a minimal set of Markdown files that the `svc-infra docs` CLI can fall back to when the project running the CLI doesn't have a local `docs/` directory.
+
+You can add more topics here as needed; each `*.md` file becomes a topic named after its stem (e.g., `getting-started.md` -> `getting-started`).

svc_infra/bundled_docs/__init__.py

@@ -0,0 +1 @@
+# Bundled docs package for zip-safe importlib.resources access

svc_infra/bundled_docs/getting-started.md

@@ -0,0 +1,6 @@
+# Getting Started
+
+Welcome to svc-infra docs. Use `svc-infra docs list` to see topics.
+
+- This content is bundled with the package.
+- If your project doesn't have a local `docs/` folder, you'll still see this.

svc_infra/cli/cmds/docs/docs_cmds.py

@@ -1,69 +1,135 @@
 from __future__ import annotations
 
+import os
 from pathlib import Path
-from typing import Dict, List, Tuple
+from typing import Dict, List
 
+import click
 import typer
+from typer.core import TyperGroup
 
 from svc_infra.app.root import resolve_project_root
 
 
-def _discover_docs(root: Path) -> List[Tuple[str, Path]]:
-    """Return a list of (topic, file_path) for top-level Markdown files under docs/.
-
-    Topic is the filename stem (e.g. security.md -> "security").
-    """
-    docs_dir = root / "docs"
-    topics: List[Tuple[str, Path]] = []
-    if not docs_dir.exists() or not docs_dir.is_dir():
-        return topics
-    for p in sorted(docs_dir.glob("*.md")):
-        if p.is_file():
-            topics.append((p.stem.replace(" ", "-"), p))
+def _discover_fs_topics(docs_dir: Path) -> Dict[str, Path]:
+    topics: Dict[str, Path] = {}
+    if docs_dir.exists() and docs_dir.is_dir():
+        for p in sorted(docs_dir.glob("*.md")):
+            if p.is_file():
+                topics[p.stem.replace(" ", "-")] = p
     return topics
 
 
-def register(app: typer.Typer) -> None:
-    """Register the `docs` command group and dynamic topic subcommands."""
-
+def _discover_pkg_topics() -> Dict[str, object]:
+    # No bundled fallback; docs are packaged from repo root 'docs/'
+    return {}
+
+
+def _resolve_docs_dir(ctx: click.Context) -> Path | None:
+    # CLI option takes precedence; walk up parent contexts because Typer
+    # executes subcommands in child contexts that do not inherit params.
+    current: click.Context | None = ctx
+    while current is not None:
+        docs_dir = (current.params or {}).get("docs_dir")
+        if docs_dir:
+            path = docs_dir if isinstance(docs_dir, Path) else Path(docs_dir)
+            path = path.expanduser()
+            if path.exists():
+                return path
+        current = current.parent
+    # Env var next
+    env_dir = os.getenv("SVC_INFRA_DOCS_DIR")
+    if env_dir:
+        p = Path(env_dir).expanduser()
+        if p.exists():
+            return p
+    # Project docs
     root = resolve_project_root()
-    discovered = _discover_docs(root)
+    proj_docs = root / "docs"
+    if proj_docs.exists():
+        return proj_docs
+    return None
 
-    # Build help text listing available topics
-    if discovered:
-        topic_names = ", ".join(name for name, _ in discovered)
-        docs_help = (
-            f"Show docs from the repository's docs/ directory.\n\nAvailable topics: {topic_names}"
-        )
-    else:
-        docs_help = "Show docs from the repository's docs/ directory.\n\nNo topics discovered."
 
-    docs_app = typer.Typer(no_args_is_help=True, help=docs_help, add_completion=False)
+class DocsGroup(TyperGroup):
+    def list_commands(self, ctx: click.Context) -> List[str]:
+        names: List[str] = list(super().list_commands(ctx) or [])
+        dir_to_use = _resolve_docs_dir(ctx)
+        fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
+        names.extend(fs.keys())
+        # Deduplicate and sort
+        uniq = sorted({*names})
+        return uniq
 
-    @docs_app.command("list", help="List available documentation topics")
-    def list_topics() -> None:
-        for name, path in discovered:
-            typer.echo(f"{name}\t{path.relative_to(root)}")
+    def get_command(self, ctx: click.Context, name: str) -> click.Command | None:
+        # Built-ins first (e.g., list)
+        cmd = super().get_command(ctx, name)
+        if cmd is not None:
+            return cmd
+
+        # Dynamic topic resolution
+        dir_to_use = _resolve_docs_dir(ctx)
+        fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
+        if name in fs:
+            file_path = fs[name]
+
+            @click.command(name=name)
+            def _show_fs() -> None:
+                click.echo(file_path.read_text(encoding="utf-8", errors="replace"))
 
-    # Freeze mapping for use in dynamic commands and generic fallback
-    topic_map: Dict[str, Path] = {name: path for name, path in discovered}
+            return _show_fs
 
-    def _make_topic_cmd(topic: str, file_path: Path):
-        @docs_app.command(name=topic, help=f"Show docs for topic: {topic}")
-        def _show_topic() -> None:  # noqa: WPS430 (nested function OK for closure)
-            content = file_path.read_text(encoding="utf-8", errors="replace")
-            typer.echo(content)
+        # No packaged fallback
 
-    for name, path in discovered:
-        _make_topic_cmd(name, path)
+        return None
+
+
+def register(app: typer.Typer) -> None:
+    """Register the `docs` command group with dynamic topic subcommands."""
+
+    docs_app = typer.Typer(no_args_is_help=True, add_completion=False, cls=DocsGroup)
 
-    # Optional generic fallback: allow `svc-infra docs --topic <name>`
     @docs_app.callback(invoke_without_command=True)
-    def _maybe_show_topic(topic: str = typer.Option(None, "--topic", help="Topic to show")) -> None:  # type: ignore[no-redef]
+    def _docs_options(
+        docs_dir: Path | None = typer.Option(
+            None,
+            "--docs-dir",
+            help="Path to a docs directory to read from (overrides env/project root)",
+        ),
+        topic: str | None = typer.Option(None, "--topic", help="Topic to show directly"),
+    ) -> None:
+        """Support --docs-dir and --topic at group level."""
         if topic:
-            p = topic_map.get(topic)
-            if not p:
-                raise typer.BadParameter(f"Unknown topic: {topic}")
-            typer.echo(p.read_text(encoding="utf-8", errors="replace"))
+            ctx = click.get_current_context()
+            dir_to_use = _resolve_docs_dir(ctx)
+            fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
+            if topic in fs:
+                typer.echo(fs[topic].read_text(encoding="utf-8", errors="replace"))
+                raise typer.Exit(code=0)
+            raise typer.BadParameter(f"Unknown topic: {topic}")
+
+    @docs_app.command("list", help="List available documentation topics")
+    def list_topics() -> None:
+        ctx = click.get_current_context()
+        root = resolve_project_root()
+        dir_to_use = _resolve_docs_dir(ctx)
+        fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
+        for name, path in fs.items():
+            try:
+                rel = path.relative_to(root)
+                typer.echo(f"{name}\t{rel}")
+            except Exception:
+                typer.echo(f"{name}\t{path}")
+
+    # Also support a generic "show" command
+    @docs_app.command("show", help="Show docs for a topic (alternative to dynamic subcommand)")
+    def show(topic: str) -> None:
+        ctx = click.get_current_context()
+        dir_to_use = _resolve_docs_dir(ctx)
+        fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
+        if topic in fs:
+            typer.echo(fs[topic].read_text(encoding="utf-8", errors="replace"))
+            return
+        raise typer.BadParameter(f"Unknown topic: {topic}")
 
     app.add_typer(docs_app, name="docs")

{svc_infra-0.1.615.dist-info → svc_infra-0.1.617.dist-info}/METADATA

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

{svc_infra-0.1.615.dist-info → svc_infra-0.1.617.dist-info}/RECORD

@@ -80,7 +80,7 @@ svc_infra/api/fastapi/middleware/errors/handlers.py,sha256=pQMVs5n627vcKkDFEaUzx
 svc_infra/api/fastapi/middleware/idempotency.py,sha256=vnBQgMWzJVaF8oWgfw2ATjEKCyQifDeGPUc9z1N7ebE,5051
 svc_infra/api/fastapi/middleware/idempotency_store.py,sha256=BQN_Cq_jf_cuZRhze4EF5v0lOMQXpUWoRo7CsSTprug,5528
 svc_infra/api/fastapi/middleware/optimistic_lock.py,sha256=9lOMBI4VNIVndXnrMmgSq4qeR7xPjNR1H9d1F71M5S8,1271
-svc_infra/api/fastapi/middleware/ratelimit.py,sha256=8A_J6JdU-cs9QYqP6Ufbp4vDkiH-H6CsZwege1nqf24,3855
+svc_infra/api/fastapi/middleware/ratelimit.py,sha256=f-nvsh3wqLMpDEmwPsKvVnOrM3cfC9AqQyl8eUqrUQM,4496
 svc_infra/api/fastapi/middleware/ratelimit_store.py,sha256=LmJR8-kkW42rzOjls9lG1SBtCKjVY7L2Y_bNKHNY3-A,2553
 svc_infra/api/fastapi/middleware/request_id.py,sha256=Iru7ypTdK_n76lwziEGDWoVF4FKS0Ps1PMASYmzK8ek,768
 svc_infra/api/fastapi/middleware/request_size_limit.py,sha256=AcGqaB-F7Tbhg-at7ViT4Bpifst34jFneDBlUBjgo5I,1248
@@ -115,6 +115,9 @@ svc_infra/app/root.py,sha256=344EWBMJCduwzJ1BBo0yGAu15TkryuvOW4qBZ6Gk-8w,1635
 svc_infra/billing/__init__.py,sha256=AdVxgBWibsz0xWk-Z91B7HecA-EhPMSRrXWIYPBgtMA,365
 svc_infra/billing/models.py,sha256=bnCGPKfnK__6x0f0bwKYQsG2GwXjJFi3YRXnq5JYs7c,6083
 svc_infra/billing/service.py,sha256=3SDpPA3NF2lMYiOP4U99sgXpZAXaauexBfZQmYE2kvU,3727
+svc_infra/bundled_docs/README.md,sha256=FqTieL4ADODxTnig8yehV2KdHX9bASDega52bjp5n70,338
+svc_infra/bundled_docs/__init__.py,sha256=8_jF4fM-3Wf6j_mE4000_9AHcJ3tYZXO9hJY-pBEepM,63
+svc_infra/bundled_docs/getting-started.md,sha256=JaMOgRUK_ajaX4SCtiE3GrhQ81wMwng6y46t0032ftU,210
 svc_infra/cache/README.md,sha256=ZgIpmE0UVlGktp2nXUYv6FKJATCdkR_01v-GGxHN6Ao,10795
 svc_infra/cache/__init__.py,sha256=Fz3NS81jrY5sLikRhITCeHDT4MlOLcbMed5EjVecSAg,956
 svc_infra/cache/backend.py,sha256=-dbZ2qkhebzbKosQqgvBNb01A-2_jGt6_0WmJhPoHy8,4418
@@ -139,7 +142,7 @@ svc_infra/cli/cmds/db/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 svc_infra/cli/cmds/db/sql/alembic_cmds.py,sha256=kkAu8sfBLWbb9ApMS95b7b_c6GifqvPaRsO7K8icMVI,9649
 svc_infra/cli/cmds/db/sql/sql_export_cmds.py,sha256=6MxoQO-9upoXg0cl1RHIqz96yXFVGidiBYp_ewhB0E0,2700
 svc_infra/cli/cmds/db/sql/sql_scaffold_cmds.py,sha256=eNTCqHXOxgl9H3WTbGVn9BHXYwCpjIEJsDqhEFdrYMM,4613
-svc_infra/cli/cmds/docs/docs_cmds.py,sha256=3GCoRKjnRr_re__7TuelDbcaouJawHlz0AphYyI0DIE,2575
+svc_infra/cli/cmds/docs/docs_cmds.py,sha256=A3LT__UffM8elPGTnaXmjNqsq8h4y2VVMMSzoqAeZeM,4668
 svc_infra/cli/cmds/dx/__init__.py,sha256=wQtl3-kOgoESlpVkjl3YFtqkOnQSIvVsOdutiaZFejM,197
 svc_infra/cli/cmds/dx/dx_cmds.py,sha256=XTKUJzS3UIYn6h3CHzDEWKYJaWn0TzGiUCq3OeW27E0,3326
 svc_infra/cli/cmds/help.py,sha256=wGfZFMYaR2ZPwW2JwKDU7M3m4AtdCd8GRQ412AmEBUM,758
@@ -293,7 +296,7 @@ svc_infra/webhooks/fastapi.py,sha256=BCNvGNxukf6dC2a4i-6en-PrjBGV19YvCWOot5lXWsA
 svc_infra/webhooks/router.py,sha256=6JvAVPMEth_xxHX-IsIOcyMgHX7g1H0OVxVXKLuMp9w,1596
 svc_infra/webhooks/service.py,sha256=hWgiJRXKBwKunJOx91C7EcLUkotDtD3Xp0RT6vj2IC0,1797
 svc_infra/webhooks/signing.py,sha256=NCwdZzmravUe7HVIK_uXK0qqf12FG-_MVsgPvOw6lsM,784
-svc_infra-0.1.615.dist-info/METADATA,sha256=VFmBWPFEQHoLsz2vTyHO2DMDkN9C70YlI3zAJolFyJg,8106
-svc_infra-0.1.615.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.615.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.615.dist-info/RECORD,,
+svc_infra-0.1.617.dist-info/METADATA,sha256=gFtkUXgTuAGcECWRsaWvXwoxnTEqxyl2yTYw9zzYhSk,8106
+svc_infra-0.1.617.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.617.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.617.dist-info/RECORD,,