svc-infra 0.1.577__py3-none-any.whl → 0.1.579__py3-none-any.whl

svc_infra/apf_payments/provider/base.py

@@ -20,11 +20,13 @@ from ..schemas import (
     ProductCreateIn,
     ProductOut,
     RefundIn,
+    SetupIntentCreateIn,
     SetupIntentOut,
     SubscriptionCreateIn,
     SubscriptionOut,
     SubscriptionUpdateIn,
     UsageRecordIn,
+    UsageRecordOut,
 )
 
 
@@ -43,12 +45,12 @@ class ProviderAdapter(Protocol):
     async def list_payment_methods(self, provider_customer_id: str) -> list[PaymentMethodOut]:
         pass
 
-    async def detach_payment_method(self, provider_method_id: str) -> None:
+    async def detach_payment_method(self, provider_method_id: str) -> PaymentMethodOut:
         pass
 
     async def set_default_payment_method(
         self, provider_customer_id: str, provider_method_id: str
-    ) -> None:
+    ) -> PaymentMethodOut:
         pass
 
     async def create_product(self, data: ProductCreateIn) -> ProductOut:
@@ -117,7 +119,7 @@ class ProviderAdapter(Protocol):
 
     async def add_invoice_line_item(
         self, provider_invoice_id: str, data: InvoiceLineItemIn
-    ) -> dict[str, Any]:
+    ) -> InvoiceOut:
         pass
 
     async def list_invoices(
@@ -138,11 +140,11 @@ class ProviderAdapter(Protocol):
     ) -> InvoiceOut:
         pass
 
-    async def create_usage_record(self, data: UsageRecordIn) -> dict[str, Any]:
+    async def create_usage_record(self, data: UsageRecordIn) -> UsageRecordOut:
         pass
 
     # --- Setup Intents ---
-    async def create_setup_intent(self, payment_method_types: list[str]) -> SetupIntentOut:
+    async def create_setup_intent(self, data: SetupIntentCreateIn) -> SetupIntentOut:
         pass
 
     async def confirm_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:

svc_infra/apf_payments/schemas.py

@@ -248,3 +248,23 @@ class BalanceAmount(BaseModel):
 class BalanceSnapshotOut(BaseModel):
     available: list[BalanceAmount] = Field(default_factory=list)
     pending: list[BalanceAmount] = Field(default_factory=list)
+
+
+class SetupIntentCreateIn(BaseModel):
+    payment_method_types: list[str] = Field(default_factory=lambda: ["card"])
+
+
+class WebhookReplayOut(BaseModel):
+    replayed: int
+
+
+class WebhookAckOut(BaseModel):
+    ok: bool
+
+
+class UsageRecordOut(BaseModel):
+    id: str
+    quantity: int
+    timestamp: Optional[int] = None
+    subscription_item: Optional[str] = None
+    provider_price_id: Optional[str] = None

svc_infra/apf_payments/service.py

@@ -41,12 +41,14 @@ from .schemas import (
     ProductCreateIn,
     ProductOut,
     RefundIn,
+    SetupIntentCreateIn,
     SetupIntentOut,
     StatementRow,
     SubscriptionCreateIn,
     SubscriptionOut,
     SubscriptionUpdateIn,
     UsageRecordIn,
+    UsageRecordOut,
 )
 from .settings import get_payments_settings
 
@@ -259,13 +261,13 @@ class PaymentsService:
     async def list_payment_methods(self, provider_customer_id: str) -> list[PaymentMethodOut]:
         return await self._get_adapter().list_payment_methods(provider_customer_id)
 
-    async def detach_payment_method(self, provider_method_id: str) -> None:
-        await self._get_adapter().detach_payment_method(provider_method_id)
+    async def detach_payment_method(self, provider_method_id: str) -> PaymentMethodOut:
+        return await self._get_adapter().detach_payment_method(provider_method_id)
 
     async def set_default_payment_method(
         self, provider_customer_id: str, provider_method_id: str
-    ) -> None:
-        await self._get_adapter().set_default_payment_method(
+    ) -> PaymentMethodOut:
+        return await self._get_adapter().set_default_payment_method(
             provider_customer_id, provider_method_id
         )
 
@@ -436,7 +438,7 @@ class PaymentsService:
     # ---- Invoices: lines/list/get/preview ----
     async def add_invoice_line_item(
         self, provider_invoice_id: str, data: InvoiceLineItemIn
-    ) -> dict:
+    ) -> InvoiceOut:
         return await self._get_adapter().add_invoice_line_item(provider_invoice_id, data)
 
     async def list_invoices(self, f: InvoicesListFilter) -> tuple[list[InvoiceOut], str | None]:
@@ -458,18 +460,17 @@ class PaymentsService:
         )
 
     # ---- Metered usage ----
