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

svc_infra/apf_payments/schemas.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Annotated, Any, Literal, Optional
+from typing import Annotated, Any, Literal
 
 from pydantic import BaseModel, Field, StringConstraints
 
@@ -10,32 +10,30 @@ AmountMinor = Annotated[int, Field(ge=0)]  # minor units (cents)
 
 
 class CustomerUpsertIn(BaseModel):
-    user_id: Optional[str] = None
-    email: Optional[str] = None
-    name: Optional[str] = None
+    user_id: str | None = None
+    email: str | None = None
+    name: str | None = None
 
 
 class CustomerOut(BaseModel):
     id: str
     provider: str
     provider_customer_id: str
-    email: Optional[str] = None
-    name: Optional[str] = None
+    email: str | None = None
+    name: str | None = None
 
 
 class IntentCreateIn(BaseModel):
     amount: AmountMinor = Field(..., description="Minor units (e.g., cents)")
     currency: Currency = Field(..., json_schema_extra={"example": "USD"})
-    description: Optional[str] = None
+    description: str | None = None
     capture_method: Literal["automatic", "manual"] = "automatic"
-    payment_method_types: list[str] = Field(
-        default_factory=list
-    )  # let provider default
+    payment_method_types: list[str] = Field(default_factory=list)  # let provider default
 
 
 class NextAction(BaseModel):
-    type: Optional[str] = None
-    data: Optional[dict[str, Any]] = None
+    type: str | None = None
+    data: dict[str, Any] | None = None
 
 
 class IntentOut(BaseModel):
@@ -45,13 +43,13 @@ class IntentOut(BaseModel):
     status: str
     amount: AmountMinor
     currency: Currency
-    client_secret: Optional[str] = None
-    next_action: Optional[NextAction] = None
+    client_secret: str | None = None
+    next_action: NextAction | None = None
 
 
 class RefundIn(BaseModel):
-    amount: Optional[AmountMinor] = None
-    reason: Optional[str] = None
+    amount: AmountMinor | None = None
+    reason: str | None = None
 
 
 class TransactionRow(BaseModel):
@@ -63,9 +61,9 @@ class TransactionRow(BaseModel):
     status: str
     provider: str
     provider_ref: str
-    user_id: Optional[str] = None
-    net: Optional[int] = None
-    fee: Optional[int] = None
+    user_id: str | None = None
+    net: int | None = None
+    fee: int | None = None
 
 
 class StatementRow(BaseModel):
@@ -90,10 +88,10 @@ class PaymentMethodOut(BaseModel):
     provider: str
     provider_customer_id: str
     provider_method_id: str
-    brand: Optional[str] = None
-    last4: Optional[str] = None
-    exp_month: Optional[int] = None
-    exp_year: Optional[int] = None
+    brand: str | None = None
+    last4: str | None = None
+    exp_month: int | None = None
+    exp_year: int | None = None
     is_default: bool = False
 
 
@@ -114,8 +112,8 @@ class PriceCreateIn(BaseModel):
     provider_product_id: str
     currency: Currency
     unit_amount: AmountMinor
-    interval: Optional[Literal["day", "week", "month", "year"]] = None
-    trial_days: Optional[int] = None
+    interval: Literal["day", "week", "month", "year"] | None = None
+    trial_days: int | None = None
     active: bool = True
 
 
@@ -126,8 +124,8 @@ class PriceOut(BaseModel):
     provider_product_id: str
     currency: Currency
     unit_amount: AmountMinor
-    interval: Optional[str] = None
-    trial_days: Optional[int] = None
+    interval: str | None = None
+    trial_days: int | None = None
     active: bool = True
 
 
@@ -135,19 +133,15 @@ class SubscriptionCreateIn(BaseModel):
     customer_provider_id: str
     price_provider_id: str
     quantity: int = 1
