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

svc_infra/apf_payments/provider/aiydan.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import inspect
 from datetime import date, datetime, timezone
-from typing import Any, Optional, Sequence, Tuple
+from typing import Any, Literal, Optional, Sequence, Tuple, cast
 
 from svc_infra.apf_payments.schemas import (
     BalanceAmount,
@@ -43,9 +43,9 @@ from svc_infra.apf_payments.settings import get_payments_settings
 from .base import ProviderAdapter
 
 try:  # pragma: no cover - optional dependency
-    import aiydan  # type: ignore
+    import aiydan
 except Exception:  # pragma: no cover - handled at runtime
-    aiydan = None  # type: ignore
+    aiydan = None
 
 
 async def _maybe_await(result: Any) -> Any:
@@ -62,24 +62,27 @@ def _coerce_id(data: dict[str, Any], *candidates: str) -> str:
     raise RuntimeError(f"Aiydan payload missing id fields: {candidates}")
 
 
-def _ensure_utc_isoformat(value: Any) -> Optional[str]:
+def _ensure_utc_isoformat(value: Any) -> str | None:
     if value is None:
         return None
     if isinstance(value, str):
         return value
     if isinstance(value, datetime):
-        if value.tzinfo is None:
-            value = value.replace(tzinfo=timezone.utc)
-        return value.astimezone(timezone.utc).isoformat()
+        dt: datetime = value
+        if dt.tzinfo is None:
+            dt = dt.replace(tzinfo=timezone.utc)
+        return dt.astimezone(timezone.utc).isoformat()
     if isinstance(value, date):
-        return datetime(value.year, value.month, value.day, tzinfo=timezone.utc).isoformat()
+        return datetime(
+            value.year, value.month, value.day, tzinfo=timezone.utc
+        ).isoformat()
     try:
         parsed = datetime.fromisoformat(str(value))
         if parsed.tzinfo is None:
             parsed = parsed.replace(tzinfo=timezone.utc)
         return parsed.astimezone(timezone.utc).isoformat()
     except Exception:
-        return str(value)
+        return cast(str, str(value))  # Cast needed since value is Any
 
 
 def _customer_to_out(data: dict[str, Any]) -> CustomerOut:
@@ -113,7 +116,9 @@ def _payment_method_to_out(data: dict[str, Any]) -> PaymentMethodOut:
     return PaymentMethodOut(
         id=method_id,
         provider="aiydan",
-        provider_customer_id=str(data.get("provider_customer_id") or data.get("customer_id") or ""),
+        provider_customer_id=str(
+            data.get("provider_customer_id") or data.get("customer_id") or ""
+        ),
         provider_method_id=method_id,
         brand=card.get("brand") or data.get("brand"),
         last4=card.get("last4") or data.get("last4"),
@@ -194,7 +199,9 @@ def _invoice_to_out(data: dict[str, Any]) -> InvoiceOut:
         id=invoice_id,
         provider="aiydan",
         provider_invoice_id=invoice_id,
-        provider_customer_id=str(data.get("provider_customer_id") or data.get("customer_id") or ""),
+        provider_customer_id=str(
+            data.get("provider_customer_id") or data.get("customer_id") or ""
+        ),
         status=str(data.get("status", "")),
         amount_due=int(data.get("amount_due", data.get("amount") or 0) or 0),
         currency=str(data.get("currency", "")).upper(),
@@ -208,12 +215,15 @@ def _invoice_line_item_to_out(data: dict[str, Any]) -> InvoiceLineItemOut:
     price = data.get("price") or {}
     if not isinstance(price, dict):
         price = {"id": getattr(price, "id", None)}
+    quantity = int(data.get("quantity", 0) or 0)
+    unit_amount = int(data.get("unit_amount", 0) or 0)
+    amount = int(data.get("amount", unit_amount * quantity) or 0)
     return InvoiceLineItemOut(
         id=line_id,
         description=data.get("description"),
         currency=str(data.get("currency", price.get("currency", ""))).upper(),
-        quantity=int(data.get("quantity", 0) or 0),
-        unit_amount=int(data.get("unit_amount", data.get("amount", 0) or 0)),
+        quantity=quantity,
+        amount=amount,
         provider_price_id=price.get("id"),
     )
 
@@ -225,7 +235,9 @@ def _refund_to_out(data: dict[str, Any]) -> RefundOut:
         provider="aiydan",
         provider_refund_id=refund_id,
         provider_payment_intent_id=str(
-            data.get("provider_payment_intent_id") or data.get("payment_intent_id") or ""
+            data.get("provider_payment_intent_id")
+            or data.get("payment_intent_id")
+            or ""
         ),
         amount=int(data.get("amount", 0) or 0),
         currency=str(data.get("currency", "")).upper(),
@@ -268,17 +280,25 @@ def _payout_to_out(data: dict[str, Any]) -> PayoutOut:
 
 
 def _usage_record_to_out(data: dict[str, Any]) -> UsageRecordOut:
+    action_raw = data.get("action")
+    action: Literal["increment", "set"] | None = None
+    if action_raw in ("increment", "set"):
+        action = cast(Literal["increment", "set"], action_raw)
     return UsageRecordOut(
         id=str(data.get("id")),
         quantity=int(data.get("quantity", 0) or 0),
         timestamp=data.get("timestamp"),
         subscription_item=(
-            str(data.get("subscription_item")) if data.get("subscription_item") else None
+            str(data.get("subscription_item"))
+            if data.get("subscription_item")
+            else None
         ),
         provider_price_id=(
-            str(data.get("provider_price_id")) if data.get("provider_price_id") else None
+            str(data.get("provider_price_id"))
+            if data.get("provider_price_id")
+            else None
         ),
-        action=(str(data.get("action")) if data.get("action") else None),
+        action=action,
     )
 
 
@@ -297,7 +317,8 @@ def _balance_snapshot_to_out(data: dict[str, Any]) -> BalanceSnapshotOut:
             return out
         if isinstance(side, dict):
             return [
-                {"currency": str(cur).upper(), "amount": int(amt or 0)} for cur, amt in side.items()
+                {"currency": str(cur).upper(), "amount": int(amt or 0)}
+                for cur, amt in side.items()
             ]
         return []
 
@@ -315,26 +336,28 @@ def _balance_snapshot_to_out(data: dict[str, Any]) -> BalanceSnapshotOut:
 
 def _ensure_sequence(result: Any) -> Sequence[dict[str, Any]]:
     if isinstance(result, Sequence):
-        return result  # type: ignore[arg-type]
+        return result
     if isinstance(result, dict):
         items = result.get("items")
         if isinstance(items, Sequence):
-            return items  # type: ignore[arg-type]
+            return items
     raise RuntimeError("Expected sequence payload from Aiydan client")
 
 
-def _ensure_list_response(result: Any) -> Tuple[Sequence[dict[str, Any]], Optional[str]]:
+def _ensure_list_response(
+    result: Any,
+) -> Tuple[Sequence[dict[str, Any]], Optional[str]]:
     if isinstance(result, tuple) and len(result) == 2:
         items, cursor = result
         if isinstance(items, Sequence) or items is None:
-            return (items or []), cursor  # type: ignore[arg-type]
+            return (items or []), cursor
     if isinstance(result, dict):
         items = result.get("items")
         cursor = result.get("next_cursor") or result.get("cursor")
         if isinstance(items, Sequence):
             return items, cursor
     if isinstance(result, Sequence):
-        return result, None  # type: ignore[arg-type]
+        return result, None
     raise RuntimeError("Expected iterable response from Aiydan client")
 
 
@@ -347,7 +370,9 @@ class AiydanAdapter(ProviderAdapter):
         if client is not None:
             self._client = client
             self._webhook_secret = (
-                cfg.webhook_secret.get_secret_value() if cfg and cfg.webhook_secret else None
+                cfg.webhook_secret.get_secret_value()
+                if cfg and cfg.webhook_secret
+                else None
             )
             return
         if cfg is None:
@@ -367,32 +392,44 @@ class AiydanAdapter(ProviderAdapter):
         if cfg.base_url:
             kwargs["base_url"] = cfg.base_url
         self._client = client_class(**kwargs)
-        self._webhook_secret = cfg.webhook_secret.get_secret_value() if cfg.webhook_secret else None
+        self._webhook_secret = (
+            cfg.webhook_secret.get_secret_value() if cfg.webhook_secret else None
+        )
 
     async def ensure_customer(self, data: CustomerUpsertIn) -> CustomerOut:
         payload = data.model_dump(exclude_none=True)
         result = await _maybe_await(self._client.ensure_customer(payload))
         return _customer_to_out(result)
 
-    async def attach_payment_method(self, data: PaymentMethodAttachIn) -> PaymentMethodOut:
+    async def attach_payment_method(
+        self, data: PaymentMethodAttachIn
+    ) -> PaymentMethodOut:
         payload = data.model_dump(exclude_none=True)
         result = await _maybe_await(self._client.attach_payment_method(payload))
         return _payment_method_to_out(result)
 
-    async def list_payment_methods(self, provider_customer_id: str) -> list[PaymentMethodOut]:
-        result = await _maybe_await(self._client.list_payment_methods(provider_customer_id))
+    async def list_payment_methods(
+        self, provider_customer_id: str
+    ) -> list[PaymentMethodOut]:
+        result = await _maybe_await(
+            self._client.list_payment_methods(provider_customer_id)
+        )
         methods = _ensure_sequence(result)
         return [_payment_method_to_out(method) for method in methods]
 
     async def detach_payment_method(self, provider_method_id: str) -> PaymentMethodOut:
-        result = await _maybe_await(self._client.detach_payment_method(provider_method_id))
+        result = await _maybe_await(
+            self._client.detach_payment_method(provider_method_id)
+        )
         return _payment_method_to_out(result)
 
     async def set_default_payment_method(
         self, provider_customer_id: str, provider_method_id: str
     ) -> PaymentMethodOut:
         result = await _maybe_await(
-            self._client.set_default_payment_method(provider_customer_id, provider_method_id)
+            self._client.set_default_payment_method(
+                provider_customer_id, provider_method_id
+            )
         )
         return _payment_method_to_out(result)
 
@@ -404,7 +441,9 @@ class AiydanAdapter(ProviderAdapter):
         self, provider_method_id: str, data: PaymentMethodUpdateIn
     ) -> PaymentMethodOut:
         payload = data.model_dump(exclude_none=True)
-        result = await _maybe_await(self._client.update_payment_method(provider_method_id, payload))
+        result = await _maybe_await(
+            self._client.update_payment_method(provider_method_id, payload)
+        )
         return _payment_method_to_out(result)
 
     async def create_product(self, data: ProductCreateIn) -> ProductOut:
@@ -425,9 +464,13 @@ class AiydanAdapter(ProviderAdapter):
         items, next_cursor = _ensure_list_response(result)
         return [_product_to_out(item) for item in items], next_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:
         payload = data.model_dump(exclude_none=True)
-        result = await _maybe_await(self._client.update_product(provider_product_id, payload))
+        result = await _maybe_await(
+            self._client.update_product(provider_product_id, payload)
+        )
         return _product_to_out(result)
 
     async def create_price(self, data: PriceCreateIn) -> PriceOut:
@@ -458,9 +501,13 @@ class AiydanAdapter(ProviderAdapter):
         items, next_cursor = _ensure_list_response(result)
         return [_price_to_out(item) for item in items], next_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:
         payload = data.model_dump(exclude_none=True)
-        result = await _maybe_await(self._client.update_price(provider_price_id, payload))
+        result = await _maybe_await(
+            self._client.update_price(provider_price_id, payload)
+        )
         return _price_to_out(result)
 
     async def create_subscription(self, data: SubscriptionCreateIn) -> SubscriptionOut:
@@ -486,7 +533,9 @@ class AiydanAdapter(ProviderAdapter):
         return _subscription_to_out(result)
 
     async def get_subscription(self, provider_subscription_id: str) -> SubscriptionOut:
-        result = await _maybe_await(self._client.get_subscription(provider_subscription_id))
+        result = await _maybe_await(
+            self._client.get_subscription(provider_subscription_id)
+        )
         return _subscription_to_out(result)
 
     async def list_subscriptions(
@@ -581,7 +630,9 @@ class AiydanAdapter(ProviderAdapter):
         items, next_cursor = _ensure_list_response(result)
         return [_invoice_line_item_to_out(item) for item in items], next_cursor
 
-    async def create_intent(self, data: IntentCreateIn, *, user_id: str | None) -> IntentOut:
+    async def create_intent(
+        self, data: IntentCreateIn, *, user_id: str | None
+    ) -> IntentOut:
         payload = data.model_dump(exclude_none=True)
         if user_id is not None:
             payload["user_id"] = user_id
@@ -598,15 +649,21 @@ class AiydanAdapter(ProviderAdapter):
 
     async def refund(self, provider_intent_id: str, data: RefundIn) -> IntentOut:
         payload = data.model_dump(exclude_none=True)
-        result = await _maybe_await(self._client.refund_intent(provider_intent_id, payload))
+        result = await _maybe_await(
+            self._client.refund_intent(provider_intent_id, payload)
+        )
         return _intent_to_out(result)
 
     async def hydrate_intent(self, provider_intent_id: str) -> IntentOut:
         result = await _maybe_await(self._client.get_intent(provider_intent_id))
         return _intent_to_out(result)
 
-    async def capture_intent(self, provider_intent_id: str, *, amount: int | None) -> IntentOut:
-        result = await _maybe_await(self._client.capture_intent(provider_intent_id, amount=amount))
+    async def capture_intent(
+        self, provider_intent_id: str, *, amount: int | None
+    ) -> IntentOut:
+        result = await _maybe_await(
+            self._client.capture_intent(provider_intent_id, amount=amount)
+        )
         return _intent_to_out(result)
 
     async def list_intents(
@@ -666,7 +723,9 @@ class AiydanAdapter(ProviderAdapter):
         result = await _maybe_await(self._client.get_dispute(provider_dispute_id))
         return _dispute_to_out(result)
 
-    async def submit_dispute_evidence(self, provider_dispute_id: str, evidence: dict) -> DisputeOut:
+    async def submit_dispute_evidence(
+        self, provider_dispute_id: str, evidence: dict
+    ) -> DisputeOut:
         result = await _maybe_await(
             self._client.submit_dispute_evidence(provider_dispute_id, evidence)
         )
@@ -683,7 +742,9 @@ class AiydanAdapter(ProviderAdapter):
     async def list_payouts(
         self, *, limit: int, cursor: str | None
     ) -> tuple[list[PayoutOut], str | None]:
-        result = await _maybe_await(self._client.list_payouts(limit=limit, cursor=cursor))
+        result = await _maybe_await(
+            self._client.list_payouts(limit=limit, cursor=cursor)
+        )
         items, next_cursor = _ensure_list_response(result)
         return [_payout_to_out(item) for item in items], next_cursor
 
@@ -743,8 +804,12 @@ class AiydanAdapter(ProviderAdapter):
             next_action=NextAction(type=(result.get("next_action") or {}).get("type")),
         )
 
-    async def confirm_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:
-        result = await _maybe_await(self._client.confirm_setup_intent(provider_setup_intent_id))
+    async def confirm_setup_intent(
+        self, provider_setup_intent_id: str
+    ) -> SetupIntentOut:
+        result = await _maybe_await(
+            self._client.confirm_setup_intent(provider_setup_intent_id)
+        )
         return SetupIntentOut(
             id=_coerce_id(result, "provider_setup_intent_id", "setup_intent_id", "id"),
             provider="aiydan",
@@ -757,7 +822,9 @@ class AiydanAdapter(ProviderAdapter):
         )
 
     async def get_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:
-        result = await _maybe_await(self._client.get_setup_intent(provider_setup_intent_id))
+        result = await _maybe_await(
+            self._client.get_setup_intent(provider_setup_intent_id)
+        )
         return SetupIntentOut(
             id=_coerce_id(result, "provider_setup_intent_id", "setup_intent_id", "id"),
             provider="aiydan",
@@ -771,13 +838,20 @@ class AiydanAdapter(ProviderAdapter):
 
     async def resume_intent_after_action(self, provider_intent_id: str) -> IntentOut:
         if hasattr(self._client, "resume_intent_after_action"):
-            result = await _maybe_await(self._client.resume_intent_after_action(provider_intent_id))
+            result = await _maybe_await(
+                self._client.resume_intent_after_action(provider_intent_id)
+            )
         else:
             result = await _maybe_await(self._client.get_intent(provider_intent_id))
         return _intent_to_out(result)
 
     async def list_customers(
-        self, *, provider: str | None, user_id: str | None, limit: int, cursor: str | None
+        self,
+        *,
+        provider: str | None,
+        user_id: str | None,
+        limit: int,
+        cursor: str | None,
     ) -> tuple[list[CustomerOut], str | None]:
         result = await _maybe_await(
             self._client.list_customers(

svc_infra/apf_payments/provider/base.py

@@ -42,10 +42,14 @@ class ProviderAdapter(Protocol):
     async def ensure_customer(self, data: CustomerUpsertIn) -> CustomerOut:
         pass
 
-    async def attach_payment_method(self, data: PaymentMethodAttachIn) -> PaymentMethodOut:
+    async def attach_payment_method(
+        self, data: PaymentMethodAttachIn
+    ) -> PaymentMethodOut:
         pass
 
-    async def list_payment_methods(self, provider_customer_id: str) -> list[PaymentMethodOut]:
+    async def list_payment_methods(
+        self, provider_customer_id: str
+    ) -> list[PaymentMethodOut]:
         pass
 
     async def detach_payment_method(self, provider_method_id: str) -> PaymentMethodOut:
@@ -87,7 +91,9 @@ class ProviderAdapter(Protocol):
     async def pay_invoice(self, provider_invoice_id: str) -> InvoiceOut:
         pass
 
-    async def create_intent(self, data: IntentCreateIn, *, user_id: str | None) -> IntentOut:
+    async def create_intent(
+        self, data: IntentCreateIn, *, user_id: str | None
+    ) -> IntentOut:
         pass
 
     async def confirm_intent(self, provider_intent_id: str) -> IntentOut:
@@ -107,7 +113,9 @@ class ProviderAdapter(Protocol):
     ) -> dict[str, Any]:
         pass
 
-    async def capture_intent(self, provider_intent_id: str, *, amount: int | None) -> IntentOut:
+    async def capture_intent(
+        self, provider_intent_id: str, *, amount: int | None
+    ) -> IntentOut:
         pass
 
     async def list_intents(
@@ -150,7 +158,9 @@ class ProviderAdapter(Protocol):
     async def create_setup_intent(self, data: SetupIntentCreateIn) -> SetupIntentOut:
         pass
 
-    async def confirm_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:
+    async def confirm_setup_intent(
+        self, provider_setup_intent_id: str
+    ) -> SetupIntentOut:
         pass
 
     async def get_setup_intent(self, provider_setup_intent_id: str) -> SetupIntentOut:
@@ -169,7 +179,9 @@ class ProviderAdapter(Protocol):
     async def get_dispute(self, provider_dispute_id: str) -> DisputeOut:
         pass
 
-    async def submit_dispute_evidence(self, provider_dispute_id: str, evidence: dict) -> DisputeOut:
+    async def submit_dispute_evidence(
+        self, provider_dispute_id: str, evidence: dict
+    ) -> DisputeOut:
         pass
 
     # --- Balance & Payouts ---
@@ -186,7 +198,12 @@ class ProviderAdapter(Protocol):
 
     # --- Customers ---
     async def list_customers(
-        self, *, provider: str | None, user_id: str | None, limit: int, cursor: str | None
+        self,
+        *,
+        provider: str | None,
+        user_id: str | None,
+        limit: int,
+        cursor: str | None,
     ) -> tuple[list[CustomerOut], str | None]:
         """Optional: if not implemented, the service will list from local DB."""
         pass
@@ -203,7 +220,9 @@ class ProviderAdapter(Protocol):
     ) -> tuple[list[ProductOut], str | None]:
         pass
 
-    async def update_product(self, provider_product_id: str, data: ProductUpdateIn) -> ProductOut:
+    async def update_product(
+        self, provider_product_id: str, data: ProductUpdateIn
+    ) -> ProductOut:
         pass
 
     async def get_price(self, provider_price_id: str) -> PriceOut:
@@ -219,7 +238,9 @@ class ProviderAdapter(Protocol):
     ) -> tuple[list[PriceOut], str | None]:
         pass
 
-    async def update_price(self, provider_price_id: str, data: PriceUpdateIn) -> PriceOut:
+    async def update_price(
+        self, provider_price_id: str, data: PriceUpdateIn
+    ) -> PriceOut:
         pass
 
     # --- Subscriptions ---