svc-infra 0.1.616__py3-none-any.whl → 0.1.618__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/cli/cmds/docs/docs_cmds.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from importlib.metadata import PackageNotFoundError, distribution
 from pathlib import Path
 from typing import Dict, List
 
@@ -20,17 +21,34 @@ def _discover_fs_topics(docs_dir: Path) -> Dict[str, Path]:
     return topics
 
 
-def _discover_pkg_topics() -> Dict[str, object]:
-    topics: Dict[str, object] = {}
+def _discover_pkg_topics() -> Dict[str, Path]:
+    """Discover docs packaged under 'docs/' in the installed distribution.
+
+    This lets 'svc-infra docs' work from external projects that don't have a
+    local docs/ directory by falling back to files shipped in the wheel.
+    """
+    topics: Dict[str, Path] = {}
     try:
-        import importlib.resources as ir
-
-        pkg_docs = ir.files("svc_infra.bundled_docs")
-        for res in pkg_docs.iterdir():
-            if res.name.endswith(".md"):
-                topics[Path(res.name).stem.replace(" ", "-")] = res
-    except Exception:
-        pass
+        dist = distribution("svc-infra")
+    except PackageNotFoundError:
+        return topics
+
+    files = getattr(dist, "files", None) or []
+    for f in files:
+        # f is a PackagePath; string form like 'docs/topic.md'
+        s = str(f)
+        if not s.startswith("docs/") or not s.endswith(".md"):
+            continue
+        name = Path(s).stem.replace(" ", "-")
+        try:
+            abs_path = dist.locate_file(f)
+            # Ensure it's a file before adding
+            abs_p = Path(abs_path)
+            if abs_p.exists() and abs_p.is_file():
+                topics[name] = abs_p
+        except Exception:
+            # best-effort; skip unreadable entries
+            continue
     return topics
 
 
@@ -65,9 +83,10 @@ class DocsGroup(TyperGroup):
         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 {}
-        pkg = _discover_pkg_topics() if not fs else {}
-        names.extend(fs.keys())
-        names.extend(pkg.keys())
+        pkg = _discover_pkg_topics()
+        # FS topics win on conflicts; add both for visibility
+        names.extend([k for k in fs.keys()])
+        names.extend([k for k in pkg.keys() if k not in fs])
         # Deduplicate and sort
         uniq = sorted({*names})
         return uniq
@@ -90,27 +109,16 @@ class DocsGroup(TyperGroup):
 
             return _show_fs
 
-        if not fs:
-            pkg = _discover_pkg_topics()
-            if name in pkg:
-                res = pkg[name]
-
-                @click.command(name=name)
-                def _show_pkg() -> None:
-                    try:
-                        import importlib.resources as ir
+        # Packaged fallback
+        pkg = _discover_pkg_topics()
+        if name in pkg:
+            file_path = pkg[name]
 
-                        content = getattr(res, "read_text", None)
-                        if callable(content):
-                            text = content(encoding="utf-8", errors="replace")
-                        else:
-                            with ir.as_file(res) as p:
-                                text = Path(p).read_text(encoding="utf-8", errors="replace")
-                        click.echo(text)
-                    except Exception as e:  # pragma: no cover
-                        raise click.ClickException(f"Failed to load bundled doc: {e}")
+            @click.command(name=name)
+            def _show_pkg() -> None:
+                click.echo(file_path.read_text(encoding="utf-8", errors="replace"))
 
-                return _show_pkg
+            return _show_pkg
 
         return None
 
@@ -137,23 +145,6 @@ def register(app: typer.Typer) -> None:
             if topic in fs:
                 typer.echo(fs[topic].read_text(encoding="utf-8", errors="replace"))
                 raise typer.Exit(code=0)
-            if not fs:
-                pkg = _discover_pkg_topics()
-                if topic in pkg:
-                    try:
-                        import importlib.resources as ir
-
-                        res = pkg[topic]
-                        content = getattr(res, "read_text", None)
-                        if callable(content):
-                            text = content(encoding="utf-8", errors="replace")
-                        else:
-                            with ir.as_file(res) as p:
-                                text = Path(p).read_text(encoding="utf-8", errors="replace")
-                        typer.echo(text)
-                        raise typer.Exit(code=0)
-                    except Exception as e:  # pragma: no cover
-                        raise typer.BadParameter(f"Failed to load bundled topic '{topic}': {e}")
             raise typer.BadParameter(f"Unknown topic: {topic}")
 
     @docs_app.command("list", help="List available documentation topics")
@@ -162,15 +153,22 @@ def register(app: typer.Typer) -> None:
         root = resolve_project_root()
         dir_to_use = _resolve_docs_dir(ctx)
         fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
-        pkg = _discover_pkg_topics() if not fs else {}
-        for name, path in fs.items():
+        pkg = _discover_pkg_topics()
+
+        # Print FS topics first (project/env/option), then packaged topics not shadowed by FS
+        def _print(name: str, path: Path) -> None:
             try:
                 rel = path.relative_to(root)
                 typer.echo(f"{name}\t{rel}")
             except Exception:
+                # For packaged topics, path will be site-packages absolute path
                 typer.echo(f"{name}\t{path}")
-        for name in sorted(pkg.keys()):
-            typer.echo(f"{name}\t(bundled)")
+
+        for name, path in fs.items():
+            _print(name, path)
+        for name, path in pkg.items():
+            if name not in fs:
+                _print(name, path)
 
     # Also support a generic "show" command
     @docs_app.command("show", help="Show docs for a topic (alternative to dynamic subcommand)")
@@ -181,23 +179,10 @@ def register(app: typer.Typer) -> None:
         if topic in fs:
             typer.echo(fs[topic].read_text(encoding="utf-8", errors="replace"))
             return
-        if not fs:
-            pkg = _discover_pkg_topics()
-            if topic in pkg:
-                try:
-                    import importlib.resources as ir
-
-                    res = pkg[topic]
-                    content = getattr(res, "read_text", None)
-                    if callable(content):
-                        text = content(encoding="utf-8", errors="replace")
-                    else:
-                        with ir.as_file(res) as p:
-                            text = Path(p).read_text(encoding="utf-8", errors="replace")
-                    typer.echo(text)
-                    return
-                except Exception as e:  # pragma: no cover
-                    raise typer.BadParameter(f"Failed to load bundled topic '{topic}': {e}")
+        pkg = _discover_pkg_topics()
+        if topic in pkg:
+            typer.echo(pkg[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.616.dist-info → svc_infra-0.1.618.dist-info}/METADATA

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

{svc_infra-0.1.616.dist-info → svc_infra-0.1.618.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
@@ -142,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=uRoClC68-FRLGkHyTYds3h2xKE_4STzkudB6T72DiKo,7611
+svc_infra/cli/cmds/docs/docs_cmds.py,sha256=nvqxkqeYNSV79Eeq0Kv8PN1M8CbyS3lnrFNjHNlO53w,6661
 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
@@ -296,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.616.dist-info/METADATA,sha256=8UIJLzGOQ3LgK55oyA9V_dGAg_i33C5wou1tkDajCzM,8106
-svc_infra-0.1.616.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.616.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.616.dist-info/RECORD,,
+svc_infra-0.1.618.dist-info/METADATA,sha256=mH41WGLu0texy6G1rqK_cX5DmiJZFrhIN6kn6GgvLfE,8106
+svc_infra-0.1.618.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.618.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.618.dist-info/RECORD,,