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

svc_infra/apf_payments/settings.py

@@ -1,16 +1,13 @@
 from __future__ import annotations
 
 import os
-from typing import Optional
 
 from pydantic import BaseModel, SecretStr
 
 STRIPE_KEY = os.getenv("STRIPE_SECRET") or os.getenv("STRIPE_API_KEY")
 STRIPE_WH = os.getenv("STRIPE_WH_SECRET")
 PROVIDER = (
-    os.getenv("APF_PAYMENTS_PROVIDER")
-    or os.getenv("PAYMENTS_PROVIDER", "stripe")
-    or "stripe"
+    os.getenv("APF_PAYMENTS_PROVIDER") or os.getenv("PAYMENTS_PROVIDER", "stripe") or "stripe"
 ).lower()
 
 AIYDAN_KEY = os.getenv("AIYDAN_API_KEY")
@@ -23,23 +20,23 @@ AIYDAN_WH = os.getenv("AIYDAN_WH_SECRET")
 
 class StripeConfig(BaseModel):
     secret_key: SecretStr
-    webhook_secret: Optional[SecretStr] = None
+    webhook_secret: SecretStr | None = None
 
 
 class AiydanConfig(BaseModel):
     api_key: SecretStr
-    client_key: Optional[SecretStr] = None
-    merchant_account: Optional[str] = None
-    hmac_key: Optional[SecretStr] = None
-    base_url: Optional[str] = None
-    webhook_secret: Optional[SecretStr] = None
+    client_key: SecretStr | None = None
+    merchant_account: str | None = None
+    hmac_key: SecretStr | None = None
+    base_url: str | None = None
+    webhook_secret: SecretStr | None = None
 
 
 class PaymentsSettings(BaseModel):
     default_provider: str = PROVIDER
 
     # optional multi-tenant/provider map hook can be added later
