svc-infra 0.1.176__py3-none-any.whl → 0.1.178__py3-none-any.whl

svc_infra/api/fastapi/db/add.py

@@ -4,6 +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 .repository import Repository
 from .service import Service
 from .crud_router import make_crud_router_plus
@@ -12,10 +13,25 @@ from .resource import Resource
 from .session import initialize_session, dispose_session
 from .health import _make_db_health_router
 
+def _looks_like_user_model(model: type) -> bool:
+    # minimal/robust: users have email + password_hash.
+    # (You can tighten this with hasattr(model, "extra") / "roles" if you want.)
+    return hasattr(model, "email") and hasattr(model, "password_hash")
+
 def add_resources(app: FastAPI, resources: Sequence[Resource]) -> None:
     for r in resources:
         repo = Repository(model=r.model, id_attr=r.id_attr, soft_delete=r.soft_delete)
-        svc = r.service_factory(repo) if r.service_factory else Service(repo)
+
+        # 1) explicit app-provided factory wins
+        if r.service_factory:
+            svc = r.service_factory(repo)
+        # 2) otherwise, auto-apply our default user service if model looks like a user
+        elif _looks_like_user_model(r.model):
+            svc = make_default_user_service(repo)
+        # 3) else, generic service
+        else:
+            svc = Service(repo)
+
         if r.read_schema and r.create_schema and r.update_schema:
             Read, Create, Update = r.read_schema, r.create_schema, r.update_schema
         else:
@@ -26,6 +42,7 @@ def add_resources(app: FastAPI, resources: Sequence[Resource]) -> None:
                 create_name=r.create_name,
                 update_name=r.update_name,
             )
+
         router = make_crud_router_plus(
             model=r.model,
             service=svc,

svc_infra/api/fastapi/db/resource.py

@@ -26,5 +26,5 @@ class Resource:
 
     create_exclude: tuple[str, ...] = ("id",)
 
-    # NEW: let callers provide a custom service constructor
+    # NEW – optional hook to build a custom Service
     service_factory: Optional[Callable[[Repository], Service]] = None

svc_infra/auth/__init__.py

@@ -1,5 +1,5 @@
 from .integration import enable_auth
-from .user_service import make_user_service
+from .user_default import make_user_service
 
 __all__ = [
     "enable_auth",

svc_infra/auth/{user_service.py → user_default.py}

@@ -6,26 +6,22 @@ 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)  # don’t mutate caller’s dict
-    # map payload fields -> model columns
+def _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:          # pydantic uses alias "metadata" for model column "extra"
+    if "metadata" in data:   # pydantic alias -> model column "metadata" (extra)
         data["extra"] = data.pop("metadata")
-    # roles default if missing
     data.setdefault("roles", [])
-    # booleans default come from model; fine to ignore if absent
     return data
 
-def _user_pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
+def _pre_update(data: Dict[str, Any]) -> Dict[str, Any]:
     data = dict(data)
-    # allow password change via generic update too (optional)
     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_user_service(repo: Repository):
-    return ServiceWithHooks(repo, pre_create=_user_pre_create, pre_update=_user_pre_update)
+def make_default_user_service(repo: Repository):
+    return ServiceWithHooks(repo, pre_create=_pre_create, pre_update=_pre_update)

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

@@ -3,6 +3,8 @@ from datetime import datetime
 from typing import Optional
 import uuid
 
+from svc_infra.auth.user_default import _pwd
+
 from sqlalchemy import (
     String, Boolean, DateTime, JSON, Text, func, UniqueConstraint, Index
 )
@@ -23,8 +25,16 @@ 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)
+
+    @property
+    def password(self) -> str:  # never readable
+        raise AttributeError("password is write-only")
+
+    @password.setter
+    def password(self, raw: str) -> None:
+        self.password_hash = _pwd.hash(raw)
+
     last_login: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
     disabled_reason: Mapped[Optional[str]] = mapped_column(Text)
 

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

