fastapi-rtk 1.0.13__tar.gz → 1.0.15__tar.gz

{fastapi_rtk-1.0.13 → fastapi_rtk-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.13
+Version: 1.0.15
 Summary: A package that provides a set of tools to build a FastAPI application with a Class-Based CRUD API.
 Project-URL: Homepage, https://codeberg.org/datatactics/fastapi-rtk
 Project-URL: Issues, https://codeberg.org/datatactics/fastapi-rtk/issues

fastapi_rtk-1.0.15/fastapi_rtk/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.15"

{fastapi_rtk-1.0.13 → fastapi_rtk-1.0.15}/fastapi_rtk/api/model_rest_api.py

@@ -1050,16 +1050,16 @@ class ModelRestApi(BaseApi):
         Returns:
             Callable[..., Coroutine[Any, Any, Tuple[QuerySchema, AsyncSession | Session | None]]]: The dependency that yields the tuple.
         """
-        session_factory = self.datamodel.get_session_factory()
 
-        async def dependency(q: self.query_schema = Depends()):  # type: ignore
+        async def dependency(
+            q: self.query_schema = Depends(),  # type: ignore
+            session=Depends(self.datamodel.get_session_factory()),
+        ):
             q: QuerySchema = q
             if not self.list_query_count_enabled or not q.with_count:
-                yield q, None
-                return
-
-            async for session in session_factory():
-                yield q, session
+                # TODO: Find a better way to not request session count when not needed
+                return q, None
+            return q, session
 
         return dependency
 

{fastapi_rtk-1.0.13 → fastapi_rtk-1.0.15}/fastapi_rtk/manager.py

@@ -81,6 +81,8 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         Returns:
             list[Role]: A list of Role objects that match the given role names.
         """
+        if not roles:
+            return []
         if isinstance(roles, str):
             roles = [roles]
         statement = select(Role).where(Role.name.in_(roles))
@@ -354,18 +356,14 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         password = user_dict.pop("password")
         user_dict["hashed_password"] = self.password_helper.hash(password)
 
-        role_names = roles
-        if role_names is None:
-            if request:
-                from .setting import Setting
+        if roles is None and request:
+            from .setting import Setting
 
-                role_names = Setting.AUTH_USER_REGISTRATION_ROLE
+            roles = Setting.AUTH_USER_REGISTRATION_ROLE
 
         # Get the roles if they exist
-        if role_names:
-            if isinstance(role_names, str):
-                role_names = [role_names]
-            user_dict["roles"] = await self.get_roles_by_names(role_names)
+        if roles is not None:
+            user_dict["roles"] = await self.get_roles_by_names(roles)
 
         created_user = await self.user_db.create(user_dict)
 
@@ -408,8 +406,6 @@ class UserManager(IDParser, BaseUserManager[User, int]):
             )
         )
         if roles is not None:
-            if isinstance(roles, str):
-                roles = [roles]
             updated_user_data["roles"] = await self.get_roles_by_names(roles)
         updated_user = await self._update(user, updated_user_data)
         await self.on_after_update(updated_user, updated_user_data, request)
@@ -718,13 +714,11 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         Returns:
             User | dict[str, Any]: The updated user or user dictionary with roles.
         """
-        if not role_keys:
+        if role_keys is None:
             return user_or_user_dict
         role_names = [Setting.AUTH_ROLES_MAPPING.get(key, []) for key in role_keys]
         role_names = [name for sublist in role_names for name in sublist]
         role_names = list(dict.fromkeys(role_names).keys())
-        if not role_names:
-            return user_or_user_dict
         if isinstance(user_or_user_dict, User):
             user_or_user_dict = await self.update({}, user_or_user_dict, role_names)
         else:

fastapi_rtk-1.0.13/fastapi_rtk/_version.py

@@ -1 +0,0 @@
-__version__ = "1.0.13"