-    trial_days: Optional[int] = None
-    proration_behavior: Literal["create_prorations", "none", "always_invoice"] = (
-        "create_prorations"
-    )
+    trial_days: int | None = None
+    proration_behavior: Literal["create_prorations", "none", "always_invoice"] = "create_prorations"
 
 
 class SubscriptionUpdateIn(BaseModel):
-    price_provider_id: Optional[str] = None
-    quantity: Optional[int] = None
-    cancel_at_period_end: Optional[bool] = None
-    proration_behavior: Literal["create_prorations", "none", "always_invoice"] = (
-        "create_prorations"
-    )
+    price_provider_id: str | None = None
+    quantity: int | None = None
+    cancel_at_period_end: bool | None = None
+    proration_behavior: Literal["create_prorations", "none", "always_invoice"] = "create_prorations"
 
 
 class SubscriptionOut(BaseModel):
@@ -158,7 +152,7 @@ class SubscriptionOut(BaseModel):
     status: str
     quantity: int
     cancel_at_period_end: bool
-    current_period_end: Optional[str] = None
+    current_period_end: str | None = None
 
 
 class InvoiceCreateIn(BaseModel):
@@ -174,47 +168,45 @@ class InvoiceOut(BaseModel):
     status: str
     amount_due: AmountMinor
     currency: Currency
-    hosted_invoice_url: Optional[str] = None
-    pdf_url: Optional[str] = None
+    hosted_invoice_url: str | None = None
+    pdf_url: str | None = None
 
 
 class CaptureIn(BaseModel):
-    amount: Optional[AmountMinor] = None  # partial capture supported
+    amount: AmountMinor | None = None  # partial capture supported
 
 
 class IntentListFilter(BaseModel):
-    customer_provider_id: Optional[str] = None
-    status: Optional[str] = None
-    limit: Optional[int] = Field(default=50, ge=1, le=200)
-    cursor: Optional[str] = None  # opaque provider cursor when supported
+    customer_provider_id: str | None = None
+    status: str | None = None
+    limit: int | None = Field(default=50, ge=1, le=200)
+    cursor: str | None = None  # opaque provider cursor when supported
 
 
 class UsageRecordIn(BaseModel):
     # Stripe: subscription_item is the target for metered billing.
     # If provider doesn't use subscription_item, allow provider_price_id as fallback.
-    subscription_item: Optional[str] = None
-    provider_price_id: Optional[str] = None
+    subscription_item: str | None = None
+    provider_price_id: str | None = None
     quantity: Annotated[int, Field(ge=0)]
-    timestamp: Optional[int] = None  # Unix seconds; provider defaults to "now"
-    action: Optional[Literal["increment", "set"]] = "increment"
+    timestamp: int | None = None  # Unix seconds; provider defaults to "now"
+    action: Literal["increment", "set"] | None = "increment"
 
 
 class InvoiceLineItemIn(BaseModel):
     customer_provider_id: str
-    description: Optional[str] = None
+    description: str | None = None
     unit_amount: AmountMinor
     currency: Currency
-    quantity: Optional[int] = 1
-    provider_price_id: Optional[str] = (
-        None  # if linked to a price, unit_amount may be ignored
-    )
+    quantity: int | None = 1
+    provider_price_id: str | None = None  # if linked to a price, unit_amount may be ignored
 
 
 class InvoicesListFilter(BaseModel):
-    customer_provider_id: Optional[str] = None
-    status: Optional[str] = None
-    limit: Optional[int] = Field(default=50, ge=1, le=200)
-    cursor: Optional[str] = None
+    customer_provider_id: str | None = None
+    status: str | None = None
+    limit: int | None = Field(default=50, ge=1, le=200)
+    cursor: str | None = None
 
 
 class SetupIntentOut(BaseModel):
@@ -222,8 +214,8 @@ class SetupIntentOut(BaseModel):
     provider: str
     provider_setup_intent_id: str
     status: str
-    client_secret: Optional[str] = None
-    next_action: Optional[NextAction] = None
+    client_secret: str | None = None
+    next_action: NextAction | None = None
 
 
 class DisputeOut(BaseModel):
