svc-infra 0.1.709__tar.gz → 1.0.5__tar.gz

{svc_infra-0.1.709 → svc_infra-1.0.5}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.709
+Version: 1.0.5
 Summary: Infrastructure for building and deploying prod-ready services
 License: MIT
 Keywords: fastapi,sqlalchemy,alembic,auth,infra,async,pydantic
 Author: Ali Khatami
 Author-email: aliikhatami94@gmail.com
 Requires-Python: >=3.11,<4.0
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: FastAPI
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -86,13 +86,19 @@ Description-Content-Type: text/markdown
 
 # svc-infra
 
-### Production-ready FastAPI infrastructure in one import
+[![v1.0.0](https://img.shields.io/badge/version-1.0.0-green.svg)](CHANGELOG.md)
+[![CI](https://github.com/nfraxlab/svc-infra/actions/workflows/ci.yml/badge.svg)](https://github.com/nfraxlab/svc-infra/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![Python](https://img.shields.io/pypi/pyversions/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Downloads](https://img.shields.io/pypi/dm/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![codecov](https://codecov.io/gh/nfraxlab/svc-infra/branch/main/graph/badge.svg)](https://codecov.io/gh/nfraxlab/svc-infra)
 
-[![PyPI](https://img.shields.io/pypi/v/svc-infra.svg)](https://pypi.org/project/svc-infra/) [![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Downloads](https://static.pepy.tech/badge/svc-infra/month)](https://pepy.tech/project/svc-infra)
+### Production-ready FastAPI infrastructure in one import
 
 **Stop rebuilding auth, billing, webhooks, and background jobs for every project.**
 
-[Documentation](docs/) · [Examples](examples/) · [PyPI](https://pypi.org/project/svc-infra/)
+[Documentation](docs/) · [Examples](examples/) · [PyPI](https://pypi.org/project/svc-infra/) · [Changelog](CHANGELOG.md)
 
 </div>
 

{svc_infra-0.1.709 → svc_infra-1.0.5}/README.md

@@ -2,13 +2,19 @@
 
 # svc-infra
 
-### Production-ready FastAPI infrastructure in one import
+[![v1.0.0](https://img.shields.io/badge/version-1.0.0-green.svg)](CHANGELOG.md)
+[![CI](https://github.com/nfraxlab/svc-infra/actions/workflows/ci.yml/badge.svg)](https://github.com/nfraxlab/svc-infra/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![Python](https://img.shields.io/pypi/pyversions/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Downloads](https://img.shields.io/pypi/dm/svc-infra.svg)](https://pypi.org/project/svc-infra/)
+[![codecov](https://codecov.io/gh/nfraxlab/svc-infra/branch/main/graph/badge.svg)](https://codecov.io/gh/nfraxlab/svc-infra)
 
-[![PyPI](https://img.shields.io/pypi/v/svc-infra.svg)](https://pypi.org/project/svc-infra/) [![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Downloads](https://static.pepy.tech/badge/svc-infra/month)](https://pepy.tech/project/svc-infra)
+### Production-ready FastAPI infrastructure in one import
 
 **Stop rebuilding auth, billing, webhooks, and background jobs for every project.**
 
-[Documentation](docs/) · [Examples](examples/) · [PyPI](https://pypi.org/project/svc-infra/)
+[Documentation](docs/) · [Examples](examples/) · [PyPI](https://pypi.org/project/svc-infra/) · [Changelog](CHANGELOG.md)
 
 </div>
 

{svc_infra-0.1.709 → svc_infra-1.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.709"
+version = "1.0.5"
 description = "Infrastructure for building and deploying prod-ready services"
 authors = ["Ali Khatami <aliikhatami94@gmail.com>"]
 license = "MIT"
@@ -17,7 +17,7 @@ include = [
 ]
 
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
@@ -118,6 +118,7 @@ s3 = ["aioboto3"]
 [tool.poetry.group.dev.dependencies]
 pytest = ">=8.0.0"
 pytest-asyncio = ">=0.23.0"
+pytest-cov = ">=4.0.0"
 ruff = ">=0.6.0"
 mypy = ">=1.10.0"
 types-requests = ">=2.31.0"
@@ -127,6 +128,7 @@ fakeredis = ">=2.20.0"
 moto = {extras = ["s3"], version = ">=5.0.0"}
 aiosqlite = ">=0.19.0"  # Required for acceptance tests using SQLite
 pre-commit = ">=3.0.0"
+bandit = ">=1.7.0"
 # Documentation
 mkdocs = ">=1.6.0"
 mkdocs-material = ">=9.5.0"
@@ -160,6 +162,81 @@ filterwarnings = [
     "ignore:The `route` decorator is deprecated:DeprecationWarning:starlette.*",
 ]
 
+[tool.ruff]
+line-length = 100
+target-version = "py311"
+
+[tool.ruff.lint]
+select = [
+    "E",      # pycodestyle errors
+    "W",      # pycodestyle warnings
+    "F",      # Pyflakes
+    "I",      # isort
+    "B",      # flake8-bugbear
+    "C4",     # flake8-comprehensions
+    "UP",     # pyupgrade
+    "SIM",    # flake8-simplify
+    "RUF",    # Ruff-specific rules
+]
+
+ignore = [
+    "E501",    # line too long (handled by formatter)
+    "RUF022",  # __all__ not sorted (we use logical grouping)
+    "RUF012",  # mutable class attrs (handled by dataclass/pydantic)
+    "B007",    # unused loop variable (often intentional)
+    "B008",    # function call in default arg (typer.Option pattern)
+    "B027",    # empty method in ABC (intentional for optional callbacks)
+    "B904",    # raise from err (not always clearer)
+    "B905",    # zip strict (Python 3.10+ only, adds verbosity)
+    "SIM102",  # nested if statements (sometimes clearer)
+    "SIM103",  # return condition directly (sometimes clearer with if)
+    "SIM105",  # contextlib.suppress (explicit try/except often clearer)
+    "SIM108",  # ternary operator (readability preference)
+    "SIM110",  # use all() (sometimes clearer with explicit loop)
+    "SIM113",  # use enumerate (sometimes clearer without)
+    "SIM115",  # context manager for files (not always applicable)
+    "SIM117",  # single with statement (sometimes clearer separate)
+    "SIM118",  # key in dict vs dict.keys() (minor)
+    "UP028",   # yield from (sometimes clearer with explicit yield)
+    "UP038",   # isinstance(x, (A, B)) - deprecated rule, requires unsafe fixes
+    "RUF001",  # ambiguous unicode char in string (intentional in docs)
+    "RUF002",  # ambiguous unicode char in docstring (intentional curly quotes)
+    "RUF003",  # ambiguous unicode char in comment (intentional curly quotes)
+    "B023",    # function uses loop variable (often intentional in closures)
+    "B039",    # contextvar default mutable (handled by contextvar)
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = [
+    "B018",    # useless expression in tests is fine
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["svc_infra"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.bandit]
+exclude_dirs = ["tests", ".venv", "venv"]
+skips = [
+    "B101",  # assert used (intentional in tests and contracts)
+    "B104",  # hardcoded_bind_all_interfaces (intentional for container deployments)
+    "B310",  # urllib urlopen (URL is validated/trusted in our code)
+    "B311",  # random for non-crypto (intentional)
+    "B324",  # SHA1/MD5 hash - used for cache keys and HIBP API, not security
+]
+
+[tool.coverage.run]
+source = ["src/svc_infra"]
+branch = true
+omit = ["*/tests/*", "*/__pycache__/*"]
+
+[tool.coverage.report]
+exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:", "raise NotImplementedError"]
+fail_under = 70
+show_missing = true
+
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"

{svc_infra-0.1.709 → svc_infra-1.0.5}/src/svc_infra/apf_payments/models.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
 
 from sqlalchemy import (
     JSON,
@@ -27,14 +26,10 @@ class PayCustomer(ModelBase):
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
     # Tenant scoping
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     # Always typed to match the actual auth PK; FK is enforced at table level
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_customer_id: Mapped[str] = mapped_column(
@@ -59,13 +54,9 @@ class PayIntent(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_intent_id: Mapped[str] = mapped_column(
@@ -74,13 +65,13 @@ class PayIntent(ModelBase):
     amount: Mapped[int] = mapped_column(Numeric(18, 0), nullable=False)  # minor units
     currency: Mapped[str] = mapped_column(String(8), nullable=False)
     status: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
-    client_secret: Mapped[Optional[str]] = mapped_column(String(255))
+    client_secret: Mapped[str | None] = mapped_column(String(255))
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),
         nullable=False,
     )
-    confirmed_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    confirmed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
     captured: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
 
     __table_args__ = (
@@ -95,9 +86,7 @@ class PayEvent(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_event_id: Mapped[str] = mapped_column(
@@ -109,9 +98,7 @@ class PayEvent(ModelBase):
         server_default=text("CURRENT_TIMESTAMP"),
         nullable=False,
     )
-    payload_json: Mapped[dict] = mapped_column(
-        JSON, nullable=False
-    )  # compact JSON string
+    payload_json: Mapped[dict] = mapped_column(JSON, nullable=False)  # compact JSON string
 
 
 class LedgerEntry(ModelBase):
@@ -119,9 +106,7 @@ class LedgerEntry(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     ts: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
@@ -131,18 +116,12 @@ class LedgerEntry(ModelBase):
     )
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
-    provider_ref: Mapped[Optional[str]] = mapped_column(String(128), index=True)
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    provider_ref: Mapped[str | None] = mapped_column(String(128), index=True)
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
     amount: Mapped[int] = mapped_column(Numeric(18, 0), nullable=False)
     currency: Mapped[str] = mapped_column(String(8), nullable=False)
-    kind: Mapped[str] = mapped_column(
-        String(24), nullable=False
-    )  # payment|refund|fee|payout...
-    status: Mapped[str] = mapped_column(
-        String(24), nullable=False
-    )  # pending|posted|void
+    kind: Mapped[str] = mapped_column(String(24), nullable=False)  # payment|refund|fee|payout...
+    status: Mapped[str] = mapped_column(String(24), nullable=False)  # pending|posted|void
 
     __table_args__ = (
         user_fk_constraint("user_id", ondelete="SET NULL"),
@@ -163,24 +142,18 @@ class PayPaymentMethod(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
-    provider_customer_id: Mapped[str] = mapped_column(
-        String(128), index=True, nullable=False
-    )
+    provider_customer_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     provider_method_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
     )
-    brand: Mapped[Optional[str]] = mapped_column(String(32))
-    last4: Mapped[Optional[str]] = mapped_column(String(8))
-    exp_month: Mapped[Optional[int]] = mapped_column(Numeric(2, 0))
-    exp_year: Mapped[Optional[int]] = mapped_column(Numeric(4, 0))
+    brand: Mapped[str | None] = mapped_column(String(32))
+    last4: Mapped[str | None] = mapped_column(String(8))
+    exp_month: Mapped[int | None] = mapped_column(Numeric(2, 0))
+    exp_year: Mapped[int | None] = mapped_column(Numeric(4, 0))
     is_default: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
@@ -204,9 +177,7 @@ class PayProduct(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_product_id: Mapped[str] = mapped_column(
@@ -226,23 +197,17 @@ class PayPrice(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_price_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
     )
-    provider_product_id: Mapped[str] = mapped_column(
-        String(128), index=True, nullable=False
-    )
+    provider_product_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     currency: Mapped[str] = mapped_column(String(8), nullable=False)
-    unit_amount: Mapped[int] = mapped_column(
-        Numeric(18, 0), nullable=False
-    )  # minor units
-    interval: Mapped[Optional[str]] = mapped_column(String(16))  # month|year|week|day
-    trial_days: Mapped[Optional[int]] = mapped_column(Numeric(5, 0))
+    unit_amount: Mapped[int] = mapped_column(Numeric(18, 0), nullable=False)  # minor units
+    interval: Mapped[str | None] = mapped_column(String(16))  # month|year|week|day
+    trial_days: Mapped[int | None] = mapped_column(Numeric(5, 0))
     active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
@@ -256,33 +221,21 @@ class PaySubscription(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
-    provider_customer_id: Mapped[str] = mapped_column(
-        String(128), index=True, nullable=False
-    )
+    provider_customer_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     provider_subscription_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
     )
-    provider_price_id: Mapped[str] = mapped_column(
-        String(128), index=True, nullable=False
-    )
+    provider_price_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     status: Mapped[str] = mapped_column(
         String(32), index=True, nullable=False
     )  # active|trialing|canceled|past_due|incomplete
     quantity: Mapped[int] = mapped_column(Numeric(10, 0), default=1, nullable=False)
-    cancel_at_period_end: Mapped[bool] = mapped_column(
-        Boolean, default=False, nullable=False
-    )
-    current_period_end: Mapped[Optional[datetime]] = mapped_column(
-        DateTime(timezone=True)
-    )
+    cancel_at_period_end: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
+    current_period_end: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),
@@ -305,27 +258,21 @@ class PayInvoice(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_invoice_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
     )
-    provider_customer_id: Mapped[str] = mapped_column(
-        String(128), index=True, nullable=False
-    )
+    provider_customer_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     status: Mapped[str] = mapped_column(
         String(24), index=True, nullable=False
     )  # draft|open|paid|void|uncollectible
     amount_due: Mapped[int] = mapped_column(Numeric(18, 0), nullable=False)
     currency: Mapped[str] = mapped_column(String(8), nullable=False)
-    hosted_invoice_url: Mapped[Optional[str]] = mapped_column(String(255))
-    pdf_url: Mapped[Optional[str]] = mapped_column(String(255))
+    hosted_invoice_url: Mapped[str | None] = mapped_column(String(255))
+    pdf_url: Mapped[str | None] = mapped_column(String(255))
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),
@@ -348,13 +295,9 @@ class PaySetupIntent(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
-    user_id: Mapped[Optional[str]] = mapped_column(
-        user_id_type(), index=True, nullable=True
-    )
+    user_id: Mapped[str | None] = mapped_column(user_id_type(), index=True, nullable=True)
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_setup_intent_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
@@ -362,7 +305,7 @@ class PaySetupIntent(ModelBase):
     status: Mapped[str] = mapped_column(
         String(32), index=True, nullable=False
     )  # requires_action|succeeded|canceled|processing
-    client_secret: Mapped[Optional[str]] = mapped_column(String(255))
+    client_secret: Mapped[str | None] = mapped_column(String(255))
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),
@@ -380,22 +323,20 @@ class PayDispute(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_dispute_id: Mapped[str] = mapped_column(
         String(128), unique=True, index=True, nullable=False
     )
-    provider_charge_id: Mapped[Optional[str]] = mapped_column(String(128), index=True)
+    provider_charge_id: Mapped[str | None] = mapped_column(String(128), index=True)
     amount: Mapped[int] = mapped_column(Numeric(18, 0), nullable=False)
     currency: Mapped[str] = mapped_column(String(8), nullable=False)
-    reason: Mapped[Optional[str]] = mapped_column(String(64))
+    reason: Mapped[str | None] = mapped_column(String(64))
     status: Mapped[str] = mapped_column(
         String(32), index=True, nullable=False
     )  # needs_response|under_review|won|lost|warning_closed
-    evidence_due_by: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    evidence_due_by: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),
@@ -408,9 +349,7 @@ class PayPayout(ModelBase):
 
     id: Mapped[str] = mapped_column(String(64), primary_key=True)
 
-    tenant_id: Mapped[str] = mapped_column(
-        String(TENANT_ID_LEN), index=True, nullable=False
-    )
+    tenant_id: Mapped[str] = mapped_column(String(TENANT_ID_LEN), index=True, nullable=False)
 
     provider: Mapped[str] = mapped_column(String(32), index=True, nullable=False)
     provider_payout_id: Mapped[str] = mapped_column(
@@ -421,8 +360,8 @@ class PayPayout(ModelBase):
     status: Mapped[str] = mapped_column(
         String(32), index=True, nullable=False
     )  # pending|in_transit|paid|canceled|failed
-    arrival_date: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    type: Mapped[Optional[str]] = mapped_column(String(32))  # bank_account|card|...
+    arrival_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
+    type: Mapped[str | None] = mapped_column(String(32))  # bank_account|card|...
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=text("CURRENT_TIMESTAMP"),

svc_infra-1.0.5/src/svc_infra/apf_payments/provider/__init__.py

@@ -0,0 +1,4 @@
+from .aiydan import AiydanAdapter
+from .stripe import StripeAdapter
+
+__all__ = ["AiydanAdapter", "StripeAdapter"]