fastapi-factory-utilities 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

fastapi_factory_utilities/core/exceptions.py

@@ -1,7 +1,8 @@
 """FastAPI Factory Utilities exceptions."""
 
 import logging
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from opentelemetry.trace import Span, get_current_span
 from opentelemetry.util.types import AttributeValue

fastapi_factory_utilities/core/plugins/odm_plugin/builder.py

@@ -180,6 +180,7 @@ class ODMBuilder:
             connectTimeoutMS=self._config.connection_timeout_ms,
             serverSelectionTimeoutMS=self._config.connection_timeout_ms,
             server_api=ServerApi(version=ServerApiVersion.V1),
+            tz_aware=True,
         )
 
         # KEEP IT, Waiting for additional tests

fastapi_factory_utilities/core/plugins/odm_plugin/repositories.py

@@ -2,24 +2,12 @@
 
 import datetime
 from abc import ABC
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator, Callable, Mapping
 from contextlib import asynccontextmanager
-from typing import (
-    Any,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    TypeVar,
-    Union,
-    get_args,
-)
+from typing import Any, Generic, TypeVar, get_args
 from uuid import UUID
 
 from beanie import SortDirection
-from beanie.odm.queries.find import FindMany
 from motor.motor_asyncio import AsyncIOMotorClientSession, AsyncIOMotorDatabase
 from pydantic import BaseModel
 from pymongo.errors import DuplicateKeyError, PyMongoError
@@ -229,19 +217,19 @@ class AbstractRepository(ABC, Generic[DocumentGenericType, EntityGenericType]):
         raise OperationError("Failed to delete document.")
 
     @managed_session()