@@ -232,10 +224,10 @@ class DisputeOut(BaseModel):
     provider_dispute_id: str
     amount: AmountMinor
     currency: Currency
-    reason: Optional[str] = None
+    reason: str | None = None
     status: str
-    evidence_due_by: Optional[str] = None
-    created_at: Optional[str] = None
+    evidence_due_by: str | None = None
+    created_at: str | None = None
 
 
 class PayoutOut(BaseModel):
@@ -245,8 +237,8 @@ class PayoutOut(BaseModel):
     amount: AmountMinor
     currency: Currency
     status: str
-    arrival_date: Optional[str] = None
-    type: Optional[str] = None
+    arrival_date: str | None = None
+    type: str | None = None
 
 
 class BalanceAmount(BaseModel):
@@ -264,7 +256,7 @@ class SetupIntentCreateIn(BaseModel):
 
 
 class WebhookReplayIn(BaseModel):
-    event_ids: Optional[list[str]] = None
+    event_ids: list[str] | None = None
 
 
 class WebhookReplayOut(BaseModel):
@@ -278,36 +270,36 @@ class WebhookAckOut(BaseModel):
 class UsageRecordOut(BaseModel):
     id: str
     quantity: int
-    timestamp: Optional[int] = None
-    subscription_item: Optional[str] = None
-    provider_price_id: Optional[str] = None
-    action: Optional[Literal["increment", "set"]] = None
+    timestamp: int | None = None
+    subscription_item: str | None = None
+    provider_price_id: str | None = None
+    action: Literal["increment", "set"] | None = None
 
 
 # -------- Customers list filter ----------
 class CustomersListFilter(BaseModel):
-    provider: Optional[str] = None
-    user_id: Optional[str] = None
-    limit: Optional[int] = Field(default=50, ge=1, le=200)
-    cursor: Optional[str] = None  # we’ll paginate on provider_customer_id asc
+    provider: str | None = None
+    user_id: str | None = None
+    limit: int | None = Field(default=50, ge=1, le=200)
+    cursor: str | None = None  # we’ll paginate on provider_customer_id asc
 
 
 # -------- Products / Prices updates ----------
 class ProductUpdateIn(BaseModel):
-    name: Optional[str] = None
-    active: Optional[bool] = None
+    name: str | None = None
+    active: bool | None = None
 
 
 class PriceUpdateIn(BaseModel):
-    active: Optional[bool] = None
+    active: bool | None = None
 
 
 # -------- Payment Method update ----------
 class PaymentMethodUpdateIn(BaseModel):
     # keep minimal + commonly supported card fields
-    name: Optional[str] = None
-    exp_month: Optional[int] = None
-    exp_year: Optional[int] = None
+    name: str | None = None
+    exp_month: int | None = None
+    exp_year: int | None = None
     # extend here later with address fields (line1, city, etc.)
 
 
@@ -316,27 +308,27 @@ class RefundOut(BaseModel):
     id: str
     provider: str
     provider_refund_id: str
-    provider_payment_intent_id: Optional[str] = None
+    provider_payment_intent_id: str | None = None
     amount: AmountMinor
     currency: Currency
     status: str
-    reason: Optional[str] = None
-    created_at: Optional[str] = None
+    reason: str | None = None
+    created_at: str | None = None
 
 
 # -------- Invoice line items (list) ----------
 class InvoiceLineItemOut(BaseModel):
     id: str
-    description: Optional[str] = None
+    description: str | None = None
     amount: AmountMinor
     currency: Currency
-    quantity: Optional[int] = 1
-    provider_price_id: Optional[str] = None
+    quantity: int | None = 1
+    provider_price_id: str | None = None
 
 
 # -------- Usage records list/get ----------
 class UsageRecordListFilter(BaseModel):