@@ -35,6 +35,7 @@ class UserCreate(BaseModel):
 class UserUpdate(BaseModel):
     email: Optional[EmailStr] = None
     full_name: Optional[str] = None
+    password: Optional[str] = None
     is_active: Optional[bool] = None
     is_superuser: Optional[bool] = None
     is_verified: Optional[bool] = None

{svc_infra-0.1.176.dist-info → svc_infra-0.1.178.dist-info}/METADATA

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

{svc_infra-0.1.176.dist-info → svc_infra-0.1.178.dist-info}/RECORD

@@ -3,13 +3,13 @@ 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=GlHXGU9wd3IHrYb-8_QmSiV0WDjnkDKqxUUkVEOXiKY,2682
+svc_infra/api/fastapi/db/add.py,sha256=QXdyZAmuYSzCQHDuT9KtFtDJBQ9rdz-b3dvWPEtNpas,3315
 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
 svc_infra/api/fastapi/db/management.py,sha256=A5NOeTT9lW6DAJ58Qd1-oe8oQYM1mi0vTmJpz2njvPU,4186
 svc_infra/api/fastapi/db/repository.py,sha256=Pd1zCAdTdxl1tB_1a8W1rl9XGmLBbxfK04qc21kZTfY,5844
-svc_infra/api/fastapi/db/resource.py,sha256=wN4AnJUW138iR58RVCu2IvXUCtATBkebOpaYiUNEDMM,877
+svc_infra/api/fastapi/db/resource.py,sha256=h-kCjp0_Sw_lGthizkEaneKyIZZXX3SCs6LFrxDvHR4,871
 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
@@ -26,12 +26,12 @@ 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=954N2yfG0m7rSWWJFjRxJU32lc55uGBCwjfnEPrsGx0,138
+svc_infra/auth/__init__.py,sha256=cOFiGShQF5z2pQnFCzEaRHOHWRN_XneJO1qdXXatL6M,138
 svc_infra/auth/integration.py,sha256=L230xUw7vRM0AJIZwNzufRQrfNTPRdczp4BPd_NILeo,1606
 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_service.py,sha256=UbG5xKr25m4LfVCdmk99IxHNMzzELEtIUBVQn8--nG4,1227
+svc_infra/auth/user_default.py,sha256=Jn2XeeW8QgijZfxXUsV4T4CvaewsWA6VsDVqotYIgxQ,968
 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=tlqqw_D7Oyzt1qm-UQnAKkzwHpmTTNmcNgInauzgoQ8,9896
 svc_infra/db/templates/__init__.py,sha256=HDUUOs-5eR9yuEs8JakwWewPw6swvRvmorWagSoSMVg,51
 svc_infra/db/templates/models_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra/db/templates/models_schemas/auth/models.py.tmpl,sha256=t38JDK6StZbGCVuZ1KNV_MWXuGulwP8vKTLxuknoxIw,2258
-svc_infra/db/templates/models_schemas/auth/schemas.py.tmpl,sha256=wzg2EdjLiGRId12tdHFK-gNXydhyyc00hx0mjlvuMXs,1658
+svc_infra/db/templates/models_schemas/auth/models.py.tmpl,sha256=5H0I301gR9m2_zrxvay29TF0wV0yUjIlgR46oJkFT5s,2515
+svc_infra/db/templates/models_schemas/auth/schemas.py.tmpl,sha256=GjDDEHO-BNV-Xi5z2ZOygXovnECgSu8OkEg8Qx6vgIE,1693
 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.176.dist-info/METADATA,sha256=DHjyLhKfoWhRd803g23DbC2DbTBb-2E_Kpq4QSa7bdw,4987
-svc_infra-0.1.176.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.176.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.176.dist-info/RECORD,,
+svc_infra-0.1.178.dist-info/METADATA,sha256=KJUDnzRLLHDuSm8sYtPM2vf5u85sKOUB2STDYJg2_vg,4987
+svc_infra-0.1.178.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.178.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.178.dist-info/RECORD,,