fastapi-mongo-base 0.9.4__tar.gz → 0.9.6__tar.gz

{fastapi_mongo_base-0.9.4/src/fastapi_mongo_base.egg-info → fastapi_mongo_base-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastapi-mongo-base
-Version: 0.9.4
+Version: 0.9.6
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{fastapi_mongo_base-0.9.4 → fastapi_mongo_base-0.9.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-mongo-base"
-version = "0.9.4"
+version = "0.9.6"
 description = "A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB"
 readme = "README.md"
 requires-python = ">=3.9"

{fastapi_mongo_base-0.9.4 → fastapi_mongo_base-0.9.6}/src/fastapi_mongo_base/core/app_factory.py

@@ -15,6 +15,19 @@ except ImportError:
     from .config import Settings
 
 
+async def health(request: fastapi.Request):
+    return {
+        "status": "up",
+        "host": request.url.hostname,
+        # "project_name": settings.project_name,
+        # "host2": request.base_url.hostname,
+        # "original_host":request.headers.get("x-original-host", "!not found!"),
+        # "forwarded_host": request.headers.get("X-Forwarded-Host", "forwarded_host"),
+        # "forwarded_proto": request.headers.get("X-Forwarded-Proto", "forwarded_proto"),
+        # "forwarded_for": request.headers.get("X-Forwarded-For", "forwarded_for"),
+    }
+
+
 @asynccontextmanager
 async def lifespan(app: fastapi.FastAPI, worker=None, init_functions=[], settings: Settings = None):  # type: ignore
     """Initialize application services."""
@@ -160,18 +173,6 @@ def create_app(
         **kwargs,
     )
 
-    async def health(request: fastapi.Request):
-        return {
-            "status": "up",
-            "host": request.url.hostname,
-            "project_name": settings.project_name,
-            # "host2": request.base_url.hostname,
-            # "original_host":request.headers.get("x-original-host", "!not found!"),
-            # "forwarded_host": request.headers.get("X-Forwarded-Host", "forwarded_host"),
-            # "forwarded_proto": request.headers.get("X-Forwarded-Proto", "forwarded_proto"),
-            # "forwarded_for": request.headers.get("X-Forwarded-For", "forwarded_for"),
-        }
-
     async def logs():
         with open(settings.get_log_config()["info_log_path"], "rb") as f:
             last_100_lines = deque(f, maxlen=100)
@@ -179,7 +180,7 @@ def create_app(
         return [line.decode("utf-8") for line in last_100_lines]
 
     app.get(f"{base_path}/health")(health)
-    if log_route:   
+    if log_route:
         app.get(f"{base_path}/logs", include_in_schema=False)(logs)
 
     if serve_coverage:

{fastapi_mongo_base-0.9.4 → fastapi_mongo_base-0.9.6}/src/fastapi_mongo_base/core/middlewares.py

@@ -1,10 +1,8 @@
-import fastapi
-from fastapi.responses import PlainTextResponse
-from starlette.middleware.base import BaseHTTPMiddleware
-
 import logging
 
+import fastapi
 from fastapi import Request
+from fastapi.responses import PlainTextResponse
 from starlette.middleware.base import BaseHTTPMiddleware
 
 
@@ -27,7 +25,7 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
 
 
 class DynamicCORSMiddleware(BaseHTTPMiddleware):
-    
+
     async def get_allowed_origins(self, origin, **kwargs):
         from ufaas_fastapi_business.models import Business
 

{fastapi_mongo_base-0.9.4 → fastapi_mongo_base-0.9.6}/src/fastapi_mongo_base/routes.py

@@ -151,7 +151,7 @@ class AbstractBaseRouter(Generic[T, TS], metaclass=singleton.Singleton):
         limit: int = 10,
         **kwargs,
     ):
-        user_id = await self.get_user_id(request)
+        user_id = kwargs.pop("user_id", await self.get_user_id(request))
         limit = max(1, min(limit, Settings.page_max_limit))
 
         items, total = await self.model.list_total_combined(

{fastapi_mongo_base-0.9.4 → fastapi_mongo_base-0.9.6/src/fastapi_mongo_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastapi-mongo-base
-Version: 0.9.4
+Version: 0.9.6
 Summary: A simple boilerplate application, including models and schemas and abstract router, for FastAPI with MongoDB
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>