-    subscription_item: Optional[str] = None
-    provider_price_id: Optional[str] = None
-    limit: Optional[int] = Field(default=50, ge=1, le=200)
-    cursor: Optional[str] = None
+    subscription_item: str | None = None
+    provider_price_id: str | None = None
+    limit: int | None = Field(default=50, ge=1, le=200)
+    cursor: str | None = None

svc_infra/apf_payments/service.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -78,7 +76,7 @@ class PaymentsService:
         session: AsyncSession,
         *,
         tenant_id: str,
-        provider_name: Optional[str] = None,
+        provider_name: str | None = None,
     ):
         if not tenant_id:
             raise ValueError("tenant_id is required for PaymentsService")
@@ -144,9 +142,7 @@ class PaymentsService:
 
     # --- Intents --------------------------------------------------------------
 
-    async def create_intent(
-        self, user_id: Optional[str], data: IntentCreateIn
-    ) -> IntentOut:
+    async def create_intent(self, user_id: str | None, data: IntentCreateIn) -> IntentOut:
         adapter = self._get_adapter()
         out = await adapter.create_intent(data, user_id=user_id)
         self.session.add(
@@ -217,9 +213,7 @@ class PaymentsService:
 
     # --- Webhooks -------------------------------------------------------------
 
-    async def handle_webhook(
-        self, provider: str, signature: str | None, payload: bytes
-    ) -> dict:
+    async def handle_webhook(self, provider: str, signature: str | None, payload: bytes) -> dict:
         adapter = self._get_adapter()
         parsed = await adapter.verify_and_parse_webhook(signature, payload)
         self.session.add(
@@ -317,9 +311,7 @@ class PaymentsService:
                     )
                 )
 
-    async def attach_payment_method(
-        self, data: PaymentMethodAttachIn
-    ) -> PaymentMethodOut:
+    async def attach_payment_method(self, data: PaymentMethodAttachIn) -> PaymentMethodOut:
         out = await self._get_adapter().attach_payment_method(data)
         # Upsert locally for quick listing
         pm = PayPaymentMethod(
@@ -336,9 +328,7 @@ class PaymentsService:
         self.session.add(pm)
         return out
 
-    async def list_payment_methods(
-        self, provider_customer_id: str
-    ) -> list[PaymentMethodOut]:
+    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) -> PaymentMethodOut:
@@ -401,18 +391,14 @@ class PaymentsService:
     async def update_subscription(
         self, provider_subscription_id: str, data: SubscriptionUpdateIn
     ) -> SubscriptionOut:
-        out = await self._get_adapter().update_subscription(
-            provider_subscription_id, data
-        )
+        out = await self._get_adapter().update_subscription(provider_subscription_id, data)
         # Optionally reflect status/quantity locally (query + update if exists)
         return out
 
     async def cancel_subscription(
         self, provider_subscription_id: str, at_period_end: bool = True
     ) -> SubscriptionOut:
-        out = await self._get_adapter().cancel_subscription(
-            provider_subscription_id, at_period_end
-        )
+        out = await self._get_adapter().cancel_subscription(provider_subscription_id, at_period_end)
         return out
 
     # --- Invoices ---
@@ -457,15 +443,15 @@ class PaymentsService:
         q = select(
             func.date_trunc("day", LedgerEntry.ts).label("day"),
             LedgerEntry.currency,
-            func.sum(
-                func.case((LedgerEntry.kind == "payment", LedgerEntry.amount), else_=0)
-            ).label("gross"),
-            func.sum(
-                func.case((LedgerEntry.kind == "refund", LedgerEntry.amount), else_=0)
-            ).label("refunds"),
-            func.sum(
-                func.case((LedgerEntry.kind == "fee", LedgerEntry.amount), else_=0)
-            ).label("fees"),
+            func.sum(func.case((LedgerEntry.kind == "payment", LedgerEntry.amount), else_=0)).label(
+                "gross"
+            ),
+            func.sum(func.case((LedgerEntry.kind == "refund", LedgerEntry.amount), else_=0)).label(
+                "refunds"
+            ),
+            func.sum(func.case((LedgerEntry.kind == "fee", LedgerEntry.amount), else_=0)).label(
+                "fees"
+            ),
             func.count().label("count"),
         )
         if date_from:
