PyPI - svc-infra - Versions diffs - 0.1.706__py3-none-any.whl → 1.1.0__py3-none-any.whl - Mend

svc-infra 0.1.706py3-none-any.whl → 1.1.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of svc-infra might be problematic. Click here for more details.

Files changed (227) hide show

svc_infra/apf_payments/models.py +47 -108
svc_infra/apf_payments/provider/__init__.py +2 -2
svc_infra/apf_payments/provider/aiydan.py +42 -100
svc_infra/apf_payments/provider/base.py +10 -26
svc_infra/apf_payments/provider/registry.py +3 -5
svc_infra/apf_payments/provider/stripe.py +63 -135
svc_infra/apf_payments/schemas.py +82 -90
svc_infra/apf_payments/service.py +40 -86
svc_infra/apf_payments/settings.py +10 -13
svc_infra/api/__init__.py +13 -13
svc_infra/api/fastapi/__init__.py +19 -0
svc_infra/api/fastapi/admin/add.py +13 -18
svc_infra/api/fastapi/apf_payments/router.py +47 -84
svc_infra/api/fastapi/apf_payments/setup.py +7 -13
svc_infra/api/fastapi/auth/__init__.py +1 -1
svc_infra/api/fastapi/auth/_cookies.py +3 -9
svc_infra/api/fastapi/auth/add.py +4 -8
svc_infra/api/fastapi/auth/gaurd.py +9 -26
svc_infra/api/fastapi/auth/mfa/models.py +4 -7
svc_infra/api/fastapi/auth/mfa/pre_auth.py +3 -3
svc_infra/api/fastapi/auth/mfa/router.py +9 -15
svc_infra/api/fastapi/auth/mfa/security.py +3 -5
svc_infra/api/fastapi/auth/mfa/utils.py +3 -2
svc_infra/api/fastapi/auth/mfa/verify.py +2 -9
svc_infra/api/fastapi/auth/providers.py +4 -6
svc_infra/api/fastapi/auth/routers/apikey_router.py +16 -18
svc_infra/api/fastapi/auth/routers/oauth_router.py +37 -85
svc_infra/api/fastapi/auth/routers/session_router.py +3 -6
svc_infra/api/fastapi/auth/security.py +17 -28
svc_infra/api/fastapi/auth/sender.py +1 -3
svc_infra/api/fastapi/auth/settings.py +18 -19
svc_infra/api/fastapi/auth/state.py +6 -7
svc_infra/api/fastapi/auth/ws_security.py +2 -2
svc_infra/api/fastapi/billing/router.py +6 -8
svc_infra/api/fastapi/db/http.py +10 -11
svc_infra/api/fastapi/db/nosql/mongo/add.py +5 -15
svc_infra/api/fastapi/db/nosql/mongo/crud_router.py +14 -15
svc_infra/api/fastapi/db/sql/add.py +6 -14
svc_infra/api/fastapi/db/sql/crud_router.py +27 -40
svc_infra/api/fastapi/db/sql/health.py +1 -3
svc_infra/api/fastapi/db/sql/session.py +4 -5
svc_infra/api/fastapi/db/sql/users.py +8 -11
svc_infra/api/fastapi/dependencies/ratelimit.py +4 -6
svc_infra/api/fastapi/docs/add.py +13 -23
svc_infra/api/fastapi/docs/landing.py +6 -8
svc_infra/api/fastapi/docs/scoped.py +34 -42
svc_infra/api/fastapi/dual/dualize.py +1 -1
svc_infra/api/fastapi/dual/protected.py +12 -21
svc_infra/api/fastapi/dual/router.py +14 -31
svc_infra/api/fastapi/ease.py +57 -13
svc_infra/api/fastapi/http/conditional.py +3 -5
svc_infra/api/fastapi/middleware/errors/catchall.py +2 -6
svc_infra/api/fastapi/middleware/errors/exceptions.py +1 -4
svc_infra/api/fastapi/middleware/errors/handlers.py +12 -18
svc_infra/api/fastapi/middleware/graceful_shutdown.py +4 -13
svc_infra/api/fastapi/middleware/idempotency.py +11 -16
svc_infra/api/fastapi/middleware/idempotency_store.py +14 -14
svc_infra/api/fastapi/middleware/optimistic_lock.py +5 -8
svc_infra/api/fastapi/middleware/ratelimit.py +8 -8
svc_infra/api/fastapi/middleware/ratelimit_store.py +7 -8
svc_infra/api/fastapi/middleware/request_id.py +1 -3
svc_infra/api/fastapi/middleware/timeout.py +9 -10
svc_infra/api/fastapi/object_router.py +1060 -0
svc_infra/api/fastapi/openapi/apply.py +5 -6
svc_infra/api/fastapi/openapi/conventions.py +4 -4
svc_infra/api/fastapi/openapi/mutators.py +13 -31
svc_infra/api/fastapi/openapi/pipeline.py +2 -2
svc_infra/api/fastapi/openapi/responses.py +4 -6
svc_infra/api/fastapi/openapi/security.py +1 -3
svc_infra/api/fastapi/ops/add.py +7 -9
svc_infra/api/fastapi/pagination.py +25 -37
svc_infra/api/fastapi/routers/__init__.py +16 -38
svc_infra/api/fastapi/setup.py +13 -31
svc_infra/api/fastapi/tenancy/add.py +3 -2
svc_infra/api/fastapi/tenancy/context.py +8 -7
svc_infra/api/fastapi/versioned.py +3 -2
svc_infra/app/env.py +5 -7
svc_infra/app/logging/add.py +2 -1
svc_infra/app/logging/filter.py +1 -1
svc_infra/app/logging/formats.py +3 -2
svc_infra/app/root.py +3 -3
svc_infra/billing/__init__.py +19 -2
svc_infra/billing/async_service.py +27 -7
svc_infra/billing/jobs.py +23 -33
svc_infra/billing/models.py +21 -52
svc_infra/billing/quotas.py +5 -7
svc_infra/billing/schemas.py +4 -6
svc_infra/cache/__init__.py +12 -5
svc_infra/cache/add.py +6 -9
svc_infra/cache/backend.py +6 -5
svc_infra/cache/decorators.py +17 -28
svc_infra/cache/keys.py +2 -2
svc_infra/cache/recache.py +22 -35
svc_infra/cache/resources.py +8 -16
svc_infra/cache/ttl.py +2 -3
svc_infra/cache/utils.py +5 -6
svc_infra/cli/__init__.py +4 -12
svc_infra/cli/cmds/db/nosql/mongo/mongo_cmds.py +11 -10
svc_infra/cli/cmds/db/nosql/mongo/mongo_scaffold_cmds.py +6 -9
svc_infra/cli/cmds/db/ops_cmds.py +3 -6
svc_infra/cli/cmds/db/sql/alembic_cmds.py +24 -41
svc_infra/cli/cmds/db/sql/sql_export_cmds.py +9 -17
svc_infra/cli/cmds/db/sql/sql_scaffold_cmds.py +10 -10
svc_infra/cli/cmds/docs/docs_cmds.py +7 -10
svc_infra/cli/cmds/dx/dx_cmds.py +5 -11
svc_infra/cli/cmds/jobs/jobs_cmds.py +2 -7
svc_infra/cli/cmds/obs/obs_cmds.py +4 -7
svc_infra/cli/cmds/sdk/sdk_cmds.py +5 -15
svc_infra/cli/foundation/runner.py +6 -11
svc_infra/cli/foundation/typer_bootstrap.py +1 -2
svc_infra/data/__init__.py +83 -0
svc_infra/data/add.py +5 -5
svc_infra/data/backup.py +8 -10
svc_infra/data/erasure.py +3 -2
svc_infra/data/fixtures.py +3 -3
svc_infra/data/retention.py +8 -13
svc_infra/db/crud_schema.py +9 -8
svc_infra/db/nosql/__init__.py +0 -1
svc_infra/db/nosql/constants.py +1 -1
svc_infra/db/nosql/core.py +7 -14
svc_infra/db/nosql/indexes.py +11 -10
svc_infra/db/nosql/management.py +3 -3
svc_infra/db/nosql/mongo/client.py +3 -3
svc_infra/db/nosql/mongo/settings.py +2 -6
svc_infra/db/nosql/repository.py +27 -28
svc_infra/db/nosql/resource.py +15 -20
svc_infra/db/nosql/scaffold.py +13 -17
svc_infra/db/nosql/service.py +3 -4
svc_infra/db/nosql/service_with_hooks.py +4 -3
svc_infra/db/nosql/types.py +2 -6
svc_infra/db/nosql/utils.py +4 -4
svc_infra/db/ops.py +14 -18
svc_infra/db/outbox.py +15 -18
svc_infra/db/sql/apikey.py +12 -21
svc_infra/db/sql/authref.py +3 -7
svc_infra/db/sql/constants.py +9 -9
svc_infra/db/sql/core.py +11 -11
svc_infra/db/sql/management.py +2 -6
svc_infra/db/sql/repository.py +17 -24
svc_infra/db/sql/resource.py +14 -13
svc_infra/db/sql/scaffold.py +13 -17
svc_infra/db/sql/service.py +7 -16
svc_infra/db/sql/service_with_hooks.py +4 -3
svc_infra/db/sql/tenant.py +6 -14
svc_infra/db/sql/uniq.py +8 -7
svc_infra/db/sql/uniq_hooks.py +14 -19
svc_infra/db/sql/utils.py +24 -53
svc_infra/db/utils.py +3 -3
svc_infra/deploy/__init__.py +8 -15
svc_infra/documents/add.py +7 -8
svc_infra/documents/ease.py +8 -8
svc_infra/documents/models.py +3 -3
svc_infra/documents/storage.py +11 -13
svc_infra/dx/__init__.py +58 -0
svc_infra/dx/add.py +1 -3
svc_infra/dx/changelog.py +2 -2
svc_infra/dx/checks.py +1 -1
svc_infra/health/__init__.py +15 -16
svc_infra/http/client.py +10 -14
svc_infra/jobs/__init__.py +79 -0
svc_infra/jobs/builtins/outbox_processor.py +3 -5
svc_infra/jobs/builtins/webhook_delivery.py +1 -3
svc_infra/jobs/loader.py +4 -5
svc_infra/jobs/queue.py +14 -24
svc_infra/jobs/redis_queue.py +20 -34
svc_infra/jobs/runner.py +7 -11
svc_infra/jobs/scheduler.py +5 -5
svc_infra/jobs/worker.py +1 -1
svc_infra/loaders/base.py +5 -4
svc_infra/loaders/github.py +1 -3
svc_infra/loaders/url.py +3 -9
svc_infra/logging/__init__.py +7 -6
svc_infra/mcp/__init__.py +82 -0
svc_infra/mcp/svc_infra_mcp.py +2 -2
svc_infra/obs/add.py +4 -3
svc_infra/obs/cloud_dash.py +1 -1
svc_infra/obs/metrics/__init__.py +3 -3
svc_infra/obs/metrics/asgi.py +9 -14
svc_infra/obs/metrics/base.py +13 -13
svc_infra/obs/metrics/http.py +5 -9
svc_infra/obs/metrics/sqlalchemy.py +9 -12
svc_infra/obs/metrics.py +3 -3
svc_infra/obs/settings.py +2 -6
svc_infra/resilience/__init__.py +44 -0
svc_infra/resilience/circuit_breaker.py +328 -0
svc_infra/resilience/retry.py +289 -0
svc_infra/security/__init__.py +167 -0
svc_infra/security/add.py +5 -9
svc_infra/security/audit.py +14 -17
svc_infra/security/audit_service.py +9 -9
svc_infra/security/hibp.py +3 -6
svc_infra/security/jwt_rotation.py +7 -10
svc_infra/security/lockout.py +12 -11
svc_infra/security/models.py +37 -46
svc_infra/security/oauth_models.py +8 -8
svc_infra/security/org_invites.py +11 -13
svc_infra/security/passwords.py +4 -6
svc_infra/security/permissions.py +8 -7
svc_infra/security/session.py +6 -7
svc_infra/security/signed_cookies.py +9 -9
svc_infra/storage/add.py +5 -8
svc_infra/storage/backends/local.py +13 -21
svc_infra/storage/backends/memory.py +4 -7
svc_infra/storage/backends/s3.py +17 -36
svc_infra/storage/base.py +2 -2
svc_infra/storage/easy.py +4 -8
svc_infra/storage/settings.py +16 -18
svc_infra/testing/__init__.py +36 -39
svc_infra/utils.py +169 -8
svc_infra/webhooks/__init__.py +1 -1
svc_infra/webhooks/add.py +17 -29
svc_infra/webhooks/encryption.py +2 -2
svc_infra/webhooks/fastapi.py +2 -4
svc_infra/webhooks/router.py +3 -3
svc_infra/webhooks/service.py +5 -6
svc_infra/webhooks/signing.py +5 -5
svc_infra/websocket/add.py +2 -3
svc_infra/websocket/client.py +3 -2
svc_infra/websocket/config.py +6 -18
svc_infra/websocket/manager.py +9 -10
{svc_infra-0.1.706.dist-info → svc_infra-1.1.0.dist-info}/METADATA +11 -5
svc_infra-1.1.0.dist-info/RECORD +364 -0
svc_infra/billing/service.py +0 -123
svc_infra-0.1.706.dist-info/RECORD +0 -357
{svc_infra-0.1.706.dist-info → svc_infra-1.1.0.dist-info}/LICENSE +0 -0
{svc_infra-0.1.706.dist-info → svc_infra-1.1.0.dist-info}/WHEEL +0 -0
{svc_infra-0.1.706.dist-info → svc_infra-1.1.0.dist-info}/entry_points.txt +0 -0

