svc-infra 0.1.186__py3-none-any.whl → 0.1.187__py3-none-any.whl

svc_infra/api/fastapi/db/add.py

@@ -4,7 +4,7 @@ from typing import Optional, Sequence
 from contextlib import asynccontextmanager
 from fastapi import FastAPI
 
-from svc_infra.auth.user_default import make_default_user_service
+from svc_infra.api.fastapi.db.user.user_default import make_default_user_service
 from .repository import Repository
 from .service import Service
 from .crud_router import make_crud_router_plus

svc_infra/api/fastapi/db/user/user_default.py

@@ -0,0 +1,45 @@
+from typing import Any, Dict
+from fastapi_users.password import PasswordHelper
+
+from svc_infra.api.fastapi.db.repository import Repository
+from svc_infra.db.uniq_hooks import dedupe_service
+
+_pwd = PasswordHelper()
+
+def make_default_user_service(repo: Repository):
+
+    def _user_pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
+        data = dict(data)
+        if "password" in data:
+            data["password_hash"] = _pwd.hash(data.pop("password"))
+        if "metadata" in data:
+            data["extra"] = data.pop("metadata")
+        data.setdefault("roles", [])
+        return data
+
+    def _user_pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
+        data = dict(data)
+        if "password" in data:
+            data["password_hash"] = _pwd.hash(data.pop("password"))
+        if "metadata" in data:
+            data["extra"] = data.pop("metadata")
+        return data
+
+    # First wrap with the general uniqueness service
+    SvcUniq = dedupe_service(
+        repo,
+        unique_ci=["email"],
+        tenant_field="tenant_id",
+        messages={("email",): "User with this email already exists."},
+    )
+
+    # Then inject your prehooks by subclassing once
+    class _Svc(SvcUniq.__class__):  # keep the uniqueness behavior
+        async def pre_create(self, data):  # type: ignore[override]
+            return _user_pre_create(data)
+
+        async def pre_update(self, data):  # type: ignore[override]
+            return _user_pre_update(data)
+
+    # Instantiate with the same repo
+    return _Svc(repo)

svc_infra/{auth → api/fastapi/db/user}/users.py

@@ -7,7 +7,7 @@ from fastapi_users import FastAPIUsers
 from fastapi_users.authentication import AuthenticationBackend, BearerTransport, JWTStrategy
 from fastapi_users.manager import BaseUserManager, UUIDIDMixin
 