@@ -478,9 +464,9 @@ class PaymentsService:
                 q = q.where(LedgerEntry.ts <= datetime.fromisoformat(date_to))
             except Exception:
                 pass
-        q = q.group_by(
-            func.date_trunc("day", LedgerEntry.ts), LedgerEntry.currency
-        ).order_by(func.date_trunc("day", LedgerEntry.ts).desc())
+        q = q.group_by(func.date_trunc("day", LedgerEntry.ts), LedgerEntry.currency).order_by(
+            func.date_trunc("day", LedgerEntry.ts).desc()
+        )
 
         rows = (await self.session.execute(q)).all()
         out: list[StatementRow] = []
@@ -502,9 +488,7 @@ class PaymentsService:
             )
         return out
 
-    async def capture_intent(
-        self, provider_intent_id: str, data: CaptureIn
-    ) -> IntentOut:
+    async def capture_intent(self, provider_intent_id: str, data: CaptureIn) -> IntentOut:
         out = await self._get_adapter().capture_intent(
             provider_intent_id,
             amount=int(data.amount) if data.amount is not None else None,
@@ -539,9 +523,7 @@ class PaymentsService:
                         )
         return out
 
-    async def list_intents(
-        self, f: IntentListFilter
-    ) -> tuple[list[IntentOut], str | None]:
+    async def list_intents(self, f: IntentListFilter) -> tuple[list[IntentOut], str | None]:
         return await self._get_adapter().list_intents(
             customer_provider_id=f.customer_provider_id,
             status=f.status,
@@ -553,13 +535,9 @@ class PaymentsService:
     async def add_invoice_line_item(
         self, provider_invoice_id: str, data: InvoiceLineItemIn
     ) -> InvoiceOut:
-        return await self._get_adapter().add_invoice_line_item(
-            provider_invoice_id, data
-        )
+        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]:
+    async def list_invoices(self, f: InvoicesListFilter) -> tuple[list[InvoiceOut], str | None]:
         return await self._get_adapter().list_invoices(
             customer_provider_id=f.customer_provider_id,
             status=f.status,
@@ -596,9 +574,7 @@ class PaymentsService:
         )
         return out
 
-    async def confirm_setup_intent(
-        self, provider_setup_intent_id: str
-    ) -> SetupIntentOut:
+    async def confirm_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:
         out = await self._get_adapter().confirm_setup_intent(provider_setup_intent_id)
         row = await self.session.scalar(
             select(PaySetupIntent).where(
@@ -647,19 +623,15 @@ class PaymentsService:
 
     # --- Disputes -------------------------------------------------------------
     async def list_disputes(
-        self, *, status: Optional[str], limit: int, cursor: Optional[str]
-    ) -> tuple[list[DisputeOut], Optional[str]]:
-        return await self._get_adapter().list_disputes(
-            status=status, limit=limit, cursor=cursor
-        )
+        self, *, status: str | None, limit: int, cursor: str | None
+    ) -> tuple[list[DisputeOut], str | None]:
+        return await self._get_adapter().list_disputes(status=status, limit=limit, cursor=cursor)
 
     async def get_dispute(self, provider_dispute_id: str) -> DisputeOut:
         out = await self._get_adapter().get_dispute(provider_dispute_id)
         # Upsert locally
         row = await self.session.scalar(
-            select(PayDispute).where(
-                PayDispute.provider_dispute_id == provider_dispute_id
-            )
+            select(PayDispute).where(PayDispute.provider_dispute_id == provider_dispute_id)
         )
         if row:
             row.status = out.status
@@ -680,17 +652,11 @@ class PaymentsService:
             )
         return out
 
