fastapi-factory-utilities 0.4.0__tar.gz → 0.4.2__tar.gz

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi_factory_utilities
-Version: 0.4.0
+Version: 0.4.2
 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.4.0 → fastapi_factory_utilities-0.4.2}/pyproject.toml

@@ -3,7 +3,7 @@ name = "fastapi_factory_utilities"
 homepage = "https://github.com/miragecentury/fastapi_factory_utilities"
 repository = "https://github.com/miragecentury/fastapi_factory_utilities"
 keywords = ["python", "fastapi", "beanie", "httpx", "opentelemetry", "microservices"]
-version = "0.4.0"
+version = "0.4.2"
 description = "Consolidate libraries and utilities to create microservices in Python with FastAPI, Beanie, Httpx, AioPika and OpenTelemetry."
 authors = ["miragecentury <victorien.vanroye@gmail.com>"]
 maintainers = ["miragecentury <victorien.vanroye@gmail.com>"]
@@ -38,7 +38,7 @@ opentelemetry-instrumentation-fastapi = "^0"
 opentelemetry-propagator-b3 = "^1.26.0"
 beanie = "^1.30.0"
 opentelemetry-instrumentation-pymongo = "^0"
-pymongo = "~4.9.2" # version fixed to fix integration between beanie and pytest-mongo
+pymongo = ">=4.9.2,<4.14.0"
 pyaml = "^25.1.0"
 reactivex = "^4.0.4"
 pyjwt = "^2.10.1"
@@ -59,16 +59,16 @@ pyupgrade = "^3.15.2"
 pytest = "^8.2.0"
 pytest-xdist = "^3.6.1"
 pytest-cov = "^6.0.0"
-ruff = "^0.7.2"
-pytest-asyncio = "^0.25.0"
+ruff = ">=0.7.2,<0.13.0"
+pytest-asyncio = ">=0.25,<1.1"
 pytest-mongo = "^3.1.0"
 locust = "^2.32.4"
 testcontainers = { version="^4.9.0", extras=["mongodb"] }
 types-deprecated = "^1.2.15.20241117"
 types-pygments = "^2.18.0.20240506"
 types-colorama = "^0.4.15.20240311"
-types-protobuf = "^5.29.1.20241207"
-types-psutil = "^6.1.0.20241221"
+types-protobuf = ">=5.29.1.20241207,<7.0.0.0"
+types-psutil = ">=6.1.0.20241221,<8.0.0.0"
 types-pyopenssl = "^24.1.0.20240722"
 types-ujson = "^5.10.0.20240515"
 httpx = "^0.28.1"

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/api/__init__.py

@@ -22,4 +22,4 @@ api_v2: APIRouter = APIRouter(prefix="/v2")
 api.include_router(router=api_v1)
 api.include_router(router=api_v2)
 
-__all__: list[str] = ["api", "TagEnum"]
+__all__: list[str] = ["TagEnum", "api"]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/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-0.4.0 → fastapi_factory_utilities-0.4.2}/src/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-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/plugins/odm_plugin/__init__.py

@@ -25,6 +25,7 @@ from .builder import ODMBuilder
 from .depends import depends_odm_client, depends_odm_database
 from .documents import BaseDocument
 from .exceptions import OperationError, UnableToCreateEntityDueToDuplicateKeyError
+from .helpers import PersistedEntity
 from .repositories import AbstractRepository
 
 _logger: BoundLogger = get_logger()