-    async def create_usage_record(self, data: UsageRecordIn) -> dict:
+    async def create_usage_record(self, data: UsageRecordIn) -> UsageRecordOut:
         return await self._get_adapter().create_usage_record(data)
 
     # --- Setup Intents --------------------------------------------------------
-
-    async def create_setup_intent(self, payment_method_types: list[str]) -> SetupIntentOut:
-        out = await self._get_adapter().create_setup_intent(payment_method_types)
+    async def create_setup_intent(self, data: SetupIntentCreateIn) -> SetupIntentOut:
+        out = await self._get_adapter().create_setup_intent(data)
         self.session.add(
             PaySetupIntent(
                 provider=out.provider,
                 provider_setup_intent_id=out.provider_setup_intent_id,
-                user_id=None,  # set if you thread a user_id; your router currently doesn't
+                user_id=None,
                 status=out.status,
                 client_secret=out.client_secret,
             )

svc_infra/api/fastapi/apf_payments/router.py

@@ -26,6 +26,7 @@ from svc_infra.apf_payments.schemas import (
     ProductCreateIn,
     ProductOut,
     RefundIn,
+    SetupIntentCreateIn,
     SetupIntentOut,
     StatementRow,
     SubscriptionCreateIn,
@@ -33,6 +34,9 @@ from svc_infra.apf_payments.schemas import (
     SubscriptionUpdateIn,
     TransactionRow,
     UsageRecordIn,
+    UsageRecordOut,
+    WebhookAckOut,
+    WebhookReplayOut,
 )
 from svc_infra.apf_payments.service import PaymentsService
 from svc_infra.api.fastapi.db.sql.session import SqlSessionDep
@@ -73,6 +77,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         "/customers",
         response_model=CustomerOut,
         name="payments_upsert_customer",
+        dependencies=[Depends(require_idempotency_key)],
     )
     async def upsert_customer(data: CustomerUpsertIn, svc: PaymentsService = Depends(get_service)):
         out = await svc.ensure_customer(data)
@@ -180,7 +185,11 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     # PUBLIC webhooks
     pub = public_router(prefix=prefix, tags=["payments"])
 
-    @pub.post("/webhooks/{provider}", name="payments_webhook")
+    @pub.post(
+        "/webhooks/{provider}",
+        name="payments_webhook",
+        response_model=WebhookAckOut,
+    )
     async def webhooks(
         provider: str,
         request: Request,
@@ -235,16 +244,18 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     @prot.post(
         "/methods/{provider_method_id}/detach",
         name="payments_detach_method",
+        response_model=PaymentMethodOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def detach_method(provider_method_id: str, svc: PaymentsService = Depends(get_service)):
-        await svc.detach_payment_method(provider_method_id)
+        out = await svc.detach_payment_method(provider_method_id)
         await svc.session.flush()
-        return {"ok": True}
+        return out
 
     @prot.post(
         "/methods/{provider_method_id}/default",
         name="payments_set_default_method",
+        response_model=PaymentMethodOut,  # ADD
         dependencies=[Depends(require_idempotency_key)],
     )
     async def set_default_method(
@@ -252,9 +263,9 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         customer_provider_id: str,
         svc: PaymentsService = Depends(get_service),
     ):
-        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 {"ok": True}
+        return out
 
     # PRODUCTS/PRICES
     @svc.post(
@@ -441,6 +452,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         "/invoices/{provider_invoice_id}/lines",
         name="payments_add_invoice_line_item",
         status_code=status.HTTP_201_CREATED,
+        response_model=InvoiceOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def add_invoice_line(
@@ -450,7 +462,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     ):
         out = await svc.add_invoice_line_item(provider_invoice_id, data)
         await svc.session.flush()
-        return {"ok": True, **out}
+        return out
 
     @prot.get(
         "/invoices",
@@ -501,6 +513,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         name="payments_create_usage_record",
         status_code=status.HTTP_201_CREATED,
         dependencies=[Depends(require_idempotency_key)],
+        response_model=UsageRecordOut,
     )
     async def create_usage_record_endpoint(
         data: UsageRecordIn, svc: PaymentsService = Depends(get_service)
@@ -514,19 +527,21 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         "/setup_intents",
         name="payments_create_setup_intent",
         status_code=status.HTTP_201_CREATED,
+        response_model=SetupIntentOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def create_setup_intent(
-        payment_method_types: list[str] = Body(default_factory=lambda: ["card"]),
+        data: SetupIntentCreateIn,
         svc: PaymentsService = Depends(get_service),
     ):
-        out = await svc.create_setup_intent(payment_method_types)
+        out = await svc.create_setup_intent(data)
         await svc.session.flush()
         return out
 
     @prot.post(
         "/setup_intents/{provider_setup_intent_id}/confirm",
         name="payments_confirm_setup_intent",
+        response_model=SetupIntentOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def confirm_setup_intent(
@@ -550,6 +565,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     @prot.post(
         "/intents/{provider_intent_id}/resume",
         name="payments_resume_intent",
+        response_model=IntentOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def resume_intent(
@@ -589,6 +605,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
         "/disputes/{provider_dispute_id}/submit_evidence",
         name="payments_submit_dispute_evidence",
         dependencies=[Depends(require_idempotency_key)],
+        response_model=DisputeOut,
     )
     async def submit_dispute_evidence(
         provider_dispute_id: str,
@@ -627,6 +644,7 @@ def build_payments_routers(prefix: str = "/payments") -> list[DualAPIRouter]:
     @svc.post(
         "/webhooks/replay",
         name="payments_replay_webhooks",
+        response_model=WebhookReplayOut,
         dependencies=[Depends(require_idempotency_key)],
     )
     async def replay_webhooks(

{svc_infra-0.1.577.dist-info → svc_infra-0.1.579.dist-info}/METADATA

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

{svc_infra-0.1.577.dist-info → svc_infra-0.1.579.dist-info}/RECORD

@@ -3,16 +3,16 @@ svc_infra/apf_payments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 svc_infra/apf_payments/alembic.py,sha256=XJIcCDOoaO1EeJbSx_qK9o4cBi430qyo5gECtjHIojw,299
 svc_infra/apf_payments/models.py,sha256=u4U5oszha5uulCIrNoajaFDIc5YmTlh2mtm-yJUvr9I,14251
 svc_infra/apf_payments/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra/apf_payments/provider/base.py,sha256=-PlFSSJBYRicW4YFnjzH1uUsMwMzTVHZAJYHH5e5IP4,4957
+svc_infra/apf_payments/provider/base.py,sha256=sibrBvfULNPCPldokj2f_kDjxJo5zP06YHB1z5i4s3E,5016
 svc_infra/apf_payments/provider/registry.py,sha256=NZ4pUkFcbXNtqWEpFeI3NwoKRYGWe9fVQakmlrVLTKE,878
 svc_infra/apf_payments/provider/stripe.py,sha256=rZlQe1BBLBF1aMOqw98aDRZkA7pOgTqkGvXzSG8qE5c,11298
-svc_infra/apf_payments/schemas.py,sha256=rQWLR7ianGPy1dLNOkKlJpF8AIA-kTyT9SaGKq9rFA4,6338
-svc_infra/apf_payments/service.py,sha256=Pr-9VuLx7PpaAaMBpG1plfz7ZX0FanZ3apnyVEUFFf0,23858
+svc_infra/apf_payments/schemas.py,sha256=BKzaKQaU4iEdT3onpP0dPfh33nU3AieHZLs_79cMp4M,6747
+svc_infra/apf_payments/service.py,sha256=325Y118HWULmXX62S1wSrA8Guabtoa7Um0lzvMPDQZM,23872
 svc_infra/apf_payments/settings.py,sha256=VnNQbajbv843buUisqa82xOQ-f5JA8JzHD8o01-yhPQ,1239
 svc_infra/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svc_infra/api/fastapi/__init__.py,sha256=VVdQjak74_wTDqmvL05_C97vIFugQxPVU-3JQEFBgR8,747
 svc_infra/api/fastapi/apf_payments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra/api/fastapi/apf_payments/router.py,sha256=oSNuNvfX_qIdDqP1N8j8_28TBsTDX461vFIWa-VXqJg,21994
+svc_infra/api/fastapi/apf_payments/router.py,sha256=ff2zYstk1XLSLDwXG0jBViZv624no5OPUSK1YLDJAH4,22464
 svc_infra/api/fastapi/apf_payments/setup.py,sha256=PX-LHDiyu2eDuaw2m98VPUkF6EmXXRkbjRqh_gL8Kls,2263
 svc_infra/api/fastapi/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svc_infra/api/fastapi/auth/_cookies.py,sha256=U4heUmMnLezHx8U6ksuUEpSZ6sNMJcIO0gdLpmZ5FXw,1367
@@ -228,7 +228,7 @@ svc_infra/obs/templates/sidecars/railway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 svc_infra/obs/templates/sidecars/railway/agent.yaml,sha256=hYv35yG92XEP_4joMFmMcVTD-4fG_zHitmChjreUJh4,516
 svc_infra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svc_infra/utils.py,sha256=VX1yjTx61-YvAymyRhGy18DhybiVdPddiYD_FlKTbJU,952
-svc_infra-0.1.577.dist-info/METADATA,sha256=aRosq3LYSWllh1QSM3q1sBQAeUSqdtj2JmOzYQDuGvQ,3487
-svc_infra-0.1.577.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.577.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.577.dist-info/RECORD,,
+svc_infra-0.1.579.dist-info/METADATA,sha256=j_kXai0eMsASVgOLCR3hYP0Op-b_Pk3bu5QR_7DMfmY,3487
+svc_infra-0.1.579.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.579.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.579.dist-info/RECORD,,