svc-infra 0.1.180__py3-none-any.whl → 0.1.182__py3-none-any.whl

svc_infra/auth/user_default.py

@@ -1,21 +1,41 @@
 from typing import Any, Dict
+from fastapi import HTTPException
 from fastapi_users.password import PasswordHelper
+from sqlalchemy import func, and_, or_
 
 from svc_infra.api.fastapi.db.service_hooks import ServiceWithHooks
 from svc_infra.api.fastapi.db.repository import Repository
 
 _pwd = PasswordHelper()
 
-def _pre_create(data: Dict[str, Any]) -> Dict[str, Any]:
+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:   # pydantic alias -> model column "metadata" (extra)
+    if "metadata" in data:
         data["extra"] = data.pop("metadata")
-    data.setdefault("roles", [])
+
+    # 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 _pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
+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"))
@@ -24,4 +44,10 @@ def _pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
     return data
 
 def make_default_user_service(repo: Repository):
-    return ServiceWithHooks(repo, pre_create=_pre_create, pre_update=_pre_update)
+    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)
+    return _Svc(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)

svc_infra/db/templates/models_schemas/auth/models.py.tmpl

@@ -4,15 +4,16 @@ from typing import Optional
 import uuid
 
 from sqlalchemy import (
-    String, Boolean, DateTime, JSON, Text, func, UniqueConstraint, Index
+    String, Boolean, DateTime, JSON, Text, func, Index
 )
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.ext.mutable import MutableDict, MutableList  # <-- add
+from sqlalchemy.ext.mutable import MutableDict, MutableList
 
 from svc_infra.db.base import ModelBase
 from svc_infra.auth.user_default import _pwd
 
+
 class User(ModelBase):
     __tablename__ = "users"
 
@@ -24,10 +25,12 @@ class User(ModelBase):
     is_superuser: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
     is_verified: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
 
+    # auth state
     password_hash: Mapped[str] = mapped_column(String(512), nullable=False)
 
+    # Write-only facade over password
     @property
-    def password(self) -> str:  # never readable
+    def password(self) -> str:
         raise AttributeError("password is write-only")
 
     @password.setter
@@ -53,12 +56,27 @@ class User(ModelBase):
         DateTime(timezone=True), server_default=func.now(), onupdate=func.now(), nullable=False
     )
 
-    __table_args__ = (
-        UniqueConstraint("tenant_id", "email", name="uq_users_tenant_email"),
-    )
-
     def __repr__(self) -> str:
         return f"<User id={self.id} email={self.email!r}>"
 
-# define functional index *after* class definition
+
+# ---------- Uniqueness: case-insensitive email per-tenant ----------
+# Because tenant_id is Optional (nullable), use two partial unique indexes:
+# - When tenant_id IS NULL: email (lowercased) must be globally unique
+# - When tenant_id IS NOT NULL: (tenant_id, lower(email)) must be unique
+Index(
+    "uq_users_email_lower_global",
+    func.lower(User.email),
+    unique=True,
+    postgresql_where=User.tenant_id.is_(None),
+)
+Index(
+    "uq_users_email_lower_per_tenant",
+    func.lower(User.email),
+    User.tenant_id,
+    unique=True,
+    postgresql_where=User.tenant_id.isnot(None),
+)
+
+# Optional helper index for case-insensitive lookups (non-unique)
 Index("ix_users_email_lower", func.lower(User.email))

svc_infra/db/templates/models_schemas/auth/schemas.py.tmpl

@@ -1,4 +1,6 @@
 from __future__ import annotations
+
+from uuid import UUID
 from typing import Optional, Any, Dict, List
 from datetime import datetime
 from pydantic import BaseModel, EmailStr, Field, ConfigDict
@@ -21,7 +23,7 @@ class UserBase(BaseModel):
     metadata: Optional[Dict[str, Any]] = Field(default=None, alias="extra")  # <-- matches model.extra
 
 class UserRead(UserBase, Timestamped):
-    id: str
+    id: UUID
     last_login: Optional[datetime] = None
     disabled_reason: Optional[str] = None
 

{svc_infra-0.1.180.dist-info → svc_infra-0.1.182.dist-info}/METADATA

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

{svc_infra-0.1.180.dist-info → svc_infra-0.1.182.dist-info}/RECORD

@@ -31,7 +31,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=Jn2XeeW8QgijZfxXUsV4T4CvaewsWA6VsDVqotYIgxQ,968
+svc_infra/auth/user_default.py,sha256=PFQSRTWnVo17jK43muF0ZxwSCtKM9VjVP10D_fpv6FE,2092
 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
@@ -49,8 +49,8 @@ svc_infra/db/core.py,sha256=3Efm88fajfKJa8gDiiTVkhx2ci_UbrLiR4B8gMQYuwU,10745
 svc_infra/db/scaffold.py,sha256=NBz8BJR8MPvntCGv5HKoqNNR41SMnCkb-DlCCIsu0fo,9878
 svc_infra/db/templates/__init__.py,sha256=3PRa4v05RGyjX6LZXSOf-eMRir8vij7tET95limMips,45
 svc_infra/db/templates/models_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra/db/templates/models_schemas/auth/models.py.tmpl,sha256=oBr-xVlR5OgeMTztd1qPmPc4TLjdHLJyieATkheo710,2514
-svc_infra/db/templates/models_schemas/auth/schemas.py.tmpl,sha256=GjDDEHO-BNV-Xi5z2ZOygXovnECgSu8OkEg8Qx6vgIE,1693
+svc_infra/db/templates/models_schemas/auth/models.py.tmpl,sha256=fbsI1XNs840fashySKGSoGsojo0yOO8M4yZj7E9tUaE,3020
+svc_infra/db/templates/models_schemas/auth/schemas.py.tmpl,sha256=w79j8GeRPpywg9OVBmEuoksPVZLf9hUfEcRS4hBbiJQ,1717
 svc_infra/db/templates/models_schemas/entity/models.py.tmpl,sha256=dZk7a3WwpddSylPW81ARTyjbqJ-4rduX8-KAZ3Tlomo,1173
 svc_infra/db/templates/models_schemas/entity/schemas.py.tmpl,sha256=zBhid1jFPwVN86OvkiIJkTFphN7LDcs_Hs9kxxeoNjE,1009
 svc_infra/db/templates/setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +75,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.180.dist-info/METADATA,sha256=Rj1B2uB1LLf3S9r4197wPbb_zggNzL3vbI870OyLZ-A,4981
-svc_infra-0.1.180.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.180.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.180.dist-info/RECORD,,
+svc_infra-0.1.182.dist-info/METADATA,sha256=j7UJi0Sz4eQCAC7vrRGcyq4XA-nAi58n5_AN6qUNelY,4981
+svc_infra-0.1.182.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.182.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.182.dist-info/RECORD,,