fastapi-factory-utilities 0.3.10__py3-none-any.whl → 0.4.1__py3-none-any.whl

fastapi_factory_utilities/core/app/config.py

@@ -82,6 +82,8 @@ class DependencyConfig(BaseModel):
     """Dependency config."""
 
     kratos: HttpServiceDependencyConfig | None = Field(default=None, description="Kratos dependency config")
+    hydra_admin: HttpServiceDependencyConfig | None = Field(default=None, description="Hydra admin dependency config")
+    hydra_public: HttpServiceDependencyConfig | None = Field(default=None, description="Hydra public dependency config")
 
 
 class RootConfig(BaseModel):

fastapi_factory_utilities/core/app/fastapi_builder.py

@@ -77,7 +77,8 @@ class FastAPIBuilder:
 
         for middleware_args in self._middleware_list:
             fastapi.add_middleware(
-                middleware_class=middleware_args.middleware_class, **middleware_args.kwargs  # type: ignore
+                middleware_class=middleware_args.middleware_class,
+                **middleware_args.kwargs,  # type: ignore
             )
 
         fastapi.include_router(router=self._base_router)

fastapi_factory_utilities/core/app/plugin_manager/plugin_manager.py

@@ -67,7 +67,6 @@ class PluginManager:
         plugins: list[PluginProtocol] = []
 
         for plugin_enum in want_to_activate_plugins:
-
             try:
                 # Using a custom import function to be able to mock it in the tests.
                 plugin_module: ModuleType = cls._import_module(name=plugin_enum.value, package=plugin_package)

fastapi_factory_utilities/core/plugins/odm_plugin/repositories.py

@@ -268,6 +268,7 @@ class AbstractRepository(ABC, Generic[DocumentGenericType, EntityGenericType]):
                 lazy_parse=lazy_parse,
                 nesting_depth=nesting_depth,
                 nesting_depths_per_field=nesting_depths_per_field,
+                **pymongo_kwargs,
             ).to_list()
         except PyMongoError as error:
             raise OperationError(f"Failed to find documents: {error}") from error

fastapi_factory_utilities/core/security/jwt.py

@@ -140,11 +140,12 @@ class JWTBearerAuthentication:
         # by the request or by the jwt parameter
         if self.jwt_raw is None and request is None:
             raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail="Missing Credentials")
-        jwt_raw: str = (
-            self.jwt_raw
-            if self.jwt_raw is not None
-            else self._extract_raw_token(request=request)  # type: ignore[arg-type]
-        )
+
+        if self.jwt_raw is None:
+            jwt_raw: str = self._extract_raw_token(request=request)  # type: ignore[arg-type]
+        else:
+            jwt_raw: str = self.jwt_raw
+
         # Execute the io bound and cpu bound tasks in parallel
         async with TaskGroup() as tg:
             # TODO: Can be disabled by configuration (for operation purposes)

fastapi_factory_utilities/core/services/hydra/__init__.py

@@ -0,0 +1,13 @@
+"""Hydra service module."""
+
+from .exceptions import HydraOperationError, HydraTokenInvalidError
+from .objects import HydraTokenIntrospectObject
+from .services import HydraService, depends_hydra_service
+
+__all__: list[str] = [
+    "HydraOperationError",
+    "HydraService",
+    "HydraTokenIntrospectObject",
+    "HydraTokenInvalidError",
+    "depends_hydra_service",
+]

fastapi_factory_utilities/core/services/hydra/exceptions.py

@@ -0,0 +1,15 @@
+"""Python exceptions for the Hydra service."""
+
+from fastapi_factory_utilities.core.exceptions import FastAPIFactoryUtilitiesError
+
+
+class HydraError(FastAPIFactoryUtilitiesError):
+    """Base class for all exceptions raised by the Hydra service."""
+
+
+class HydraOperationError(HydraError):
+    """Exception raised when a Hydra operation fails."""
+
+
+class HydraTokenInvalidError(HydraError):
+    """Exception raised when a Hydra token is invalid."""

fastapi_factory_utilities/core/services/hydra/objects.py