svc_infra/api/fastapi/docs/landing.py CHANGED Viewed

@@ -1,7 +1,7 @@
 from __future__ import annotations
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Iterable, List, Optional
 FAVICON_DATA_URI = (
     "data:image/svg+xml,"
@@ -14,9 +14,9 @@ FAVICON_DATA_URI = (
 @dataclass(frozen=True)
 class DocTargets:
-    swagger: Optional[str] = None
-    redoc: Optional[str] = None
-    openapi_json: Optional[str] = None
+    swagger: str | None = None
+    redoc: str | None = None
+    openapi_json: str | None = None
 @dataclass(frozen=True)
@@ -31,7 +31,7 @@ def _btn(label: str, href: str) -> str:
 def _card(spec: CardSpec) -> str:
     tag = "/" if spec.tag.strip("/") == "" else f"/{spec.tag.strip('/')}"
-    links: List[str] = []
+    links: list[str] = []
     if spec.docs.swagger:
         links.append(_btn("Swagger", spec.docs.swagger))
     if spec.docs.redoc:
@@ -50,9 +50,7 @@ def _card(spec: CardSpec) -> str:
     """.strip()
-def render_index_html(
-    *, service_name: str, release: str, cards: Iterable[CardSpec]
-) -> str:
+def render_index_html(*, service_name: str, release: str, cards: Iterable[CardSpec]) -> str:
     grid = "\n".join(_card(c) for c in cards)
     return f"""
 <!doctype html>

svc_infra/api/fastapi/docs/scoped.py CHANGED Viewed

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import copy
-from typing import Dict, Iterable, List, Optional, Set, Tuple
+from collections.abc import Iterable
 from fastapi import FastAPI
 from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
@@ -10,15 +10,15 @@ from fastapi.responses import HTMLResponse
 from svc_infra.app.env import CURRENT_ENVIRONMENT, DEV_ENV, LOCAL_ENV, Environment
 # (prefix, swagger_path, redoc_path, openapi_path, title)
-DOC_SCOPES: List[Tuple[str, str, str, str, str]] = []
+DOC_SCOPES: list[tuple[str, str, str, str, str]] = []
 _HTTP_METHODS = {"get", "put", "post", "delete", "patch", "options", "head", "trace"}
 def _path_included(
     path: str,
-    include_prefixes: Optional[Iterable[str]] = None,
-    exclude_prefixes: Optional[Iterable[str]] = None,
+    include_prefixes: Iterable[str] | None = None,
+    exclude_prefixes: Iterable[str] | None = None,
 ) -> bool:
     def _match(pfx: str) -> bool:
         pfx = pfx.rstrip("/") or "/"
@@ -31,7 +31,7 @@ def _path_included(
     return True
-def _collect_refs(obj, refset: Set[Tuple[str, str]]):
+def _collect_refs(obj, refset: set[tuple[str, str]]):
     if isinstance(obj, dict):
         for k, v in obj.items():
             if k == "$ref" and isinstance(v, str) and v.startswith("#/components/"):
@@ -46,8 +46,8 @@ def _collect_refs(obj, refset: Set[Tuple[str, str]]):
 def _close_over_component_refs(
-    full_components: Dict, initial: Set[Tuple[str, str]]
-) -> Set[Tuple[str, str]]:
+    full_components: dict, initial: set[tuple[str, str]]
+) -> set[tuple[str, str]]:
     to_visit = list(initial)
     seen = set(initial)
     while to_visit:
@@ -55,7 +55,7 @@ def _close_over_component_refs(
         comp = (full_components or {}).get(section, {}).get(name)
         if not isinstance(comp, dict):
             continue
-        nested: Set[Tuple[str, str]] = set()
+        nested: set[tuple[str, str]] = set()
         _collect_refs(comp, nested)
         for ref in nested:
             if ref not in seen:
@@ -65,11 +65,11 @@ def _close_over_component_refs(
 def _prune_to_paths(
-    full_schema: Dict,
-    keep_paths: Dict[str, dict],
-    title_suffix: Optional[str],
-    server_prefix: Optional[str] = None,
-) -> Dict:
+    full_schema: dict,
+    keep_paths: dict[str, dict],
+    title_suffix: str | None,
+    server_prefix: str | None = None,
+) -> dict:
     schema = copy.deepcopy(full_schema)
     schema["paths"] = keep_paths
@@ -77,9 +77,9 @@ def _prune_to_paths(
     if server_prefix is not None:
         schema["servers"] = [{"url": server_prefix}]
-    used_tags: Set[str] = set()
-    direct_refs: Set[Tuple[str, str]] = set()
-    used_security_schemes: Set[str] = set()
+    used_tags: set[str] = set()
+    direct_refs: set[tuple[str, str]] = set()
+    used_security_schemes: set[str] = set()
     for path_item in keep_paths.values():
         for method, op in path_item.items():
@@ -95,7 +95,7 @@ def _prune_to_paths(
     comps = schema.get("components") or {}
     all_refs = _close_over_component_refs(comps, direct_refs)
-    pruned_components: Dict[str, Dict] = {}
+    pruned_components: dict[str, dict] = {}
     if isinstance(comps, dict):
         for section, items in comps.items():
             keep_names = {name for (sec, name) in all_refs if sec == section}
@@ -110,9 +110,7 @@ def _prune_to_paths(
     if "tags" in schema and isinstance(schema["tags"], list):
         schema["tags"] = [
-            t
-            for t in schema["tags"]
-            if isinstance(t, dict) and t.get("name") in used_tags
+            t for t in schema["tags"] if isinstance(t, dict) and t.get("name") in used_tags
         ]
     info = dict(schema.get("info") or {})
@@ -123,17 +121,15 @@ def _prune_to_paths(
 def _build_filtered_schema(
-    full_schema: Dict,
+    full_schema: dict,
     *,
-    include_prefixes: Optional[List[str]] = None,
-    exclude_prefixes: Optional[List[str]] = None,
-    title_suffix: Optional[str] = None,
-) -> Dict:
+    include_prefixes: list[str] | None = None,
+    exclude_prefixes: list[str] | None = None,
+    title_suffix: str | None = None,
+) -> dict:
     paths = full_schema.get("paths", {}) or {}
     keep_paths = {
-        p: v
-        for p, v in paths.items()
-        if _path_included(p, include_prefixes, exclude_prefixes)
+        p: v for p, v in paths.items() if _path_included(p, include_prefixes, exclude_prefixes)
     }
     # Determine the server prefix for scoped docs
@@ -154,9 +150,7 @@ def _build_filtered_schema(
                 stripped_paths[path] = spec
         keep_paths = stripped_paths
-    return _prune_to_paths(
-        full_schema, keep_paths, title_suffix, server_prefix=server_prefix
-    )
+    return _prune_to_paths(full_schema, keep_paths, title_suffix, server_prefix=server_prefix)
 def _ensure_original_openapi_saved(app: FastAPI) -> None:
@@ -164,12 +158,12 @@ def _ensure_original_openapi_saved(app: FastAPI) -> None:
         app.state._scoped_original_openapi = app.openapi
-def _get_full_schema_from_original(app: FastAPI) -> Dict:
+def _get_full_schema_from_original(app: FastAPI) -> dict:
     _ensure_original_openapi_saved(app)
     return copy.deepcopy(app.state._scoped_original_openapi())
-def _install_root_filter(app: FastAPI, exclude_prefixes: List[str]) -> None:
+def _install_root_filter(app: FastAPI, exclude_prefixes: list[str]) -> None:
     _ensure_original_openapi_saved(app)
     app.state._scoped_root_exclusions = sorted(set(exclude_prefixes))
@@ -179,10 +173,10 @@ def _install_root_filter(app: FastAPI, exclude_prefixes: List[str]) -> None:
             full_schema, exclude_prefixes=app.state._scoped_root_exclusions
         )
-    setattr(app, "openapi", root_filtered_openapi)
+    app.openapi = root_filtered_openapi  # type: ignore[method-assign]
-def _current_registered_scopes() -> List[str]:
+def _current_registered_scopes() -> list[str]:
     return [scope for (scope, *_rest) in DOC_SCOPES]
@@ -193,8 +187,8 @@ def _ensure_root_excludes_registered_scopes(app: FastAPI) -> None:
 def _normalize_envs(
-    envs: Optional[Iterable[Environment | str]],
-) -> Optional[set[Environment]]:
+    envs: Iterable[Environment | str] | None,
+) -> set[Environment] | None:
     if envs is None:
         return None
     out: set[Environment] = set()
@@ -209,7 +203,7 @@ def add_prefixed_docs(
     prefix: str,
     title: str,
     auto_exclude_from_root: bool = True,
-    visible_envs: Optional[Iterable[Environment | str]] = (LOCAL_ENV, DEV_ENV),
+    visible_envs: Iterable[Environment | str] | None = (LOCAL_ENV, DEV_ENV),
 ) -> None:
     scope = prefix.rstrip("/") or "/"
@@ -233,7 +227,7 @@ def add_prefixed_docs(
     redoc_path = f"{scope}/redoc"
     _ensure_original_openapi_saved(app)
-    _scope_cache: Dict | None = None
+    _scope_cache: dict | None = None
     def _scoped_schema():
         nonlocal _scope_cache
@@ -260,7 +254,5 @@ def add_prefixed_docs(
     DOC_SCOPES.append((scope, swagger_path, redoc_path, openapi_path, title))
-def replace_root_openapi_with_exclusions(
-    app: FastAPI, *, exclude_prefixes: List[str]
-) -> None:
+def replace_root_openapi_with_exclusions(app: FastAPI, *, exclude_prefixes: list[str]) -> None:
     _install_root_filter(app, exclude_prefixes)

svc_infra/api/fastapi/dual/dualize.py CHANGED Viewed

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from typing import Callable
+from collections.abc import Callable
 from fastapi import APIRouter

svc_infra/api/fastapi/dual/protected.py CHANGED Viewed

@@ -1,6 +1,7 @@
 from __future__ import annotations
-from typing import Any, Optional, Sequence
+from collections.abc import Sequence
+from typing import Any
 from ..auth.security import (
     AllowIdentity,
@@ -21,7 +22,7 @@ from ..openapi.responses import (
 from .router import DualAPIRouter
-def _merge(base: Optional[Sequence[Any]], extra: Optional[Sequence[Any]]) -> list[Any]:
+def _merge(base: Sequence[Any] | None, extra: Sequence[Any] | None) -> list[Any]:
     out: list[Any] = []
     if base:
         out.extend(base)
@@ -32,7 +33,7 @@ def _merge(base: Optional[Sequence[Any]], extra: Optional[Sequence[Any]]) -> lis
 # PUBLIC (but attach OptionalIdentity for convenience)
 def optional_identity_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
+    *, dependencies: Sequence[Any] | None = None, **kwargs: Any
 ) -> DualAPIRouter:
     r = DualAPIRouter(dependencies=_merge([AllowIdentity], dependencies), **kwargs)
     apply_default_security(r, default_security=[])  # public looking in docs
@@ -41,9 +42,7 @@ def optional_identity_router(
 # PROTECTED: any auth (JWT/cookie OR API key)
-def protected_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
-) -> DualAPIRouter:
+def protected_router(*, dependencies: Sequence[Any] | None = None, **kwargs: Any) -> DualAPIRouter:
     r = DualAPIRouter(dependencies=_merge([RequireIdentity], dependencies), **kwargs)
     apply_default_security(
         r,
@@ -58,9 +57,7 @@ def protected_router(
 # USER-ONLY (no API-key-only access)
-def user_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
-) -> DualAPIRouter:
+def user_router(*, dependencies: Sequence[Any] | None = None, **kwargs: Any) -> DualAPIRouter:
     r = DualAPIRouter(dependencies=_merge([RequireUser()], dependencies), **kwargs)
     apply_default_security(
         r, default_security=[{"OAuth2PasswordBearer": []}, {"SessionCookie": []}]
@@ -70,9 +67,7 @@ def user_router(
 # SERVICE-ONLY (API key required)
-def service_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
-) -> DualAPIRouter:
+def service_router(*, dependencies: Sequence[Any] | None = None, **kwargs: Any) -> DualAPIRouter:
     r = DualAPIRouter(dependencies=_merge([RequireService()], dependencies), **kwargs)
     apply_default_security(r, default_security=[{"APIKeyHeader": []}])
     apply_default_responses(r, DEFAULT_SERVICE)
@@ -111,7 +106,7 @@ def roles_router(*roles: str, role_resolver=None, **kwargs):
 def ws_protected_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
+    *, dependencies: Sequence[Any] | None = None, **kwargs: Any
 ) -> DualAPIRouter:
     """
     Protected WebSocket router - requires valid JWT token.
@@ -141,7 +136,7 @@ def ws_protected_router(
 def ws_optional_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
+    *, dependencies: Sequence[Any] | None = None, **kwargs: Any
 ) -> DualAPIRouter:
     """
     Optional auth WebSocket router - allows anonymous connections.
@@ -163,9 +158,7 @@ def ws_optional_router(
     return r
-def ws_user_router(
-    *, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
-) -> DualAPIRouter:
+def ws_user_router(*, dependencies: Sequence[Any] | None = None, **kwargs: Any) -> DualAPIRouter:
     """
     User-only WebSocket router - requires valid user JWT (no API key).
@@ -189,7 +182,7 @@ def ws_user_router(
 def ws_scopes_router(
-    *scopes: str, dependencies: Optional[Sequence[Any]] = None, **kwargs: Any
+    *scopes: str, dependencies: Sequence[Any] | None = None, **kwargs: Any
 ) -> DualAPIRouter:
     """
     Scope-gated WebSocket router - requires valid JWT with specific scopes.
@@ -207,9 +200,7 @@ def ws_scopes_router(
             ...
     """
     r = DualAPIRouter(
-        dependencies=_merge(
-            [RequireWSIdentity, RequireWSScopes(*scopes)], dependencies
-        ),
+        dependencies=_merge([RequireWSIdentity, RequireWSScopes(*scopes)], dependencies),
         **kwargs,
     )
     apply_default_security(

svc_infra/api/fastapi/dual/router.py CHANGED Viewed

@@ -1,6 +1,7 @@
 from __future__ import annotations
-from typing import Any, Callable, Type
+from collections.abc import Callable
+from typing import Any
 from fastapi import APIRouter
 from fastapi.params import Depends
@@ -44,7 +45,7 @@ class DualAPIRouter(APIRouter):
                     **kwargs,
                 )
                 # only add the "/" twin for *safe* methods
-                if set(m.upper() for m in methods) <= safe_methods:
+                if {m.upper() for m in methods} <= safe_methods:
                     self.add_api_route(
                         "/", func, methods=methods, include_in_schema=False, **kwargs
                     )
@@ -59,15 +60,13 @@ class DualAPIRouter(APIRouter):
                 **kwargs,
             )
             if alt != primary:
-                self.add_api_route(
-                    alt, func, methods=methods, include_in_schema=False, **kwargs
-                )
+                self.add_api_route(alt, func, methods=methods, include_in_schema=False, **kwargs)
             return func
         return decorator
     def add_api_route(self, path, endpoint, **kwargs):
-        methods = set((kwargs.get("methods") or []))
+        methods = set(kwargs.get("methods") or [])
         for r in self.routes:
             if getattr(r, "path", None) == path and methods & (
                 getattr(r, "methods", set()) or set()
@@ -78,45 +77,31 @@ class DualAPIRouter(APIRouter):
     # ---------- HTTP method shorthands ----------
     def get(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["GET"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["GET"], show_in_schema=show_in_schema, **kwargs)
     def post(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["POST"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["POST"], show_in_schema=show_in_schema, **kwargs)
     def patch(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["PATCH"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["PATCH"], show_in_schema=show_in_schema, **kwargs)
     def delete(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["DELETE"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["DELETE"], show_in_schema=show_in_schema, **kwargs)
     def put(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["PUT"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["PUT"], show_in_schema=show_in_schema, **kwargs)
     def options(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["OPTIONS"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["OPTIONS"], show_in_schema=show_in_schema, **kwargs)
     def head(self, path: str, *_, show_in_schema: bool = True, **kwargs: Any):
-        return self._dual_decorator(
-            path, ["HEAD"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["HEAD"], show_in_schema=show_in_schema, **kwargs)
     def list(
         self,
         path: str,
         *,
-        model: Type[BaseModel],
+        model: type[BaseModel],
         envelope: bool = False,
         cursor: bool = True,
         page: bool = True,
@@ -155,9 +140,7 @@ class DualAPIRouter(APIRouter):
         kwargs["response_model"] = kwargs.get("response_model") or response_model
         # we still want the dual-registration behavior
-        return self._dual_decorator(
-            path, ["GET"], show_in_schema=show_in_schema, **kwargs
-        )
+        return self._dual_decorator(path, ["GET"], show_in_schema=show_in_schema, **kwargs)
     # ---------- WebSocket ----------

svc_infra/api/fastapi/ease.py CHANGED Viewed

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import os
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
@@ -64,7 +64,7 @@ class EasyAppOptions(BaseModel):
     observability: ObservabilityOptions = ObservabilityOptions()
     @classmethod
-    def from_env(cls) -> "EasyAppOptions":
+    def from_env(cls) -> EasyAppOptions:
         """
         Build options from environment variables:
@@ -88,7 +88,7 @@ class EasyAppOptions(BaseModel):
             ),
         )
-    def merged_with(self, override: "EasyAppOptions | None") -> "EasyAppOptions":
+    def merged_with(self, override: EasyAppOptions | None) -> EasyAppOptions:
         """
         Merge two option sets. Non-None fields in `override` win.
         (For iterables, if override provides a non-None value, it wins entirely.)
@@ -104,13 +104,9 @@ class EasyAppOptions(BaseModel):
                 else self.logging.enable
             ),
             level=(
-                override.logging.level
-                if override.logging.level is not None
-                else self.logging.level
+                override.logging.level if override.logging.level is not None else self.logging.level
             ),
-            fmt=override.logging.fmt
-            if override.logging.fmt is not None
-            else self.logging.fmt,
+            fmt=override.logging.fmt if override.logging.fmt is not None else self.logging.fmt,
         )
         # observability
@@ -152,8 +148,33 @@ def easy_service_api(
     public_cors_origins: list[str] | str | None = None,
     root_public_base_url: str | None = None,
     root_include_api_key: bool | None = None,
+    skip_paths: list[str] | None = None,
     **fastapi_kwargs,  # Forward all other FastAPI kwargs
 ) -> FastAPI:
+    """
+    Create a FastAPI application with standard service configuration.
+    Args:
+        name: Service name for OpenAPI docs and logging.
+        release: Version string for the service.
+        versions: List of (tag, routers_package, public_base_url) tuples for API versioning.
+        root_routers: Router module(s) to mount at root level.
+        public_cors_origins: Origins to allow for CORS.
+        root_public_base_url: Public base URL for root-level routes.
+        root_include_api_key: Whether to include API key auth for root routes.
+        skip_paths: Path prefixes to exclude from timeout/rate-limit middleware.
+            Uses prefix matching: "/v1/chat" matches "/v1/chat" and "/v1/chat/stream"
+            but not "/api/v1/chat". Falls back to SKIP_MIDDLEWARE_PATHS env var.
+        **fastapi_kwargs: Additional kwargs passed to FastAPI constructor.
+    Returns:
+        Configured FastAPI application.
+    """
+    # Env fallback for skip_paths
+    effective_skip = (
+        skip_paths if skip_paths is not None else _env_csv_paths("SKIP_MIDDLEWARE_PATHS")
+    )
     service = ServiceInfo(name=name, release=release)
     specs = [
         APIVersionSpec(tag=str(tag), routers_package=pkg, public_base_url=base)
@@ -166,6 +187,7 @@ def easy_service_api(
         public_cors_origins=public_cors_origins,
         root_public_base_url=root_public_base_url,
         root_include_api_key=root_include_api_key,
+        skip_paths=effective_skip,
         **fastapi_kwargs,  # Forward to setup_service_api
     )
@@ -179,26 +201,47 @@ def easy_service_app(
     public_cors_origins: list[str] | str | None = None,
     root_public_base_url: str | None = None,
     root_include_api_key: bool | None = None,
+    skip_paths: list[str] | None = None,
     options: EasyAppOptions | None = None,
     enable_logging: bool | None = None,
     enable_observability: bool | None = None,
     **fastapi_kwargs,  # Forward all other FastAPI kwargs (lifespan, etc.)
 ) -> FastAPI:
     """
-    One-call bootstrap with env + options + flags:
-      Precedence (strongest → weakest):
+    One-call bootstrap with env + options + flags.
+    Args:
+        name: Service name for OpenAPI docs and logging.
+        release: Version string for the service.
+        versions: List of (tag, routers_package, public_base_url) tuples for API versioning.
+        root_routers: Router module(s) to mount at root level.
+        public_cors_origins: Origins to allow for CORS.
+        root_public_base_url: Public base URL for root-level routes.
+        root_include_api_key: Whether to include API key auth for root routes.
+        skip_paths: Path prefixes to exclude from timeout/rate-limit middleware.
+            Uses prefix matching: "/v1/chat" matches "/v1/chat" and "/v1/chat/stream"
+            but not "/api/v1/chat". Falls back to SKIP_MIDDLEWARE_PATHS env var.
+        options: EasyAppOptions for logging/observability configuration.
+        enable_logging: Override to enable/disable logging.
+        enable_observability: Override to enable/disable observability.
+        **fastapi_kwargs: Additional kwargs passed to FastAPI constructor.
+    Precedence (strongest → weakest):
         1) enable_logging / enable_observability args
         2) `options=` object (per-field)
         3) `EasyAppOptions.from_env()`
-      Env recognized:
+    Env recognized:
         ENABLE_LOGGING=true|false
         ENABLE_OBS=true|false
         LOG_LEVEL=DEBUG|INFO|...
         LOG_FORMAT=json|plain
         METRICS_PATH=/metrics
         OBS_SKIP_PATHS=/metrics,/health,/internal
+        SKIP_MIDDLEWARE_PATHS=/v1/chat,/v1/stream (for timeout/rate-limit skip)
+    Returns:
+        Configured FastAPI application with logging and observability.
     """
     # 0) Start from env
     env_opts = EasyAppOptions.from_env()
@@ -233,6 +276,7 @@ def easy_service_app(
         public_cors_origins=public_cors_origins,
         root_public_base_url=root_public_base_url,
         root_include_api_key=root_include_api_key,
+        skip_paths=skip_paths,
         **fastapi_kwargs,  # Forward FastAPI kwargs (lifespan, etc.)
     )

svc_infra/api/fastapi/http/conditional.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from email.utils import format_datetime, parsedate_to_datetime
 from hashlib import sha256
@@ -16,13 +16,11 @@ def set_conditional_headers(
         resp.headers["ETag"] = etag
     if last_modified:
         if last_modified.tzinfo is None:
-            last_modified = last_modified.replace(tzinfo=timezone.utc)
+            last_modified = last_modified.replace(tzinfo=UTC)
         resp.headers["Last-Modified"] = format_datetime(last_modified)
-def maybe_not_modified(
-    request: Request, etag: str | None, last_modified: datetime | None
-) -> bool:
+def maybe_not_modified(request: Request, etag: str | None, last_modified: datetime | None) -> bool:
     inm = request.headers.get("If-None-Match")
     ims = request.headers.get("If-Modified-Since")
     etag_ok = etag and inm and etag in [t.strip() for t in inm.split(",")]

svc_infra/api/fastapi/middleware/errors/catchall.py CHANGED Viewed

@@ -31,9 +31,7 @@ class CatchAllExceptionMiddleware:
             if response_started:
                 try:
-                    await send(
-                        {"type": "http.response.body", "body": b"", "more_body": False}
-                    )
+                    await send({"type": "http.response.body", "body": b"", "more_body": False})
                 except Exception:
                     pass
             else:
@@ -54,6 +52,4 @@ class CatchAllExceptionMiddleware:
                         "headers": [(b"content-type", PROBLEM_MT.encode("ascii"))],
                     }
                 )
-                await send(
-                    {"type": "http.response.body", "body": body, "more_body": False}
-                )
+                await send({"type": "http.response.body", "body": body, "more_body": False})

svc_infra/api/fastapi/middleware/errors/exceptions.py CHANGED Viewed

@@ -1,6 +1,3 @@
-from typing import Optional
 class FastApiException(Exception):
     """
     Application error that should be rendered as Problem Details.
@@ -9,7 +6,7 @@ class FastApiException(Exception):
     def __init__(
         self,
         title: str,
-        detail: Optional[str] = None,
+        detail: str | None = None,
         status_code: int = 400,
         *,
         code: str | None = None,

svc-infra 0.1.706__py3-none-any.whl → 1.1.0__py3-none-any.whl

Potentially problematic release.

svc-infra 0.1.706py3-none-any.whl → 1.1.0py3-none-any.whl