svc-infra 0.1.183__py3-none-any.whl → 0.1.185__py3-none-any.whl

svc_infra/api/fastapi/db/uniq.py

@@ -0,0 +1,82 @@
+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

@@ -8,46 +8,74 @@ from svc_infra.api.fastapi.db.repository import Repository
 
 _pwd = PasswordHelper()
 
-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")
-
-    # BEFORE insert: application-level guard (nice error)
-    # case-insensitive email; handle tenant/null logic the same way as your unique index
-    email = data.get("email")
-    tenant_id = data.get("tenant_id")
-    if email:
-        where = [func.lower(Repository.model.email) == func.lower(email)]
-        if tenant_id is None:
-            where.append(Repository.model.tenant_id.is_(None))
-        else:
-            where.append(Repository.model.tenant_id == tenant_id)
-
-        # use a small “exists” helper on the repo if you have it
-        async def _exists(session):
-            return await Repository.exists(session, where=where)
-
-        data["_precreate_exists_check"] = _exists  # stash callable for service.create to run
-
-    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
-
 def make_default_user_service(repo: Repository):
+    Model = repo.model  # <-- capture the actual mapped model from the repo
+
+    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", [])
+
+        # BEFORE insert: app-level guard (nice 409) aligned with DB uniqueness
+        email = data.get("email")
+        tenant_id = data.get("tenant_id")
+        if email is not None:
+            # case-insensitive email; scope by tenant (NULL => global)
+            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)
+
+            # stash the callback so Service.create can await it (has session)
+            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: also protect email change from creating dupes
+        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  # reuse same key
+
+        return data
+
     class _Svc(ServiceWithHooks):
         async def create(self, session, 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.")
             return await super().create(session, data)
+
+        async def update(self, session, id_value, 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.")
+            return await super().update(session, id_value, data)
+
     return _Svc(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)

svc_infra/db/uniq.py

@@ -2,42 +2,28 @@ from __future__ import annotations
 from typing import Iterable, Sequence, Tuple, Union, List, Optional
 from sqlalchemy import Index, func
 
-
-ColumnSpec = Union[str, Sequence[str]]  # "email" or ("first_name","last_name")
-
+ColumnSpec = Union[str, Sequence[str]]
 
 def _as_tuple(spec: ColumnSpec) -> Tuple[str, ...]:
     return (spec,) if isinstance(spec, str) else tuple(spec)
 
-
 def make_unique_indexes(
         model: type,
         *,
-        # Case-sensitive uniqueness specs (exact match)
         unique_cs: Iterable[ColumnSpec] = (),
-        # Case-insensitive uniqueness specs: lower() applied to string columns
         unique_ci: Iterable[ColumnSpec] = (),
-        # Optional tenant scoping (e.g. "tenant_id"). If provided:
-        #   - when tenant is NULL -> global uniqueness
-        #   - when tenant is NOT NULL -> uniqueness within tenant
         tenant_field: Optional[str] = None,
-        # Prefix for index names
         name_prefix: str = "uq",
 ) -> List[Index]:
-    """
-    Returns a list of SQLAlchemy Index objects enforcing uniqueness.
+    """Return SQLAlchemy Index objects that enforce uniqueness.
+
+    - unique_cs: case-sensitive unique specs
+    - unique_ci: case-insensitive unique specs (lower(column))
+    - tenant_field: if provided, create two partial unique indexes:
+        * tenant IS NULL (global bucket)
+        * tenant IS NOT NULL (scoped per-tenant)
 
-    Notes:
-    - For case-insensitive specs, we use functional unique indexes with lower(col).
-    - If tenant_field is given and the tenant column is nullable, we generate two partial
-      unique indexes: one for tenant IS NULL (global), one for tenant IS NOT NULL (scoped).
-    - Attach these indexes after your model class definition, before migrations/DDL run:
-        Indexes = make_unique_indexes(User, unique_ci=["email"], tenant_field="tenant_id")
-        for ix in Indexes:
-            ix.create(model.metadata.bind)  # OR just rely on Alembic autogenerate / metadata.create_all
-      Most apps just *define* them at module import time:
-        for ix in Indexes:  # they auto-register with the Table; no manual create() needed
-            pass
+    Declare right after your model class; Alembic or metadata.create_all will pick them up.
     """
     idxs: List[Index] = []
 
@@ -53,7 +39,6 @@ def make_unique_indexes(
 
     tenant_col = _col(tenant_field) if tenant_field else None
 
-    # Helper: name like uq_<table>_<tenant?>_<ci/cs>_<joined-columns>
     def _name(ci: bool, spec: Tuple[str, ...], null_bucket: Optional[str] = None):
         parts = [name_prefix, model.__tablename__]
         if tenant_field:
@@ -64,18 +49,14 @@ def make_unique_indexes(
         parts.extend(spec)
         return "_".join(parts)
 
-    # Build indexes for both CS and CI specs
     for ci, spec_list in ((False, unique_cs), (True, unique_ci)):
         for spec in spec_list:
             spec_t = _as_tuple(spec)
             cols = _to_sa_cols(spec_t, ci=ci)
 
             if tenant_col is None:
-                # simple global unique (with or without lower())
                 idxs.append(Index(_name(ci, spec_t), *cols, unique=True))
             else:
-                # two partial unique indexes to treat NULL tenant as its own bucket
-                # 1) global bucket (tenant IS NULL)
                 idxs.append(
                     Index(
                         _name(ci, spec_t, "null"),
@@ -84,7 +65,6 @@ def make_unique_indexes(
                         postgresql_where=tenant_col.is_(None),
                     )
                 )
-                # 2) per-tenant bucket (tenant IS NOT NULL)
                 idxs.append(
                     Index(
                         _name(ci, spec_t, "notnull"),
@@ -94,5 +74,4 @@ def make_unique_indexes(
                         postgresql_where=tenant_col.isnot(None),
                     )
                 )
-
     return idxs

{svc_infra-0.1.183.dist-info → svc_infra-0.1.185.dist-info}/METADATA

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

{svc_infra-0.1.183.dist-info → svc_infra-0.1.185.dist-info}/RECORD

@@ -13,6 +13,7 @@ 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/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
@@ -31,7 +32,7 @@ svc_infra/auth/integration.py,sha256=L230xUw7vRM0AJIZwNzufRQrfNTPRdczp4BPd_NILeo
 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=1GKxiJNUFKKghtGiIQKdC_rD1cs4vVye0zUTSPMrrDg,2081
+svc_infra/auth/user_default.py,sha256=D6oMni4YyFeb1muws0CokC20t-R0FwMH28HMmSEJnMw,3290
 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
@@ -58,7 +59,7 @@ svc_infra/db/templates/setup/alembic.ini.tmpl,sha256=QAQ_3-p8GnrpLoX2g-Fpi6aMfrS
 svc_infra/db/templates/setup/env_async.py.tmpl,sha256=05uDe_jiEkJOdXcSIgJovN3TxPG8wm8BjUoSdktsH_0,6224
 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=9YCqTPp-Aexk7XJB-df_avs2-UvFUKa8YfQ94nQJKC0,3800
+svc_infra/db/uniq.py,sha256=Pre3tdgXHw6I7HU13xlJPcCe8ymSs8kAdEyAYRfvsto,2614
 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
@@ -76,7 +77,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.183.dist-info/METADATA,sha256=DYUWWxezbPlw5QrZXXjPNjS_fjWD0zTBW9hxcv86bSw,4981
-svc_infra-0.1.183.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.183.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.183.dist-info/RECORD,,
+svc_infra-0.1.185.dist-info/METADATA,sha256=PubOT8LUdQnRSSJXHLtHa4V1EgFEGLyDSIyAFVwe_pw,4981
+svc_infra-0.1.185.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.185.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.185.dist-info/RECORD,,