-    async def find(
+    async def find(  # noqa: PLR0913
         self,
-        *args: Union[Mapping[str, Any], bool],
+        *args: Mapping[str, Any] | bool,
         projection_model: None = None,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        sort: Union[None, str, List[Tuple[str, SortDirection]]] = None,
-        session: Optional[AsyncIOMotorClientSession] = None,
+        skip: int | None = None,
+        limit: int | None = None,
+        sort: None | str | list[tuple[str, SortDirection]] = None,
+        session: AsyncIOMotorClientSession | None = None,
         ignore_cache: bool = False,
         fetch_links: bool = False,
         lazy_parse: bool = False,
-        nesting_depth: Optional[int] = None,
-        nesting_depths_per_field: Optional[Dict[str, int]] = None,
+        nesting_depth: int | None = None,
+        nesting_depths_per_field: dict[str, int] | None = None,
         **pymongo_kwargs: Any,
     ) -> list[EntityGenericType]:
         """Find documents in the database.

fastapi_factory_utilities/core/security/kratos.py

@@ -1,5 +1,6 @@
 """Provide Kratos Session and Identity classes."""
 
+from enum import StrEnum
 from typing import Annotated
 
 from fastapi import Depends, HTTPException, Request
@@ -13,20 +14,30 @@ from fastapi_factory_utilities.core.services.kratos import (
 )
 
 
+class KratosSessionAuthenticationErrors(StrEnum):
+    """Kratos Session Authentication Errors."""
+
+    MISSING_CREDENTIALS = "Missing Credentials"
+    INVALID_CREDENTIALS = "Invalid Credentials"
+    INTERNAL_SERVER_ERROR = "Internal Server Error"
+
+
 class KratosSessionAuthentication:
     """Kratos Session class."""
 
     DEFAULT_COOKIE_NAME: str = "ory_kratos_session"
 
-    def __init__(self, cookie_name: str = DEFAULT_COOKIE_NAME) -> None:
+    def __init__(self, cookie_name: str = DEFAULT_COOKIE_NAME, raise_exception: bool = True) -> None:
         """Initialize the KratosSessionAuthentication class.
 
         Args:
             cookie_name (str): Name of the cookie to extract the session
+            raise_exception (bool): Whether to raise an exception or return None
         """
         self._cookie_name: str = cookie_name
+        self._raise_exception: bool = raise_exception
 
-    def _extract_cookie(self, request: Request) -> str:
+    def _extract_cookie(self, request: Request) -> str | None:
         """Extract the cookie from the request.
 
         Args:
@@ -38,17 +49,11 @@ class KratosSessionAuthentication:
         Raises:
             HTTPException: If the cookie is missing.
         """
-        cookie: str | None = request.cookies.get(self._cookie_name)
-        if not cookie:
-            raise HTTPException(
-                status_code=401,
-                detail="Missing Credentials",
-            )
-        return cookie
+        return request.cookies.get(self._cookie_name, None)
 
     async def __call__(
         self, request: Request, kratos_service: Annotated[KratosService, Depends(depends_kratos_service)]
-    ) -> KratosSessionObject:
+    ) -> KratosSessionObject | KratosSessionAuthenticationErrors:
         """Extract the Kratos session from the request.
 
         Args:
@@ -56,23 +61,38 @@ class KratosSessionAuthentication:
             kratos_service (KratosService): Kratos service object.
 
         Returns:
-            KratosSessionObject: Kratos session object.
+            KratosSessionObject | KratosSessionAuthenticationErrors: Kratos session object or error.
 
         Raises:
-            HTTPException: If the session is invalid.
+            HTTPException: If the session is invalid and raise_exception is True.
         """
-        cookie: str = self._extract_cookie(request)
+        cookie: str | None = self._extract_cookie(request)
+        if not cookie:
+            if self._raise_exception:
+                raise HTTPException(
+                    status_code=401,
+                    detail=KratosSessionAuthenticationErrors.MISSING_CREDENTIALS,
+                )
+            else:
+                return KratosSessionAuthenticationErrors.MISSING_CREDENTIALS
+
         try:
             session: KratosSessionObject = await kratos_service.whoami(cookie_value=cookie)
         except KratosSessionInvalidError as e:
-            raise HTTPException(
-                status_code=401,
-                detail="Invalid Credentials",
-            ) from e
+            if self._raise_exception:
+                raise HTTPException(
+                    status_code=401,
+                    detail="Invalid Credentials",
+                ) from e
+            else:
+                return KratosSessionAuthenticationErrors.INVALID_CREDENTIALS
         except KratosOperationError as e:
-            raise HTTPException(
-                status_code=500,
-                detail="Internal Server Error",
-            ) from e
+            if self._raise_exception:
+                raise HTTPException(
+                    status_code=500,
+                    detail="Internal Server Error",
+                ) from e
+            else:
+                return KratosSessionAuthenticationErrors.INTERNAL_SERVER_ERROR
 
         return session

{fastapi_factory_utilities-0.3.3.dist-info → fastapi_factory_utilities-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi_factory_utilities
-Version: 0.3.3
+Version: 0.3.5
 Summary: Consolidate libraries and utilities to create microservices in Python with FastAPI, Beanie, Httpx, AioPika and OpenTelemetry.
 License: MIT
 Keywords: python,fastapi,beanie,httpx,opentelemetry,microservices

{fastapi_factory_utilities-0.3.3.dist-info → fastapi_factory_utilities-0.3.5.dist-info}/RECORD

@@ -15,17 +15,17 @@ fastapi_factory_utilities/core/app/fastapi_builder.py,sha256=DgIqiCnJK6cqsG-sg4H
 fastapi_factory_utilities/core/app/plugin_manager/__init__.py,sha256=eMfxCsk41Caw_juAawmDZHhytNI_ubXmqfRDug2AzvQ,319
 fastapi_factory_utilities/core/app/plugin_manager/exceptions.py,sha256=CFrZvROT7mLzNpXWwDra1j08lA_7ZrSrOHN94sEEfnQ,1026
 fastapi_factory_utilities/core/app/plugin_manager/plugin_manager.py,sha256=5E_Qp535xNJHNujZ_QRiMfIkDUy9F_3Rbjlclny5P08,6682
-fastapi_factory_utilities/core/exceptions.py,sha256=Z2U9m-4H6mhn04r0jfx2P6Aa7ka9alHpfTSeSY3mGjI,1757
+fastapi_factory_utilities/core/exceptions.py,sha256=HAd0RDJNBVc1NOcwfHQo_Xya8SCYuD9edynx3VKMYVs,1784
 fastapi_factory_utilities/core/plugins/__init__.py,sha256=W-BCkqP0xG980980z3mc8T6Vrp1Akv4szA0PRzkUbiU,756
 fastapi_factory_utilities/core/plugins/example/__init__.py,sha256=GF69IygLXxzrCh7VryekEWun663kKBhWtRS3w-1tzBc,1030
 fastapi_factory_utilities/core/plugins/httpx_plugin/__init__.py,sha256=P5FUyv7mQr8RZWQ8ifkoK8GXvqSI71q2b2dm-ag2JhQ,1028
 fastapi_factory_utilities/core/plugins/odm_plugin/__init__.py,sha256=L6iZW7beZLpvXbcXoTjP6iALEwWWymworb6Mok72s2w,5741
-fastapi_factory_utilities/core/plugins/odm_plugin/builder.py,sha256=fzaG2pMUkXTwX7YUYQYtYhZPyyaVOkzsvXDEmQnd7XI,8732
+fastapi_factory_utilities/core/plugins/odm_plugin/builder.py,sha256=Wf9Geo2ayCX9no8ENJcsfLRo-zrAuZFfUJkvnb01PRk,8759
 fastapi_factory_utilities/core/plugins/odm_plugin/configs.py,sha256=zQoJC1wLNyq2pZyFhl0bKeNsTl4y_4_82BHCCaOEjCQ,331
 fastapi_factory_utilities/core/plugins/odm_plugin/depends.py,sha256=OcLsfTLzMBk_xFV6qsMy_-qFkiphEbbEuaHUooagxg8,730
 fastapi_factory_utilities/core/plugins/odm_plugin/documents.py,sha256=BFQYHxHBmTacJRfhZi2OffvT_RAFvAAiDVQAa_d6Y7w,1141
 fastapi_factory_utilities/core/plugins/odm_plugin/exceptions.py,sha256=acnKJB0lGAzDs-7-LjBap8shjP3iV1a7dw7ouPVF27o,551
-fastapi_factory_utilities/core/plugins/odm_plugin/repositories.py,sha256=56rZRcpyzFlClRbR4QO8cLJf6icsaUm3U10DzkOq2_E,11412
+fastapi_factory_utilities/core/plugins/odm_plugin/repositories.py,sha256=-SqrdgXyfsqTjFNjri9h9nMG62IP57JrDHPC43S8bqo,11277
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/__init__.py,sha256=UsXPjiAASn5GIHW8vrF32mklxGNq8ajILV-ty4K1Tbs,4371
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/builder.py,sha256=9npQImifYAbEg0lFG7KwZ8V78SNrPoaINgd8vKitdMw,12509
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/configs.py,sha256=pMG9leMB7rtdkdGFLIxXflV7bf9epGrrYPt2N97KZcM,3750
@@ -33,7 +33,7 @@ fastapi_factory_utilities/core/plugins/opentelemetry_plugin/exceptions.py,sha256
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/helpers.py,sha256=qpTIzX67orJz7vy6SBIwRs24omMBoToJkhpurZRjPuk,1533
 fastapi_factory_utilities/core/protocols.py,sha256=TzZKr_KfmTphk2LL-TD2XzxNlLbihbGM2DxWMhc5lEQ,2428
 fastapi_factory_utilities/core/security/jwt.py,sha256=LuNVmTlONrmoKl7ghNv5JHV4qzMNOwuxJQlWgGSvBoo,5631
-fastapi_factory_utilities/core/security/kratos.py,sha256=o6fkl2KfSFT7W_uDAwlLiVFl53r-neL3LQ45H3VqEIM,2350
+fastapi_factory_utilities/core/security/kratos.py,sha256=yP9-TkELeXRPRYE9aQRlOPlwvaUJ7VQpyAea8ucWUfg,3364
 fastapi_factory_utilities/core/services/kratos/__init__.py,sha256=DaC29-Ol0WR5vX56IHLGDXP9UrhISq0Juhg_sJTasw4,368
 fastapi_factory_utilities/core/services/kratos/enums.py,sha256=ULJppowlZbOjdnUIXQyI4_nHmHZoNnv7-M1CYQBYXFY,220
 fastapi_factory_utilities/core/services/kratos/exceptions.py,sha256=xAX01-lQvPpADgcwhB5YWSy1UqAxG38s2rlU9AJBJd8,472
@@ -71,8 +71,8 @@ fastapi_factory_utilities/example/models/books/repository.py,sha256=7K63uAsSEGZ2
 fastapi_factory_utilities/example/services/books/__init__.py,sha256=Z06yNRoA7Zg3TGN-Q9rrvJg6Bbx-qJw661MVwukV6vQ,148
 fastapi_factory_utilities/example/services/books/services.py,sha256=-x7d4hotUWLzWo5uImMjFmtNcSTHwWv2bfttIbYYKbA,5380
 fastapi_factory_utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_factory_utilities-0.3.3.dist-info/LICENSE,sha256=iO1nLzMMst6vEiqgSUrfrbetM7b0bvdzXhbed5tqG8o,1074
-fastapi_factory_utilities-0.3.3.dist-info/METADATA,sha256=gmK3S5LekNTtRKgGEqv0mPAw24aeP0l1WyCMDc2_7tM,3477
-fastapi_factory_utilities-0.3.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-fastapi_factory_utilities-0.3.3.dist-info/entry_points.txt,sha256=IK0VcBexXo4uXQmTrbfhhnnfq4GmXPRn0GBB8hzlsq4,101
-fastapi_factory_utilities-0.3.3.dist-info/RECORD,,
+fastapi_factory_utilities-0.3.5.dist-info/LICENSE,sha256=iO1nLzMMst6vEiqgSUrfrbetM7b0bvdzXhbed5tqG8o,1074
+fastapi_factory_utilities-0.3.5.dist-info/METADATA,sha256=EUeNEhLRsQjQzv216cRp6peFD3U2JCKIZiwFxTSec98,3477
+fastapi_factory_utilities-0.3.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+fastapi_factory_utilities-0.3.5.dist-info/entry_points.txt,sha256=IK0VcBexXo4uXQmTrbfhhnnfq4GmXPRn0GBB8hzlsq4,101
+fastapi_factory_utilities-0.3.5.dist-info/RECORD,,