@@ -0,0 +1,26 @@
+"""Provides the objects for the Hydra service."""
+
+from typing import ClassVar
+
+from pydantic import BaseModel, ConfigDict
+
+
+class HydraTokenIntrospectObject(BaseModel):
+    """Represents the object returned by the Hydra token introspection."""
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="ignore")
+
+    active: bool
+    aud: list[str]
+    client_id: str
+    exp: int
+    ext: dict[str, str] | None = None
+    iat: int
+    iss: str
+    nbf: int
+    obfuscated_subject: str | None = None
+    scope: str
+    sub: str
+    token_type: str
+    token_use: str
+    username: str | None = None

fastapi_factory_utilities/core/services/hydra/services.py

@@ -0,0 +1,122 @@
+"""Provides a service to interact with the Hydra service."""
+
+from base64 import b64encode
+from http import HTTPStatus
+from typing import Annotated
+
+import aiohttp
+from fastapi import Depends
+from pydantic import ValidationError
+
+from fastapi_factory_utilities.core.app import (
+    DependencyConfig,
+    HttpServiceDependencyConfig,
+    depends_dependency_config,
+)
+
+from .exceptions import HydraOperationError, HydraTokenInvalidError
+from .objects import HydraTokenIntrospectObject
+
+
+class HydraService:
+    """Service to interact with the Hydra service."""
+
+    INTROSPECT_ENDPOINT: str = "/admin/oauth2/introspect"
+    CLIENT_CREDENTIALS_ENDPOINT: str = "/oauth2/token"
+
+    def __init__(
+        self,
+        hydra_admin_http_config: HttpServiceDependencyConfig,
+        hydra_public_http_config: HttpServiceDependencyConfig,
+    ) -> None:
+        """Instanciate the Hydra service.
+
+        Args:
+            hydra_admin_http_config (HttpServiceDependencyConfig): The Hydra admin HTTP configuration.
+            hydra_public_http_config (HttpServiceDependencyConfig): The Hydra public HTTP configuration.
+        """
+        self._hydra_admin_http_config: HttpServiceDependencyConfig = hydra_admin_http_config
+        self._hydra_public_http_config: HttpServiceDependencyConfig = hydra_public_http_config
+
+    async def introspect(self, token: str) -> HydraTokenIntrospectObject:
+        """Introspects a token using the Hydra service.
+
+        Args:
+            token (str): The token to introspect.
+
+        Raises:
+            HydraOperationError: If the introspection fails.
+            HydraTokenInvalidError: If the token is invalid.
+        """
+        async with aiohttp.ClientSession(
+            base_url=str(self._hydra_admin_http_config.url),
+        ) as session:
+            async with session.post(
+                url=self.INTROSPECT_ENDPOINT,
+                data={"token": token},
+            ) as response:
+                if response.status != HTTPStatus.OK:
+                    raise HydraTokenInvalidError()
+
+                try:
+                    instrospect: HydraTokenIntrospectObject = HydraTokenIntrospectObject(**await response.json())
+                except ValidationError as error:
+                    raise HydraOperationError() from error
+
+                return instrospect
+
+    async def oauth2_client_credentials(self, client_id: str, client_secret: str, scope: str) -> str:
+        """Get the OAuth2 client credentials.
+
+        Args:
+            client_id (str): The client ID.
+            client_secret (str): The client secret.
+            scope (str): The scope.
+
+        Returns:
+            str: The access token.
+
+        Raises:
+            HydraOperationError: If the client credentials request fails.
+        """
+        # Create base64 encoded Basic Auth header
+        auth_string = f"{client_id}:{client_secret}"
+        auth_bytes = auth_string.encode("utf-8")
+        auth_b64 = b64encode(auth_bytes).decode("utf-8")
+
+        async with aiohttp.ClientSession(
+            base_url=str(self._hydra_public_http_config.url),
+        ) as session:
+            async with session.post(
+                url=self.CLIENT_CREDENTIALS_ENDPOINT,
+                headers={"Authorization": f"Basic {auth_b64}"},
+                data={"grant_type": "client_credentials", "scope": scope},
+            ) as response:
+                response_data = await response.json()
+                if response.status != HTTPStatus.OK:
+                    raise HydraOperationError(f"Failed to get client credentials: {response_data}")
+
+                return response_data["access_token"]
+
+
+def depends_hydra_service(
+    dependency_config: Annotated[DependencyConfig, Depends(depends_dependency_config)],
+) -> HydraService:
+    """Dependency injection for the Hydra service.
+
+    Args:
+        dependency_config (DependencyConfig): The dependency configuration.
+
+    Returns:
+        HydraService: The Hydra service instance.
+
+    Raises:
+        HydraOperationError: If the Hydra admin or public dependency is not configured.
+    """
+    if dependency_config.hydra_admin is None or dependency_config.hydra_public is None:
+        raise HydraOperationError(message="Hydra admin or public dependency not configured")
+
+    return HydraService(
+        hydra_admin_http_config=dependency_config.hydra_admin,
+        hydra_public_http_config=dependency_config.hydra_public,
+    )