@@ -94,7 +95,7 @@ async def on_startup(
 
     if odm_factory.odm_database is None or odm_factory.odm_client is None:
         _logger.error(
-            f"ODM plugin failed to start. Database: {odm_factory.odm_database} - " f"Client: {odm_factory.odm_client}"
+            f"ODM plugin failed to start. Database: {odm_factory.odm_database} - Client: {odm_factory.odm_client}"
         )
         # TODO: Report the error to the status_service
         # this will report the application as unhealthy
@@ -160,9 +161,10 @@ async def on_shutdown(application: ApplicationAbstractProtocol) -> None:
 
 
 __all__: list[str] = [
-    "BaseDocument",
     "AbstractRepository",
+    "BaseDocument",
     "OperationError",
+    "PersistedEntity",
     "UnableToCreateEntityDueToDuplicateKeyError",
     "depends_odm_client",
     "depends_odm_database",

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/plugins/odm_plugin/builder.py

@@ -215,7 +215,7 @@ class ODMBuilder:
 
         if self._odm_client is None:
             raise ODMPluginConfigError(
-                "ODM client is not set. Provide the ODM client using " "build_client method or through parameter."
+                "ODM client is not set. Provide the ODM client using build_client method or through parameter."
             )
 
         self._odm_database = self._odm_client.get_database(
@@ -250,7 +250,7 @@ class ODMBuilder:
         """
         if self._odm_client is None:
             raise ODMPluginConfigError(
-                "ODM client is not set. Provide the ODM client using " "build_client method or through parameter."
+                "ODM client is not set. Provide the ODM client using build_client method or through parameter."
             )
 
         try:

fastapi_factory_utilities-0.4.2/src/fastapi_factory_utilities/core/plugins/odm_plugin/helpers.py

@@ -0,0 +1,16 @@
+"""Helper functions for ODM plugins."""
+
+import datetime
+import uuid
+
+from pydantic import BaseModel, Field
+
+
+class PersistedEntity(BaseModel):
+    """Base class for persisted entities."""
+
+    id: uuid.UUID = Field(default_factory=uuid.uuid4)
+
+    revision_id: uuid.UUID | None = Field(default=None)
+    created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
+    updated_at: datetime.datetime = Field(default_factory=datetime.datetime.now)

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/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-0.4.0 → fastapi_factory_utilities-0.4.2}/src/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-0.4.0 → fastapi_factory_utilities-0.4.2}/src/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__(
@@ -63,9 +64,9 @@ class MonitoredAbstract(ABC):
 
 
 __all__: list[str] = [
-    "MonitoredAbstract",
     "ComponentInstanceType",
     "ComponentTypeEnum",
+    "MonitoredAbstract",
     "Status",
     "StatusService",
 ]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/utils/yaml_reader.py

@@ -72,7 +72,7 @@ class YamlFileReader:
                 try:
                     yaml_data = yaml_data[key]
                 except KeyError:
-                    logger.warning(f"Base key {key}" " not found in YAML file" + " from {self._yaml_base_key}")
+                    logger.warning(f"Base key {key} not found in YAML file" + " from {self._yaml_base_key}")
                     return dict()
         return yaml_data
 

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/example/app.py

@@ -31,7 +31,8 @@ class App(ApplicationAbstract):
     def configure(self) -> None:
         """Configure the application."""
         # Prevent circular import
-        from .api import api_router  # pylint: disable=import-outside-toplevel
+        # pylint: disable=import-outside-toplevel
+        from .api import api_router  # noqa: PLC0415
 
         self.get_asgi_app().include_router(router=api_router)
 

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/example/entities/books/__init__.py

@@ -4,4 +4,4 @@ from .entities import BookEntity
 from .enums import BookType
 from .types import BookName
 
-__all__: list[str] = ["BookEntity", "BookType", "BookName"]
+__all__: list[str] = ["BookEntity", "BookName", "BookType"]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/example/models/books/__init__.py

@@ -3,4 +3,4 @@
 from .document import BookDocument
 from .repository import BookRepository
 
-__all__: list[str] = ["BookRepository", "BookDocument"]
+__all__: list[str] = ["BookDocument", "BookRepository"]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/app/__init__.py

@@ -12,12 +12,12 @@ from .config import (
 from .enums import EnvironmentEnum
 
 __all__: list[str] = [
-    "BaseApplicationConfig",
-    "EnvironmentEnum",
     "ApplicationAbstract",
     "ApplicationGenericBuilder",
-    "RootConfig",
-    "HttpServiceDependencyConfig",
+    "BaseApplicationConfig",
     "DependencyConfig",
+    "EnvironmentEnum",
+    "HttpServiceDependencyConfig",
+    "RootConfig",
     "depends_dependency_config",
 ]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/app/plugin_manager/__init__.py

@@ -8,8 +8,8 @@ from .exceptions import (
 from .plugin_manager import PluginManager
 
 __all__: list[str] = [
+    "InvalidPluginError",
     "PluginManager",
     "PluginManagerError",
-    "InvalidPluginError",
     "PluginPreConditionNotMetError",
 ]

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/plugins/opentelemetry_plugin/__init__.py

@@ -20,8 +20,8 @@ from .exceptions import OpenTelemetryPluginBaseException, OpenTelemetryPluginCon
 __all__: list[str] = [
     "OpenTelemetryConfig",
     "OpenTelemetryPluginBaseException",
-    "OpenTelemetryPluginConfigError",
     "OpenTelemetryPluginBuilder",
+    "OpenTelemetryPluginConfigError",
 ]
 
 _logger: BoundLogger = get_logger()

{fastapi_factory_utilities-0.4.0 → fastapi_factory_utilities-0.4.2}/src/fastapi_factory_utilities/core/services/status/__init__.py

@@ -5,10 +5,10 @@ from .services import StatusService
 from .types import ComponentInstanceType, Status
 
 __all__: list[str] = [
-    "ComponentTypeEnum",
     "ComponentInstanceType",
+    "ComponentTypeEnum",
     "HealthStatusEnum",
     "ReadinessStatusEnum",
-    "StatusService",
     "Status",
+    "StatusService",
 ]