fastapi-rtk 1.0.13__py3-none-any.whl → 1.0.18__py3-none-any.whl

fastapi_rtk/_version.py

@@ -1 +1 @@
-__version__ = "1.0.13"
+__version__ = "1.0.18"

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/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.dist-info → fastapi_rtk-1.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.13
+Version: 1.0.18
 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.13.dist-info → fastapi_rtk-1.0.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastapi_rtk/__init__.py,sha256=Lg6Er5blOMcbtQSRJMNWbRQ1VX4PWEPMVFm2ie5r8mA,6183
-fastapi_rtk/_version.py,sha256=wNoGY0qdTAFUvE0bIbXr21KwpofxY8Hj9hqYUIvspQA,23
+fastapi_rtk/_version.py,sha256=4Q9JfUgIQNLvUFicJMyEkNm8HoOBiK9BeIp9ImHf4Bg,23
 fastapi_rtk/apis.py,sha256=6X_Lhl98m7lKrDRybg2Oe24pLFLJ29eCOQSwCAvpKhY,172
 fastapi_rtk/config.py,sha256=9PZF9E5i1gxmnsZEprZZKxVHSk0dFEklJSplX9NEqdo,14036
 fastapi_rtk/const.py,sha256=sEj_cYeerj9pVwbCu0k5Sy1EYpdr1EHzUjqqbnporgc,4905
@@ -10,7 +10,7 @@ fastapi_rtk/exceptions.py,sha256=P0qwd4VkeWFotgMVQHgmdT1NphFQaEznKLFIvJzW4Zs,259
 fastapi_rtk/fastapi_react_toolkit.py,sha256=lvtieBLzCAlozKQU9dkAUVoW7Ofi1ncri_hDyeHazF4,29803
 fastapi_rtk/filters.py,sha256=weCH3suCxpGJQYmwhj9D1iAqMPiRnmbRiN7stK0rhoE,181
 fastapi_rtk/globals.py,sha256=TcoMHCueM7sFwZ8iYorUe4q-3KpVFfV04RAPuMTYFKY,8863
-fastapi_rtk/manager.py,sha256=J86sBByj6E1kZ3CRS0NayI0n5firrfMhAU2d58mz0JM,33965
+fastapi_rtk/manager.py,sha256=F57aD0DApH98H7GPpnxrwKHz0nETuxQG2bax4FDfJgM,33737
 fastapi_rtk/middlewares.py,sha256=ycdaAdLIUaNEZ7KotczTHS6OOqy98Mn1_O7Hpe7Sma8,10325
 fastapi_rtk/mixins.py,sha256=78RqwrRJFOz6KAxf-GSNOmRdr7R3b-ws7OIENYlzRQQ,238
 fastapi_rtk/models.py,sha256=lQSqe-r0H7jWBVdqXjEi_bNL1cGQr0YWnyI1ToS_coc,178
@@ -21,7 +21,7 @@ fastapi_rtk/types.py,sha256=-LPnTIbHvqJW81__gab3EWrhjNmznHhptz0BtXkEAHQ,3612
 fastapi_rtk/version.py,sha256=D2cmQf2LNeHOiEfcNzVOOfcAmuLvPEmGEtZv5G54D0c,195
 fastapi_rtk/api/__init__.py,sha256=MwFR7HHppnhbjZGg3sOdQ6nqy9uxnHHXvicpswNFMNA,245
 fastapi_rtk/api/base_api.py,sha256=42I9v3b25lqxNAMDGEtajA5-btIDSyUWF0xMDgGkA8c,8078
-fastapi_rtk/api/model_rest_api.py,sha256=pLuwefPEunf0P1k_UlKFEINZaT8RTPEHcN0j784G8Z0,106536
+fastapi_rtk/api/model_rest_api.py,sha256=cRjMg_v5TsXCare8Tg7b5qQssB6fGo7RpaoGWQvdoO8,106572
 fastapi_rtk/auth/__init__.py,sha256=iX7O41NivBYDfdomEaqm4lUx9KD17wI4g3EFLF6kUTw,336
 fastapi_rtk/auth/auth.py,sha256=F2qZoR7go_7FnvVJrDxUCd6vtRz5XW8yyOv143MWPts,20664
 fastapi_rtk/auth/hashers/__init__.py,sha256=uBThFj2VPPSMSioxYTktNiM4-mVgtDAjTpKA3ZzWxxs,110
@@ -126,8 +126,8 @@ fastapi_rtk/utils/timezone.py,sha256=62S0pPWuDFFXxV1YTFCsc4uKiSP_Ba36Fv7S3gYjfhs
 fastapi_rtk/utils/update_signature.py,sha256=PIzZgNpGEwvDNgQ3G51Zi-QhVV3mbxvUvSwDwf_-yYs,2209
 fastapi_rtk/utils/use_default_when_none.py,sha256=H2HqhKy_8eYk3i1xijEjuaKak0oWkMIkrdz6T7DK9QU,469
 fastapi_rtk/utils/werkzeug.py,sha256=1Gv-oyqSmhVGrmNbB9fDqpqJzPpANOzWf4zMMrhW9UA,3245
-fastapi_rtk-1.0.13.dist-info/METADATA,sha256=W35XgqcgifVCWEy3W3dWWZc27yu4Qr6-R7KlSCuuRK4,1302
-fastapi_rtk-1.0.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_rtk-1.0.13.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
-fastapi_rtk-1.0.13.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
-fastapi_rtk-1.0.13.dist-info/RECORD,,
+fastapi_rtk-1.0.18.dist-info/METADATA,sha256=XV1b_3Enq1nruSbQvf1nOb9ufulbPMFKoV0Oz-08x5w,1302
+fastapi_rtk-1.0.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_rtk-1.0.18.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
+fastapi_rtk-1.0.18.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
+fastapi_rtk-1.0.18.dist-info/RECORD,,