svc-infra 0.1.176__tar.gz → 0.1.177__tar.gz

{svc_infra-0.1.176 → svc_infra-0.1.177}/PKG-INFO

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

{svc_infra-0.1.176 → svc_infra-0.1.177}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.176"
+version = "0.1.177"
 description = "Infrastructure for building and deploying prod-ready services"
 authors = ["Ali Khatami <aliikhatami94@gmail.com>"]
 license = "MIT"

{svc_infra-0.1.176 → svc_infra-0.1.177}/src/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-0.1.176 → svc_infra-0.1.177}/src/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-0.1.176 → svc_infra-0.1.177}/src/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-0.1.176/src/svc_infra/auth/user_service.py → svc_infra-0.1.177/src/svc_infra/auth/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-0.1.176 → svc_infra-0.1.177}/src/svc_infra/db/templates/models_schemas/auth/models.py.tmpl

@@ -23,8 +23,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:
+        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-0.1.176 → svc_infra-0.1.177}/src/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