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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.175
+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.175 → svc_infra-0.1.177}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.175"
+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.175 → 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 = 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.175 → svc_infra-0.1.177}/src/svc_infra/api/fastapi/db/repository.py

@@ -5,7 +5,7 @@ from typing import Any, Optional, Sequence, Iterable, Set
 from sqlalchemy import Select, and_, func, select, or_, String
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import InstrumentedAttribute
-
+from sqlalchemy.orm import class_mapper
 
 class Repository:
     """
@@ -29,6 +29,9 @@ class Repository:
         self.soft_delete_flag_field = soft_delete_flag_field
         self.immutable_fields: Set[str] = set(immutable_fields or {"id", "created_at", "updated_at"})
 
+    def _model_columns(self) -> set[str]:
+        return {c.key for c in class_mapper(self.model).columns}
+
     def _id_column(self) -> InstrumentedAttribute:
         return getattr(self.model, self.id_attr)
 
@@ -61,7 +64,9 @@ class Repository:
         return (await session.execute(stmt)).scalars().first()
 
     async def create(self, session: AsyncSession, data: dict[str, Any]) -> Any:
-        obj = self.model(**data)
+        valid = self._model_columns()
+        filtered = {k: v for k, v in data.items() if k in valid}
+        obj = self.model(**filtered)
         session.add(obj)
         await session.flush()
         return obj
@@ -70,8 +75,9 @@ class Repository:
         obj = await self.get(session, id_value)
         if not obj:
             return None
+        valid = self._model_columns()
         for k, v in data.items():
-            if k not in self.immutable_fields:
+            if k in valid and k not in self.immutable_fields:
                 setattr(obj, k, v)
         await session.flush()
         return obj

svc_infra-0.1.177/src/svc_infra/api/fastapi/db/resource.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+from typing import Any, Optional, Type, Callable
+
+from .service import Service
+from .repository import Repository
+
+@dataclass
+class Resource:
+    model: type[object]
+    prefix: str
+    tags: Optional[list[str]] = None
+
+    id_attr: str = "id"
+    soft_delete: bool = False
+    search_fields: Optional[list[str]] = None
+    ordering_default: Optional[str] = None
+    allowed_order_fields: Optional[list[str]] = None
+
+    read_schema: Optional[Type[Any]] = None
+    create_schema: Optional[Type[Any]] = None
+    update_schema: Optional[Type[Any]] = None
+
+    read_name: Optional[str] = None
+    create_name: Optional[str] = None
+    update_name: Optional[str] = None
+
+    create_exclude: tuple[str, ...] = ("id",)
+
+    # NEW – optional hook to build a custom Service
+    service_factory: Optional[Callable[[Repository], Service]] = None

svc_infra-0.1.177/src/svc_infra/api/fastapi/db/service_hooks.py

@@ -0,0 +1,17 @@
+from typing import Any, Callable, Optional
+
+from .service import Service
+
+PreHook = Callable[[dict[str, Any]], dict[str, Any]]
+
+class ServiceWithHooks(Service):
+    def __init__(self, repo, pre_create: Optional[PreHook] = None, pre_update: Optional[PreHook] = None):
+        super().__init__(repo)
+        self._pre_create = pre_create
+        self._pre_update = pre_update
+
+    async def pre_create(self, data: dict[str, Any]) -> dict[str, Any]:
+        return self._pre_create(data) if self._pre_create else data
+
+    async def pre_update(self, data: dict[str, Any]) -> dict[str, Any]:
+        return self._pre_update(data) if self._pre_update else data

svc_infra-0.1.177/src/svc_infra/auth/__init__.py

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

svc_infra-0.1.177/src/svc_infra/auth/user_default.py

@@ -0,0 +1,27 @@
+from typing import Any, Dict
+from fastapi_users.password import PasswordHelper
+
+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]:
+    data = dict(data)
+    if "password" in data:
+        data["password_hash"] = _pwd.hash(data.pop("password"))
+    if "metadata" in data:   # pydantic alias -> model column "metadata" (extra)
+        data["extra"] = data.pop("metadata")
+    data.setdefault("roles", [])
+    return data
+
+def _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):
+    return ServiceWithHooks(repo, pre_create=_pre_create, pre_update=_pre_update)

{svc_infra-0.1.175 → 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.175 → 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

svc_infra-0.1.175/src/svc_infra/api/fastapi/db/resource.py

@@ -1,31 +0,0 @@
-from typing import Any, Optional, Type
-from dataclasses import dataclass
-
-@dataclass
-class Resource:
-    # Required
-    model: type[object]
-    prefix: str  # e.g. "/projects"
-
-    # Optional FastAPI presentation
-    tags: Optional[list[str]] = None
-
-    # Optional overrides / knobs
-    id_attr: str = "id"
-    soft_delete: bool = False            # enables soft-delete endpoints if your model has deleted_at
-    search_fields: Optional[list[str]] = None  # used by router_plus if implemented there
-    ordering_default: Optional[str] = None
-    allowed_order_fields: Optional[list[str]] = None  # expose to router
-
-    # If you already have Pydantic classes, pass them here and we won't autogen
-    read_schema: Optional[Type[Any]] = None
-    create_schema: Optional[Type[Any]] = None
-    update_schema: Optional[Type[Any]] = None
-
-    # Autogen schema names (only used when the three above are None)
-    read_name: Optional[str] = None
-    create_name: Optional[str] = None
-    update_name: Optional[str] = None
-
-    # When autogenerating Create, exclude these model columns (e.g. "id", server defaults)
-    create_exclude: tuple[str, ...] = ("id",)

svc_infra-0.1.175/src/svc_infra/auth/__init__.py

@@ -1,3 +0,0 @@
-from .integration import enable_auth
-
-__all__ = ["enable_auth"]