-from .settings import get_auth_settings
+from svc_infra.auth.settings import get_auth_settings
 
 
 def get_fastapi_users(

svc_infra/auth/__init__.py

@@ -1,7 +1,5 @@
 from .integration import enable_auth
-from .user_default import make_default_user_service
 
 __all__ = [
     "enable_auth",
-    "make_default_user_service"
 ]

svc_infra/auth/integration.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
+
 from fastapi import FastAPI
+from pydantic import ValidationError
+
+from svc_infra.api.fastapi.db.user.users import get_fastapi_users
 
-from .users import get_fastapi_users
 from .oauth_router import oauth_router_with_backend
 from .providers import providers_from_settings
-
 from .settings import get_auth_settings
-from pydantic import ValidationError
-
 
 def enable_auth(
         app: FastAPI,

svc_infra/db/uniq_hooks.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union
+
+from fastapi import HTTPException
+from sqlalchemy import func
+from sqlalchemy.exc import IntegrityError
+
+from svc_infra.api.fastapi.db.repository import Repository
+from svc_infra.api.fastapi.db.service_hooks import ServiceWithHooks
+
+ColumnSpec = Union[str, Sequence[str]]  # "email" or ("first_name","last_name")
+
+def _as_tuple(spec: ColumnSpec) -> Tuple[str, ...]:
+    return (spec,) if isinstance(spec, str) else tuple(spec)
+
+def _all_present(data: Dict[str, Any], fields: Sequence[str]) -> bool:
+    return all(f in data for f in fields)
+
+def _nice_label(fields: Sequence[str], data: Dict[str, Any]) -> str:
+    # e.g. ("email",) -> email='a@b.com' ; ("first","last")-> (first='x', last='y')
+    if len(fields) == 1:
+        f = fields[0]
+        return f"{f}={data.get(f)!r}"
+    parts = [f"{f}={data.get(f)!r}" for f in fields]
+    return "(" + ", ".join(parts) + ")"
+
+def dedupe_service(
+        repo: Repository,
+        *,
+        unique_cs: Iterable[ColumnSpec] = (),
+        unique_ci: Iterable[ColumnSpec] = (),
+        tenant_field: Optional[str] = None,
+        # Optional: customize the error message per spec. Keys are tuples of column names.
+        messages: Optional[dict[Tuple[str, ...], str]] = None,
+):
+    """
+    Create a Service instance that:
+      - Pre-checks duplicates for the provided uniqueness specs (case sensitive & insensitive)
+      - Returns HTTP 409 with a friendly message
+      - Still catches IntegrityError to 409 for race-safety
+    The arguments mirror `make_unique_indexes(...)`.
+    """
+    Model = repo.model
+    messages = messages or {}
+
+    # Build a helper that turns a spec into a WHERE clause based on provided data
+    def _build_where_from_spec(data: Dict[str, Any], spec: Tuple[str, ...], *, ci: bool, exclude_id: Any | None):
+        clauses: List[Any] = []
+
+        # spec columns
+        for col_name in spec:
+            col = getattr(Model, col_name)
+            val = data.get(col_name)
+            if ci:
+                clauses.append(func.lower(col) == func.lower(val))
+            else:
+                clauses.append(col == val)
+
+        # tenant scope (match your index semantics)
+        if tenant_field and hasattr(Model, tenant_field):
+            tcol = getattr(Model, tenant_field)
+            tval = data.get(tenant_field)
+            if tval is None:
+                clauses.append(tcol.is_(None))
+            else:
+                clauses.append(tcol == tval)
+
+        # exclude the current row on update
+        if exclude_id is not None and hasattr(Model, "id"):
+            clauses.append(getattr(Model, "id") != exclude_id)
+
+        return clauses
+
+    async def _precheck(session, data: Dict[str, Any], *, exclude_id: Any | None) -> None:
+        # Check in deterministic order: CI specs, then CS specs
+        for ci, spec_list in ((True, unique_ci), (False, unique_cs)):
+            for spec in spec_list:
+                fields = _as_tuple(spec)
+                # only run if ALL fields (and tenant if used) are present in payload
+                needed = list(fields) + ([tenant_field] if tenant_field else [])
+                if not _all_present(data, needed):
+                    continue
+                where = _build_where_from_spec(data, fields, ci=ci, exclude_id=exclude_id)
+                if await repo.exists(session, where=where):
+                    msg = messages.get(fields) or f"Resource with {_nice_label(fields, data)} already exists."
+                    raise HTTPException(status_code=409, detail=msg)
+
+    class _Svc(ServiceWithHooks):
+        async def create(self, session, data):
+            data = await self.pre_create(data)
+            # Run prechecks — exclude_id=None on create
+            await _precheck(session, data, exclude_id=None)
+            try:
+                return await self.repo.create(session, data)
+            except IntegrityError as e:
+                # fall back to 409 for any of these uniqueness violations
+                raise HTTPException(status_code=409, detail="Resource already exists.") from e
+
+        async def update(self, session, id_value, data):
+            data = await self.pre_update(data)
+            # only run if payload contains some unique-relevant fields
+            await _precheck(session, data, exclude_id=id_value)
+            try:
+                return await self.repo.update(session, id_value, data)
+            except IntegrityError as e:
+                raise HTTPException(status_code=409, detail="Resource already exists.") from e
+
+    return _Svc(repo)

{svc_infra-0.1.186.dist-info → svc_infra-0.1.187.dist-info}/METADATA

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

{svc_infra-0.1.186.dist-info → svc_infra-0.1.187.dist-info}/RECORD

@@ -3,7 +3,7 @@ svc_infra/api/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 svc_infra/api/fastapi/__init__.py,sha256=-clEe_YA8P_VekTIrFN3RD4suas0CUpvvMnxwpfr4v0,5573
 svc_infra/api/fastapi/db/README.md,sha256=NVD6r-3ArHNaYuo-rks3YbmIQP_hLqg5tBAbvDbdMJ8,3055
 svc_infra/api/fastapi/db/__init__.py,sha256=Xsu7IpWtFsaUSkKq7yhETfkstG1KEd3XQ1Rh6kNPWf8,210
-svc_infra/api/fastapi/db/add.py,sha256=QXdyZAmuYSzCQHDuT9KtFtDJBQ9rdz-b3dvWPEtNpas,3315
+svc_infra/api/fastapi/db/add.py,sha256=L_Gs0kFjx6E0m3_x3H-UfcqoNxB6XuIQH83Hn2fv7GY,3330
 svc_infra/api/fastapi/db/crud_router.py,sha256=e55Y_XHQnW5n_FoxIPcfaXPV3YhSr-QXWetbYrNirzM,4708
 svc_infra/api/fastapi/db/health.py,sha256=rWSsQFlvut8oPheqM8SH4fo32z6rz5a2gN_M0CgONE0,715
 svc_infra/api/fastapi/db/http.py,sha256=41iDMq_3Ws1fdXpfaftJii92mJO4ZGNx8ZteDtRTz8I,2276
@@ -13,7 +13,9 @@ svc_infra/api/fastapi/db/resource.py,sha256=h-kCjp0_Sw_lGthizkEaneKyIZZXX3SCs6LF
 svc_infra/api/fastapi/db/service.py,sha256=w7WFzETndKuk-2wkOdjmGbznY8lJTzUP3781Dg42alE,2033
 svc_infra/api/fastapi/db/service_hooks.py,sha256=KZzkKL-2y7hrPx4bfcDdwItAqPBksyVFUjnx1hGJwxw,655
 svc_infra/api/fastapi/db/session.py,sha256=1ixBxRZLbdE8LXLP6R87u7pDzITZkZRYZ3Un8ugvJNY,1775
-svc_infra/api/fastapi/db/uniq.py,sha256=f96o8-Sz1nZIPa9lKX5bniot8Kv0xP1_zRns8R3p2KY,3132
+svc_infra/api/fastapi/db/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+svc_infra/api/fastapi/db/user/user_default.py,sha256=saoUkNq7_56pVKgew5N0c-VS2cP1Po_jorNLWM5_3_U,1524
+svc_infra/api/fastapi/db/user/users.py,sha256=gm_ioiN_DQFLzMeFS7TN_LNs0I4oQbEVHz8djCAotz8,2112
 svc_infra/api/fastapi/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svc_infra/api/fastapi/middleware/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svc_infra/api/fastapi/middleware/errors/catchall.py,sha256=Kvu7yrHu6r8wlyEblB8sH4Mh-l8FYPmwAGJeSXugYOM,1713
@@ -27,13 +29,11 @@ svc_infra/app/env.py,sha256=7MCEGuKqYeFT-aq7hiOn0hXJlCIy9VRXAsNHqDMHzPo,4430
 svc_infra/app/logging.py,sha256=xxRKbyYYrxkbjyZ9LKisad6IuBhiP5jyi6BUjkD4JRY,5863
 svc_infra/app/root.py,sha256=i6Rw1tchhKDlUbZgXwN5ec6KNMflqVry_y_GFB3Oioo,1576
 svc_infra/app/settings.py,sha256=6zmRRZxGvHxTNPaLiRdiWaq_YjleFNedbeIG81j7uOE,621
-svc_infra/auth/__init__.py,sha256=N4aPMJ_ESe4QCpPOkGPHqAchj-9VAlkjuCeYPSrtxRg,154
-svc_infra/auth/integration.py,sha256=L230xUw7vRM0AJIZwNzufRQrfNTPRdczp4BPd_NILeo,1606
+svc_infra/auth/__init__.py,sha256=7_FrdHQoHjowh0tFu-kPIkZV49SRPpM0d8vNsQEKcGk,70
+svc_infra/auth/integration.py,sha256=O1WcaLv-gk4UZzqLkinXEOMqrxVOi5LqwaRFz5Y-IQ8,1635
 svc_infra/auth/oauth_router.py,sha256=JY3VQ9_0oS_a2gGg418IDG2TbK79sQWcpA9KPiOAfjY,4918
 svc_infra/auth/providers.py,sha256=fiw0ouuGKtwcwMY0Zw7cEv-CXNaUYDnqo_NmiWiB8Lc,3185
 svc_infra/auth/settings.py,sha256=wVCLQnpA9M6zfiWyUpSdn9fo4q-Z4WpVyC3KvkG3HYg,1742
-svc_infra/auth/user_default.py,sha256=VXSpYGxABvHHYGvd7eXU7OPinhwQFr-oS-qeYIufYro,3856
-svc_infra/auth/users.py,sha256=4rlTCELU-po7bF7u6z02Bd8pXLGcLI2Adj0VjA-gg5E,2098
 svc_infra/cli/__init__.py,sha256=g47RSROuFW8LSsB6WFNSus5BnUl9z_DrPK9idYo3O6M,401
 svc_infra/cli/cmds/__init__.py,sha256=263YKSg73Ik-SQeilyGePdc663BYi4RfBrc0wMFxeoU,212
 svc_infra/cli/cmds/alembic_cmds.py,sha256=VziFYPvsKqyonrZ1aDvyox1uq6Mfjrzl7Ei5TmCFK1Y,6163
@@ -60,6 +60,7 @@ svc_infra/db/templates/setup/env_async.py.tmpl,sha256=05uDe_jiEkJOdXcSIgJovN3TxP
 svc_infra/db/templates/setup/env_sync.py.tmpl,sha256=vlUKrhnQiBqAGDfbtx0D_CahF1Hjj8uTIQ5lNnx_l0Q,6273
 svc_infra/db/templates/setup/script.py.mako.tmpl,sha256=EgltN1ghYU7rH1zAujsLWLe1NThI-41x9fabByne5II,509
 svc_infra/db/uniq.py,sha256=Pre3tdgXHw6I7HU13xlJPcCe8ymSs8kAdEyAYRfvsto,2614
+svc_infra/db/uniq_hooks.py,sha256=mGM21qXa1roeibJ8fVF_JvI6TBcflCJAPZJOmTncFjk,4641
 svc_infra/db/utils.py,sha256=PxaZ6AesRlDyQk7tOzi9YaeF7Ge4zsZP83wqkKHu5-E,30838
 svc_infra/mcp/__init__.py,sha256=SiJ50LO7J6AneYswZe1kUX3dKXiECPpsjGPjT0SGtuc,1272
 svc_infra/mcp/svc_infra_mcp.py,sha256=VTU8esJ4FH9WNgxplufUWCVqGkxwscaLnBBtj-B5iCQ,1343
@@ -77,7 +78,7 @@ svc_infra/observability/templates/prometheus_rules.yml,sha256=sbVLm1h40FMkGSeWO4
 svc_infra/observability/tracing/__init__.py,sha256=TOs2yCicqBdo4OfOHTMmqeHsn7DBRu5EdvF2L5f31Y0,237
 svc_infra/observability/tracing/setup.py,sha256=21Ob276U4KZOs6M2o1O79wQXFHV0gY6YdMyjeqMrzMU,5042
 svc_infra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra-0.1.186.dist-info/METADATA,sha256=HYc2VSpY0TqlTJxBLTfeqmallrOGoAqJvkUOF4cUjHM,4981
-svc_infra-0.1.186.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.186.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.186.dist-info/RECORD,,
+svc_infra-0.1.187.dist-info/METADATA,sha256=E0qwjWlJXV2nsMES4BMhZ0aO4EiO9MxyFSWB2F_dCNs,4981
+svc_infra-0.1.187.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.187.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.187.dist-info/RECORD,,

svc_infra/api/fastapi/db/uniq.py

@@ -1,82 +0,0 @@
-from __future__ import annotations
-
-from typing import Iterable, Optional, Dict, Any, Callable
-from sqlalchemy import func, and_
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from .repository import Repository
-from svc_infra.db.uniq import ColumnSpec, _as_tuple
-
-def make_uniqueness_hooks(
-        *,
-        model: type,
-        repo: Repository,
-        unique_cs: Iterable[ColumnSpec] = (),
-        unique_ci: Iterable[ColumnSpec] = (),
-        tenant_field: Optional[str] = None,
-        duplicate_message: str = "Duplicate resource violates uniqueness policy.",
-) -> tuple[
-    Callable[[Dict[str, Any]], Any],  # async pre_create(data) -> data
-    Callable[[Dict[str, Any]], Any],  # async pre_update(data) -> data
-]:
-    """Return (pre_create, pre_update) hooks that check duplicates *before* insert/update.
-
-    Usage with ServiceWithHooks:
-        pre_c, pre_u = make_uniqueness_hooks(model=User, repo=repo, unique_ci=["email"], tenant_field="tenant_id")
-        svc = ServiceWithHooks(repo, pre_create=pre_c, pre_update=pre_u)
-    """
-    cs_specs = [_as_tuple(s) for s in unique_cs]
-    ci_specs = [_as_tuple(s) for s in unique_ci]
-
-    def _build_wheres(data: Dict[str, Any]):
-        wheres = []
-
-        def col(name: str):
-            return getattr(model, name)
-
-        tenant_val = data.get(tenant_field) if tenant_field else None
-
-        # case-sensitive groups
-        for spec in cs_specs:
-            if not all(k in data for k in spec):
-                continue
-            parts = []
-            if tenant_field:
-                parts.append(col(tenant_field).is_(None) if tenant_val is None else col(tenant_field) == tenant_val)
-            for k in spec:
-                parts.append(col(k) == data[k])
-            wheres.append(and_(*parts))
-
-        # case-insensitive groups
-        for spec in ci_specs:
-            if not all(k in data for k in spec):
-                continue
-            parts = []
-            if tenant_field:
-                parts.append(col(tenant_field).is_(None) if tenant_val is None else col(tenant_field) == tenant_val)
-            for k in spec:
-                # compare lower(db_col) == lower(<value>) safely
-                parts.append(func.lower(col(k)) == func.lower(func.cast(data[k], col(k).type)))
-            wheres.append(and_(*parts))
-
-        return wheres
-
-    async def _deferred_check(session: AsyncSession, data: Dict[str, Any]):
-        wheres = _build_wheres(data)
-        for where in wheres:
-            if await repo.exists(session, where=[where]):
-                from fastapi import HTTPException
-                raise HTTPException(status_code=409, detail=duplicate_message)
-
-    async def _pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
-        # store a coroutine to be awaited when a session is available in Service.create
-        data = dict(data)
-        data.setdefault("__uniq_check__", _deferred_check)
-        return data
-
-    async def _pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
-        data = dict(data)
-        data.setdefault("__uniq_check__", _deferred_check)
-        return data
-
-    return _pre_create, _pre_update

svc_infra/auth/user_default.py

@@ -1,92 +0,0 @@
-from typing import Any, Dict
-from fastapi import HTTPException
-from fastapi_users.password import PasswordHelper
-from sqlalchemy import func
-from sqlalchemy.exc import IntegrityError
-
-from svc_infra.api.fastapi.db.service_hooks import ServiceWithHooks
-from svc_infra.api.fastapi.db.repository import Repository
-
-_pwd = PasswordHelper()
-
-def make_default_user_service(repo: Repository):
-    Model = repo.model  # capture the mapped class
-
-    def _user_pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
-        data = dict(data)
-        # normalize + map fields
-        if "password" in data:
-            data["password_hash"] = _pwd.hash(data.pop("password"))
-        if "metadata" in data:
-            data["extra"] = data.pop("metadata")
-        data.setdefault("roles", [])
-
-        # attach existence checker (case-insensitive email, tenant scoped)
-        email = data.get("email")
-        tenant_id = data.get("tenant_id")
-        if email is not None:
-            where = [func.lower(Model.email) == func.lower(email)]
-            if hasattr(Model, "tenant_id"):
-                if tenant_id is None:
-                    where.append(Model.tenant_id.is_(None))
-                else:
-                    where.append(Model.tenant_id == tenant_id)
-
-            async def _exists(session):
-                return await repo.exists(session, where=where)
-
-            data["_precreate_exists_check"] = _exists
-        return data
-
-    def _user_pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
-        data = dict(data)
-        if "password" in data:
-            data["password_hash"] = _pwd.hash(data.pop("password"))
-        if "metadata" in data:
-            data["extra"] = data.pop("metadata")
-
-        # optional: protect email change too
-        email = data.get("email")
-        tenant_id = data.get("tenant_id")
-        if email is not None:
-            where = [func.lower(Model.email) == func.lower(email)]
-            if hasattr(Model, "tenant_id"):
-                if tenant_id is None:
-                    where.append(Model.tenant_id.is_(None))
-                else:
-                    where.append(Model.tenant_id == tenant_id)
-
-            async def _exists(session):
-                return await repo.exists(session, where=where)
-
-            data["_preupdate_exists_check"] = _exists
-        return data
-
-    class _Svc(ServiceWithHooks):
-        async def create(self, session, data):
-            # IMPORTANT: run pre_create first
-            data = await self.pre_create(data)
-            exists_cb = data.pop("_precreate_exists_check", None)
-            if exists_cb and await exists_cb(session):
-                raise HTTPException(status_code=409, detail="User with this email already exists.")
-            try:
-                return await self.repo.create(session, data)
-            except IntegrityError as e:
-                # race-safety / fallback
-                if "uq_users_tenant_id" in str(e.orig) or "ci_email" in str(e.orig):
-                    raise HTTPException(status_code=409, detail="User with this email already exists.") from e
-                raise
-
-        async def update(self, session, id_value, data):
-            data = await self.pre_update(data)
-            exists_cb = data.pop("_preupdate_exists_check", None)
-            if exists_cb and await exists_cb(session):
-                raise HTTPException(status_code=409, detail="User with this email already exists.")
-            try:
-                return await self.repo.update(session, id_value, data)
-            except IntegrityError as e:
-                if "uq_users_tenant_id" in str(e.orig) or "ci_email" in str(e.orig):
-                    raise HTTPException(status_code=409, detail="User with this email already exists.") from e
-                raise
-
-    return _Svc(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)