-    async def submit_dispute_evidence(
-        self, provider_dispute_id: str, evidence: dict
-    ) -> DisputeOut:
-        out = await self._get_adapter().submit_dispute_evidence(
-            provider_dispute_id, evidence
-        )
+    async def submit_dispute_evidence(self, provider_dispute_id: str, evidence: dict) -> DisputeOut:
+        out = await self._get_adapter().submit_dispute_evidence(provider_dispute_id, evidence)
         # reflect status
         row = await self.session.scalar(
-            select(PayDispute).where(
-                PayDispute.provider_dispute_id == provider_dispute_id
-            )
+            select(PayDispute).where(PayDispute.provider_dispute_id == provider_dispute_id)
         )
         if row:
             row.status = out.status
@@ -702,8 +668,8 @@ class PaymentsService:
 
     # --- Payouts --------------------------------------------------------------
     async def list_payouts(
-        self, *, limit: int, cursor: Optional[str]
-    ) -> tuple[list[PayoutOut], Optional[str]]:
+        self, *, limit: int, cursor: str | None
+    ) -> tuple[list[PayoutOut], str | None]:
         return await self._get_adapter().list_payouts(limit=limit, cursor=cursor)
 
     async def get_payout(self, provider_payout_id: str) -> PayoutOut:
@@ -733,7 +699,7 @@ class PaymentsService:
 
     # --- Webhook replay -------------------------------------------------------
     async def replay_webhooks(
-        self, since: Optional[str], until: Optional[str], event_ids: list[str]
+        self, since: str | None, until: str | None, event_ids: list[str]
     ) -> int:
         from datetime import datetime
 
@@ -760,9 +726,7 @@ class PaymentsService:
         return len(rows)
 
     # ---- Customers ----
-    async def list_customers(
-        self, f: CustomersListFilter
-    ) -> tuple[list[CustomerOut], str | None]:
+    async def list_customers(self, f: CustomersListFilter) -> tuple[list[CustomerOut], str | None]:
         adapter = self._get_adapter()
         try:
             return await adapter.list_customers(
@@ -805,9 +769,7 @@ class PaymentsService:
             raise RuntimeError("Customer not found")
         # upsert locally
         row = await self.session.scalar(
-            select(PayCustomer).where(
-                PayCustomer.provider_customer_id == provider_customer_id
-            )
+            select(PayCustomer).where(PayCustomer.provider_customer_id == provider_customer_id)
         )
         if not row:
             self.session.add(
@@ -827,19 +789,13 @@ class PaymentsService:
     async def list_products(
         self, *, active: bool | None, limit: int, cursor: str | None
     ) -> tuple[list[ProductOut], str | None]:
-        return await self._get_adapter().list_products(
-            active=active, limit=limit, cursor=cursor
-        )
+        return await self._get_adapter().list_products(active=active, limit=limit, cursor=cursor)
 
-    async def update_product(
-        self, provider_product_id: str, data: ProductUpdateIn
-    ) -> ProductOut:
+    async def update_product(self, provider_product_id: str, data: ProductUpdateIn) -> ProductOut:
         out = await self._get_adapter().update_product(provider_product_id, data)
         # reflect DB
         row = await self.session.scalar(
-            select(PayProduct).where(
-                PayProduct.provider_product_id == provider_product_id
-            )
+            select(PayProduct).where(PayProduct.provider_product_id == provider_product_id)
         )
         if row:
             if data.name is not None:
@@ -866,9 +822,7 @@ class PaymentsService:
             cursor=cursor,
         )
 
-    async def update_price(
-        self, provider_price_id: str, data: PriceUpdateIn
-    ) -> PriceOut:
+    async def update_price(self, provider_price_id: str, data: PriceUpdateIn) -> PriceOut:
         out = await self._get_adapter().update_price(provider_price_id, data)
         row = await self.session.scalar(
             select(PayPrice).where(PayPrice.provider_price_id == provider_price_id)