-    stripe: Optional[StripeConfig] = (
+    stripe: StripeConfig | None = (
         StripeConfig(
             secret_key=SecretStr(STRIPE_KEY),
             webhook_secret=SecretStr(STRIPE_WH) if STRIPE_WH else None,
@@ -47,7 +44,7 @@ class PaymentsSettings(BaseModel):
         if STRIPE_KEY
         else None
     )
-    aiydan: Optional[AiydanConfig] = (
+    aiydan: AiydanConfig | None = (
         AiydanConfig(
             api_key=SecretStr(AIYDAN_KEY),
             client_key=SecretStr(AIYDAN_CLIENT_KEY) if AIYDAN_CLIENT_KEY else None,
@@ -61,7 +58,7 @@ class PaymentsSettings(BaseModel):
     )
 
 
-_SETTINGS: Optional[PaymentsSettings] = None
+_SETTINGS: PaymentsSettings | None = None
 
 
 def get_payments_settings() -> PaymentsSettings:

svc_infra/api/__init__.py

@@ -7,30 +7,30 @@ from __future__ import annotations
 
 # Re-export from fastapi submodule
 from svc_infra.api.fastapi import (
+    APIVersionSpec,
     # Dual routers
     DualAPIRouter,
-    dualize_protected,
-    dualize_public,
-    dualize_user,
     # Service setup
     ServiceInfo,
-    APIVersionSpec,
-    setup_service_api,
-    easy_service_api,
-    easy_service_app,
-    setup_caching,
+    add_dependency_health,
+    add_health_routes,
     # Health checks
     add_startup_probe,
-    add_health_routes,
-    add_dependency_health,
     check_database,
     check_redis,
     check_url,
+    cursor_window,
+    dualize_protected,
+    dualize_public,
+    dualize_user,
+    easy_service_api,
+    easy_service_app,
+    setup_caching,
+    setup_service_api,
+    sort_by,
+    text_filter,
     # Pagination
     use_pagination,
-    text_filter,
-    sort_by,
-    cursor_window,
 )
 
 __all__ = [

svc_infra/api/fastapi/__init__.py

@@ -4,6 +4,16 @@ from svc_infra.api.fastapi.dual import (
     dualize_public,
     dualize_user,
 )
+from svc_infra.api.fastapi.object_router import (
+    DEFAULT_EXCEPTION_MAP,
+    STATUS_TITLES,
+    endpoint,
+    endpoint_exclude,
+    map_exception_to_http,
+    router_from_object,
+    router_from_object_with_websocket,
+    websocket_endpoint,
+)
 from svc_infra.api.fastapi.openapi.models import APIVersionSpec, ServiceInfo
 from svc_infra.health import (
     add_dependency_health,
@@ -43,4 +53,13 @@ __all__ = [
     "text_filter",
     "sort_by",
     "cursor_window",
+    # Object Router
+    "router_from_object",
+    "router_from_object_with_websocket",
+    "endpoint",
+    "endpoint_exclude",
+    "websocket_endpoint",
+    "map_exception_to_http",
+    "DEFAULT_EXCEPTION_MAP",
+    "STATUS_TITLES",
 ]

svc_infra/api/fastapi/admin/add.py

@@ -7,9 +7,10 @@ import json
 import logging
 import os
 import time
+from collections.abc import Callable
 from hashlib import sha256
 from types import SimpleNamespace
-from typing import Any, Callable, Optional, cast
+from typing import Any, cast
 
 from fastapi import APIRouter, Depends, HTTPException, Request, Response
 
@@ -49,18 +50,18 @@ def _verify(token: str, *, secret: str) -> dict:
         payload = json.loads(body)
         if int(payload.get("exp", 0)) < int(time.time()):
             raise ValueError("expired")
-        return cast(dict[Any, Any], payload)
+        return cast("dict[Any, Any]", payload)
     except Exception as e:
         raise ValueError("invalid_token") from e
 
 
-def admin_router(*, dependencies: Optional[list[Any]] = None, **kwargs) -> APIRouter:
+def admin_router(*, dependencies: list[Any] | None = None, **kwargs) -> APIRouter:
     """Role-gated admin router for coarse access control.
 
     Use permission guards inside endpoints for fine-grained control.
     """
 
-    return cast(APIRouter, roles_router("admin", **kwargs))
+    return cast("APIRouter", roles_router("admin", **kwargs))
 
 
 def add_admin(
@@ -68,10 +69,10 @@ def add_admin(
     *,
     base_path: str = "/admin",
     enable_impersonation: bool = True,
-    secret: Optional[str] = None,
+    secret: str | None = None,
     ttl_seconds: int = 15 * 60,
     cookie_name: str = "impersonation",
-    impersonation_user_getter: Optional[Callable[[Any, str], Any]] = None,
+    impersonation_user_getter: Callable[[Any, str], Any] | None = None,
 ) -> None:
     """Wire admin surfaces with sensible defaults.
 
@@ -98,15 +99,13 @@ def add_admin(
 
     r = admin_router(prefix=base_path, tags=["admin"])  # role-gated
 
-    async def _default_user_getter(
-        request: Request, user_id: str, session: SqlSessionDep
-    ):
+    async def _default_user_getter(request: Request, user_id: str, session: SqlSessionDep):
         try:
             UserModel, _, _ = get_auth_state()
         except Exception:
             # Fallback: simple shim if auth state not configured
             return SimpleNamespace(id=user_id)
-        obj = await cast(Any, session).get(UserModel, user_id)
+        obj = await cast("Any", session).get(UserModel, user_id)
         if not obj:
             raise HTTPException(404, "user_not_found")
         return obj
@@ -182,9 +181,7 @@ def add_admin(
     def _compose_override():
         existing = app.dependency_overrides.get(_current_principal)
         if existing and getattr(existing, "_is_admin_impersonation_override", False):
-            dep_provider = getattr(
-                existing, "_admin_impersonation_base", _current_principal
-            )
+            dep_provider = getattr(existing, "_admin_impersonation_base", _current_principal)
         else:
             dep_provider = existing or _current_principal
 
@@ -214,16 +211,14 @@ def add_admin(
             )
             target = await _res if inspect.isawaitable(_res) else _res
             # Swap user but keep actor for audit if needed
-            setattr(base, "actor", getattr(base, "user", None))
+            base.actor = getattr(base, "user", None)  # type: ignore[attr-defined]
             # If target lacks roles, inherit actor roles to maintain permission checks
             try:
                 if not getattr(target, "roles", None):
-                    setattr(target, "roles", actor_roles)
+                    target.roles = actor_roles
             except Exception:
                 # Best-effort; if target object is immutable, fallback by wrapping
-                target = SimpleNamespace(
-                    id=getattr(target, "id", target_id), roles=actor_roles
-                )
+                target = SimpleNamespace(id=getattr(target, "id", target_id), roles=actor_roles)
             base.user = target
             base.via = "impersonated"
             return base

svc_infra/api/fastapi/apf_payments/router.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import inspect
-from typing import Callable, Literal, Optional, cast
+from collections.abc import Callable
+from typing import Literal, cast
 
 from fastapi import Body, Depends, Header, HTTPException, Request, Response, status
 from starlette.responses import JSONResponse
@@ -72,7 +73,7 @@ _TX_KINDS = {"payment", "refund", "fee", "payout", "capture"}
 def _tx_kind(kind: str) -> Literal["payment", "refund", "fee", "payout", "capture"]:
     if kind not in _TX_KINDS:
         raise ValueError(f"Unknown ledger kind: {kind!r}")
-    return cast(Literal["payment", "refund", "fee", "payout", "capture"], kind)
+    return cast("Literal['payment', 'refund', 'fee', 'payout', 'capture']", kind)
 
 
 # --- tenant resolution ---
@@ -101,16 +102,16 @@ async def resolve_payments_tenant_id(
         if inspect.isawaitable(val):
             val = await val
         if val:
-            return cast(str, val)
+            return cast("str", val)
         # if None, continue default flow
 
     # 2) Principal (user)
     if identity and getattr(identity.user or object(), "tenant_id", None):
-        return cast(str, getattr(identity.user, "tenant_id"))
+        return cast("str", identity.user.tenant_id)
 
     # 3) Principal (api key)
     if identity and getattr(identity.api_key or object(), "tenant_id", None):
-        return cast(str, getattr(identity.api_key, "tenant_id"))
+        return cast("str", identity.api_key.tenant_id)
 
     # 4) Explicit header argument (tests pass this)
     if tenant_header:
@@ -119,7 +120,7 @@ async def resolve_payments_tenant_id(
     # 5) Request state
     state_tid = getattr(getattr(request, "state", object()), "tenant_id", None)
     if state_tid:
-        return cast(str, state_tid)
+        return cast("str", state_tid)
 
     raise HTTPException(status_code=400, detail="tenant_context_missing")
 
@@ -140,15 +141,11 @@ async def get_service(
             else:
                 # allow tests to call without a Request; try identity or fallback
                 if identity and getattr(identity.user or object(), "tenant_id", None):
-                    tid = getattr(identity.user, "tenant_id")
-                elif identity and getattr(
-                    identity.api_key or object(), "tenant_id", None
-                ):
-                    tid = getattr(identity.api_key, "tenant_id")
+                    tid = identity.user.tenant_id
+                elif identity and getattr(identity.api_key or object(), "tenant_id", None):
+                    tid = identity.api_key.tenant_id
                 else:
-                    raise HTTPException(
-                        status_code=400, detail="tenant_context_missing"
-                    )
+                    raise HTTPException(status_code=400, detail="tenant_context_missing")
         except HTTPException:
             # fallback for routes/tests that don't set context; preserve prior default
             tid = "test_tenant"
@@ -172,9 +169,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Customers"],
     )
-    async def upsert_customer(
-        data: CustomerUpsertIn, svc: PaymentsService = Depends(get_service)
-    ):
+    async def upsert_customer(data: CustomerUpsertIn, svc: PaymentsService = Depends(get_service)):
         out = await svc.ensure_customer(data)
         await svc.session.flush()
         return out
@@ -197,9 +192,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         out = await svc.create_intent(user_id=None, data=data)
         await svc.session.flush()
         response.headers["Location"] = str(
-            request.url_for(
-                "payments_get_intent", provider_intent_id=out.provider_intent_id
-            )
+            request.url_for("payments_get_intent", provider_intent_id=out.provider_intent_id)
         )
         return out
 
@@ -213,9 +206,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Payment Intents"],
     )
-    async def confirm_intent(
-        provider_intent_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def confirm_intent(provider_intent_id: str, svc: PaymentsService = Depends(get_service)):
         out = await svc.confirm_intent(provider_intent_id)
         await svc.session.flush()
         return out
@@ -227,9 +218,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Payment Intents"],
     )
-    async def cancel_intent(
-        provider_intent_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def cancel_intent(provider_intent_id: str, svc: PaymentsService = Depends(get_service)):
         out = await svc.cancel_intent(provider_intent_id)
         await svc.session.flush()
         return out
@@ -302,7 +291,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         provider: str,
         request: Request,
         svc: PaymentsService = Depends(get_service),
-        signature: Optional[str] = Header(None, alias="Stripe-Signature"),
+        signature: str | None = Header(None, alias="Stripe-Signature"),
     ):
         payload = await request.body()
         out = await svc.handle_webhook(provider.lower(), signature, payload)
@@ -359,9 +348,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Payment Methods"],
     )
-    async def detach_method(
-        provider_method_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def detach_method(provider_method_id: str, svc: PaymentsService = Depends(get_service)):
         out = await svc.detach_payment_method(provider_method_id)
         await svc.session.flush()
         return out
@@ -378,9 +365,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         customer_provider_id: str,
         svc: PaymentsService = Depends(get_service),
     ):
-        out = await svc.set_default_payment_method(
-            customer_provider_id, provider_method_id
-        )
+        out = await svc.set_default_payment_method(customer_provider_id, provider_method_id)
         await svc.session.flush()
         return out
 
@@ -393,9 +378,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Products"],
     )
-    async def create_product(
-        data: ProductCreateIn, svc: PaymentsService = Depends(get_service)
-    ):
+    async def create_product(data: ProductCreateIn, svc: PaymentsService = Depends(get_service)):
         out = await svc.create_product(data)
         await svc.session.flush()
         return out
@@ -408,9 +391,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Prices"],
     )
-    async def create_price(
-        data: PriceCreateIn, svc: PaymentsService = Depends(get_service)
-    ):
+    async def create_price(data: PriceCreateIn, svc: PaymentsService = Depends(get_service)):
         out = await svc.create_price(data)
         await svc.session.flush()
         return out
@@ -481,9 +462,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         out = await svc.create_invoice(data)
         await svc.session.flush()
         response.headers["Location"] = str(
-            request.url_for(
-                "payments_get_invoice", provider_invoice_id=out.provider_invoice_id
-            )
+            request.url_for("payments_get_invoice", provider_invoice_id=out.provider_invoice_id)
         )
         return out
 
@@ -508,9 +487,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Invoices"],
     )
-    async def void_invoice(
-        provider_invoice_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def void_invoice(provider_invoice_id: str, svc: PaymentsService = Depends(get_service)):
         out = await svc.void_invoice(provider_invoice_id)
         await svc.session.flush()
         return out
@@ -522,9 +499,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Invoices"],
     )
-    async def pay_invoice(
-        provider_invoice_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def pay_invoice(provider_invoice_id: str, svc: PaymentsService = Depends(get_service)):
         out = await svc.pay_invoice(provider_invoice_id)
         await svc.session.flush()
         return out
@@ -536,9 +511,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         name="payments_get_intent",
         tags=["Payment Intents"],
     )
-    async def get_intent(
-        provider_intent_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def get_intent(provider_intent_id: str, svc: PaymentsService = Depends(get_service)):
         return await svc.get_intent(provider_intent_id)
 
     # STATEMENTS (rollup)
@@ -580,8 +553,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Payment Intents"],
     )
     async def list_intents_endpoint(
-        customer_provider_id: Optional[str] = None,
-        status: Optional[str] = None,
+        customer_provider_id: str | None = None,
+        status: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -621,8 +594,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Invoices"],
     )
     async def list_invoices_endpoint(
-        customer_provider_id: Optional[str] = None,
-        status: Optional[str] = None,
+        customer_provider_id: str | None = None,
+        status: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -656,7 +629,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     )
     async def preview_invoice_endpoint(
         customer_provider_id: str,
-        subscription_id: Optional[str] = None,
+        subscription_id: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         return await svc.preview_invoice(customer_provider_id, subscription_id)
@@ -744,7 +717,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Disputes"],
     )
     async def list_disputes(
-        status: Optional[str] = None,
+        status: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -759,9 +732,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         response_model=DisputeOut,
         tags=["Disputes"],
     )
-    async def get_dispute(
-        provider_dispute_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def get_dispute(provider_dispute_id: str, svc: PaymentsService = Depends(get_service)):
         return await svc.get_dispute(provider_dispute_id)
 
     @prot.post(
@@ -773,9 +744,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     )
     async def submit_dispute_evidence(
         provider_dispute_id: str,
-        evidence: dict = Body(
-            ..., embed=True
-        ),  # free-form evidence blob you validate internally
+        evidence: dict = Body(..., embed=True),  # free-form evidence blob you validate internally
         svc: PaymentsService = Depends(get_service),
     ):
         out = await svc.submit_dispute_evidence(provider_dispute_id, evidence)
@@ -810,9 +779,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         response_model=PayoutOut,
         tags=["Payouts"],
     )
-    async def get_payout(
-        provider_payout_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def get_payout(provider_payout_id: str, svc: PaymentsService = Depends(get_service)):
         return await svc.get_payout(provider_payout_id)
 
     # ===== Webhook replay (operational) =====
@@ -824,8 +791,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Webhooks"],
     )
     async def replay_webhooks(
-        since: Optional[str] = None,
-        until: Optional[str] = None,
+        since: str | None = None,
+        until: str | None = None,
         data: WebhookReplayIn = Body(default=WebhookReplayIn()),
         svc: PaymentsService = Depends(get_service),
     ):
@@ -842,8 +809,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Customers"],
     )
     async def list_customers_endpoint(
-        provider: Optional[str] = None,
-        user_id: Optional[str] = None,
+        provider: str | None = None,
+        user_id: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -872,9 +839,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         name="payments_get_method",
         tags=["Payment Methods"],
     )
-    async def get_method(
-        provider_method_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def get_method(provider_method_id: str, svc: PaymentsService = Depends(get_service)):
         return await svc.get_payment_method(provider_method_id)
 
     @prot.post(
@@ -913,7 +878,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Products"],
     )
     async def list_products_endpoint(
-        active: Optional[bool] = None,
+        active: bool | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -958,8 +923,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Prices"],
     )
     async def list_prices_endpoint(
-        provider_product_id: Optional[str] = None,
-        active: Optional[bool] = None,
+        provider_product_id: str | None = None,
+        active: bool | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -1007,8 +972,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Subscriptions"],
     )
     async def list_subscriptions_endpoint(
-        customer_provider_id: Optional[str] = None,
-        status: Optional[str] = None,
+        customer_provider_id: str | None = None,
+        status: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -1047,7 +1012,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Refunds"],
     )
     async def list_refunds_endpoint(
-        provider_payment_intent_id: Optional[str] = None,
+        provider_payment_intent_id: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -1078,8 +1043,8 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         tags=["Usage Records"],
     )
     async def list_usage_records_endpoint(
-        subscription_item: Optional[str] = None,
-        provider_price_id: Optional[str] = None,
+        subscription_item: str | None = None,
+        provider_price_id: str | None = None,
         svc: PaymentsService = Depends(get_service),
     ):
         ctx = use_pagination()
@@ -1113,9 +1078,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         dependencies=[Depends(require_idempotency_key)],
         tags=["Payment Methods"],
     )
-    async def delete_method_alias(
-        alias_id: str, svc: PaymentsService = Depends(get_service)
-    ):
+    async def delete_method_alias(alias_id: str, svc: PaymentsService = Depends(get_service)):
         """
         Removes the local alias/association to a payment method.
         This does **not** delete the underlying payment method at the provider.

svc_infra/api/fastapi/apf_payments/setup.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Iterable, Optional, cast
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, cast
 
 from fastapi import FastAPI
 
@@ -14,9 +15,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-def _maybe_register_default_providers(
-    register_defaults: bool, adapters: Optional[Iterable[object]]
-):
+def _maybe_register_default_providers(register_defaults: bool, adapters: Iterable[object] | None):
     reg = get_provider_registry()
     if register_defaults:
         # Try Stripe by default; silently skip if not configured
@@ -34,9 +33,7 @@ def _maybe_register_default_providers(
             pass
     if adapters:
         for a in adapters:
-            reg.register(
-                cast("ProviderAdapter", a)
-            )  # must implement ProviderAdapter protocol
+            reg.register(cast("ProviderAdapter", a))  # must implement ProviderAdapter protocol
 
 
 def add_payments(
@@ -44,9 +41,8 @@ def add_payments(
     *,
     prefix: str = "/payments",
     register_default_providers: bool = True,
-    adapters: Optional[Iterable[object]] = None,
-    include_in_docs: bool
-    | None = None,  # None = keep your env-based default visibility
+    adapters: Iterable[object] | None = None,
+    include_in_docs: bool | None = None,  # None = keep your env-based default visibility
 ) -> None:
     """
     One-call payments installer.
@@ -60,9 +56,7 @@ def add_payments(
     for r in build_payments_routers(prefix=prefix):
         app.include_router(
             r,
-            include_in_schema=True
-            if include_in_docs is None
-            else bool(include_in_docs),
+            include_in_schema=True if include_in_docs is None else bool(include_in_docs),
         )
 
     # Store the startup function to be called by lifespan if needed

svc_infra/api/fastapi/auth/__init__.py

@@ -27,7 +27,7 @@ from .security import (
     RequireService,
     RequireUser,
 )
-from .settings import AuthSettings, get_auth_settings, JWTSettings, OIDCProvider
+from .settings import AuthSettings, JWTSettings, OIDCProvider, get_auth_settings
 
 if TYPE_CHECKING:
     from .add import add_auth_users as add_auth_users