fastapi_factory_utilities/core/utils/status.py

@@ -3,6 +3,7 @@
 ```python
 # Example of using the MonitoredAbstract
 
+
 class MyMonitored(MonitoredAbstract):
     def __init__(self, status_service: StatusService) -> None:
         super().__init__(

{fastapi_factory_utilities-0.3.10.dist-info → fastapi_factory_utilities-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi_factory_utilities
-Version: 0.3.10
+Version: 0.4.1
 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
@@ -31,7 +31,7 @@ Requires-Dist: opentelemetry-sdk (>=1.26.0,<2.0.0)
 Requires-Dist: pyaml (>=25.1.0,<26.0.0)
 Requires-Dist: pydantic (>=2.8.2,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
-Requires-Dist: pymongo (>=4.9.2,<4.10.0)
+Requires-Dist: pymongo (>=4.9.2,<4.14.0)
 Requires-Dist: reactivex (>=4.0.4,<5.0.0)
 Requires-Dist: structlog (>=24.1,<26.0)
 Requires-Dist: typer (>=0,<1)

{fastapi_factory_utilities-0.3.10.dist-info → fastapi_factory_utilities-0.4.1.dist-info}/RECORD

@@ -8,13 +8,13 @@ fastapi_factory_utilities/core/api/v1/sys/readiness.py,sha256=xIY8pQLShU7KWRtlOU
 fastapi_factory_utilities/core/app/__init__.py,sha256=IHHkcu3t-fX8vxQk12A36cE-yTjGn_PInDpL_OlRSE8,596
 fastapi_factory_utilities/core/app/application.py,sha256=WrDXh00r_jzQTtZGeFO43lIzvDraplitejTaSJj_uFE,5091
 fastapi_factory_utilities/core/app/builder.py,sha256=XKtJuRxvaqzNdhfNXGkyyxEH4MkZCgAUjkqYnOws8n0,4728
-fastapi_factory_utilities/core/app/config.py,sha256=81KYoxB14TX05jMWujPNjLI1BXkvMnUyw2VgF7nJIE0,7063
+fastapi_factory_utilities/core/app/config.py,sha256=MuV4G_M4QgZWYHoulusJLv_m4Qr2php-Cg9Jum4qkNA,7303
 fastapi_factory_utilities/core/app/enums.py,sha256=X1upnaehYU0eHExXTde5xsH-pI9q7HZDNsOEF5PApdg,226
 fastapi_factory_utilities/core/app/exceptions.py,sha256=tQDf0_4j5xgCbku7TL7JaZGs3_bjsWG2YLBCydQJpPw,664
-fastapi_factory_utilities/core/app/fastapi_builder.py,sha256=DgIqiCnJK6cqsG-sg4H7Pi0lkhaxOhSLQt_ksHjpjW0,2835
+fastapi_factory_utilities/core/app/fastapi_builder.py,sha256=KoywPbWu9wY5s1KpBAwxgqH07PYT3Y6Mtlq-PP4__5I,2852
 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/app/plugin_manager/plugin_manager.py,sha256=b6wDStsjAdCKExFFNCFEmeMERNsVCeIp1qseKfn5TO4,6681
 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
@@ -25,15 +25,19 @@ fastapi_factory_utilities/core/plugins/odm_plugin/configs.py,sha256=zQoJC1wLNyq2
 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=pOOADEe8mz6FuZkNzV46H8RNvi77FojJqb3bz9RQapo,11279
+fastapi_factory_utilities/core/plugins/odm_plugin/repositories.py,sha256=GJ3ovlxzTpiJ2_XlgARtwn6j0SbQxxAray_r8QWvGok,11313
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/__init__.py,sha256=4mq4a6U_nRxe3VxpHnC0FhRh0hpKO8l6QSUE7AazeBw,4689
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/builder.py,sha256=9npQImifYAbEg0lFG7KwZ8V78SNrPoaINgd8vKitdMw,12509
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/configs.py,sha256=pMG9leMB7rtdkdGFLIxXflV7bf9epGrrYPt2N97KZcM,3750
 fastapi_factory_utilities/core/plugins/opentelemetry_plugin/exceptions.py,sha256=CpsHayfQpP0zghN8y5PP6TBy-cXhHoNxBR--I86gAdE,327
 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/jwt.py,sha256=jO3FNOiqVvCCbvShUmCyfii8oLXNbYk_Sfsb_O29dng,5630
 fastapi_factory_utilities/core/security/kratos.py,sha256=yP9-TkELeXRPRYE9aQRlOPlwvaUJ7VQpyAea8ucWUfg,3364
+fastapi_factory_utilities/core/services/hydra/__init__.py,sha256=AKBYNc3zW5OsCLLeFSXqmDbWbQefHUJxstLpsXLQEUQ,369
+fastapi_factory_utilities/core/services/hydra/exceptions.py,sha256=ePMrfZturU2IVcxOebR0CbVKKqprce_fK-4UXbPPgNI,450
+fastapi_factory_utilities/core/services/hydra/objects.py,sha256=2CeV_4zmwwpfbXQ0TM9B_UnNkZuIRXweFP_VALBo57c,601
+fastapi_factory_utilities/core/services/hydra/services.py,sha256=Urc98pM23OatHr_WdgrpK1U4E2qsjF1fpXo0xnNjZ60,4411
 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
@@ -49,7 +53,7 @@ fastapi_factory_utilities/core/services/status/types.py,sha256=GJOGRra6NtpUS4q1c
 fastapi_factory_utilities/core/utils/configs.py,sha256=qM0pCrsK8ZyfCoyova_VrhR4eUX3LSPCbWunGMWcSVg,2581
 fastapi_factory_utilities/core/utils/importlib.py,sha256=DYcPo7K0s95WV5xxtucpufWsTj8Pxv25sWunDmmNUYI,797
 fastapi_factory_utilities/core/utils/log.py,sha256=6V9CL3bQio4e47YxcSXM2JQRGhVxuBfmcEbcF4RtCfQ,6393
-fastapi_factory_utilities/core/utils/status.py,sha256=1zxur98Wfum3JzpuzoAPoRIwQmXhFsTS2oxgbn5uFfg,1933
+fastapi_factory_utilities/core/utils/status.py,sha256=kOUX96D0IeOO8YOk2QTDF1_5rH69_93BSmxerjmrhwk,1934
 fastapi_factory_utilities/core/utils/uvicorn.py,sha256=XThylG-nOPVL00w6MIWGODnweoM7VxmpSFcyoPcmqns,2609
 fastapi_factory_utilities/core/utils/yaml_reader.py,sha256=KNlwHvpraAp04JjeXSSk72BLuILH3lhEKrmRaUUgo2k,6103
 fastapi_factory_utilities/example/__init__.py,sha256=LEKnPTBcgDyfHeOjlVxjK5lFdFqS-7-mHDuVuM2Jh_Y,206
@@ -71,8 +75,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.10.dist-info/LICENSE,sha256=iO1nLzMMst6vEiqgSUrfrbetM7b0bvdzXhbed5tqG8o,1074
-fastapi_factory_utilities-0.3.10.dist-info/METADATA,sha256=qDMLKgH6OIqvbg5cR6jErThx-6F66YbdkGrwiUzqufM,3479
-fastapi_factory_utilities-0.3.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fastapi_factory_utilities-0.3.10.dist-info/entry_points.txt,sha256=IK0VcBexXo4uXQmTrbfhhnnfq4GmXPRn0GBB8hzlsq4,101
-fastapi_factory_utilities-0.3.10.dist-info/RECORD,,
+fastapi_factory_utilities-0.4.1.dist-info/LICENSE,sha256=iO1nLzMMst6vEiqgSUrfrbetM7b0bvdzXhbed5tqG8o,1074
+fastapi_factory_utilities-0.4.1.dist-info/METADATA,sha256=mFUKdMVor7-1TzUxjzALV4JW6MWFUJy9zEo3KdiJlQw,3478
+fastapi_factory_utilities-0.4.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+fastapi_factory_utilities-0.4.1.dist-info/entry_points.txt,sha256=IK0VcBexXo4uXQmTrbfhhnnfq4GmXPRn0GBB8hzlsq4,101
+fastapi_factory_utilities-0.4.1.dist-info/RECORD,,