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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastapi-mongo-base
-Version: 0.9.2
+Version: 0.9.4
 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.2 → fastapi_mongo_base-0.9.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi-mongo-base"
-version = "0.9.2"
+version = "0.9.4"
 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.2 → fastapi_mongo_base-0.9.4}/src/fastapi_mongo_base/core/app_factory.py

@@ -15,18 +15,6 @@ except ImportError:
     from .config import Settings
 
 
-async def health(request: fastapi.Request):
-    return {
-        "status": "up",
-        "host": request.url.hostname,
-        # "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."""
@@ -55,17 +43,23 @@ def setup_exception_handlers(
 ):
     exception_handlers = exceptions.EXCEPTION_HANDLERS
     if usso_handler:
-        from usso.fastapi.integration import (
-            EXCEPTION_HANDLERS as USSO_EXCEPTION_HANDLERS,
-        )
-
-        exception_handlers.update(USSO_EXCEPTION_HANDLERS)
+        try:
+            from usso.fastapi.integration import (
+                EXCEPTION_HANDLERS as USSO_EXCEPTION_HANDLERS,
+            )
+
+            exception_handlers.update(USSO_EXCEPTION_HANDLERS)
+        except ImportError:
+            pass
     if ufaas_handler:
-        from ufaas.fastapi.integration import (
-            EXCEPTION_HANDLERS as UFAAS_EXCEPTION_HANDLERS,
-        )
+        try:
+            from ufaas.fastapi.integration import (
+                EXCEPTION_HANDLERS as UFAAS_EXCEPTION_HANDLERS,
+            )
 
-        exception_handlers.update(UFAAS_EXCEPTION_HANDLERS)
+            exception_handlers.update(UFAAS_EXCEPTION_HANDLERS)
+        except ImportError:
+            pass
 
     for exc_class, handler in exception_handlers.items():
         app.exception_handler(exc_class)(handler)
@@ -98,8 +92,8 @@ def setup_middlewares(
 
 
 def create_app(
-    *,
     settings: Settings = None,
+    *,
     title=None,
     description=None,
     version="0.1.0",
@@ -121,6 +115,7 @@ def create_app(
     ufaas_handler: bool = True,
     original_host_middleware: bool = False,
     request_log_middleware: bool = False,
+    log_route: bool = False,
     **kwargs,
 ) -> fastapi.FastAPI:
     settings.config_logger()
@@ -165,6 +160,18 @@ 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)
@@ -172,7 +179,8 @@ def create_app(
         return [line.decode("utf-8") for line in last_100_lines]
 
     app.get(f"{base_path}/health")(health)
-    app.get(f"{base_path}/logs", include_in_schema=False)(logs)
+    if log_route:   
+        app.get(f"{base_path}/logs", include_in_schema=False)(logs)
 
     if serve_coverage:
         app.mount(

fastapi_mongo_base-0.9.4/src/fastapi_mongo_base/core/middlewares.py

@@ -0,0 +1,63 @@
+import fastapi
+from fastapi.responses import PlainTextResponse
+from starlette.middleware.base import BaseHTTPMiddleware
+
+import logging
+
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+
+# Create logging middleware
+class RequestLoggingMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        # Log the request details
+        # logging.info(f"Request: {request.method} {request.url}")
+        # logging.info(f"Headers: {request.headers}")
+
+        # You can also log other request details like body, client IP, etc.
+        # Accessing the request body requires it to be async, managing it carefully since it is a stream
+
+        response = await call_next(request)
+
+        # You can also log response details here if needed
+        logging.info(f"request: {request.method} {request.url} {response.status_code}")
+
+        return response
+
+
+class DynamicCORSMiddleware(BaseHTTPMiddleware):
+    
+    async def get_allowed_origins(self, origin, **kwargs):
+        from ufaas_fastapi_business.models import Business
+
+        business = await Business.get_by_origin(origin)
+        if not business:
+            return []
+        return business.config.allowed_origins
+
+    async def dispatch(self, request: fastapi.Request, call_next):
+        origin = request.headers.get("origin")
+        allowed_origins = await self.get_allowed_origins(origin=request.url.hostname)
+        headers = {}
+        if origin in allowed_origins:
+            headers = {
+                "Access-Control-Allow-Origin": origin,
+                "Access-Control-Allow-Credentials": "true",
+                "Access-Control-Allow-Methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
+                "Access-Control-Allow-Headers": "Content-Type, Authorization, *",
+            }
+
+        if request.method == "OPTIONS":
+            return PlainTextResponse("", status_code=200, headers=headers)
+
+        # if origin and origin not in allowed_origins:
+        #     raise BaseHTTPException(
+        #         status_code=403,
+        #         error="origin_not_allowed",
+        #         message="Origin not allowed",
+        #     )
+
+        response: fastapi.Response = await call_next(request)
+        response.headers.update(headers)
+        return response

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastapi-mongo-base
-Version: 0.9.2
+Version: 0.9.4
 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.2/src/fastapi_mongo_base/core/middlewares.py

@@ -1,22 +0,0 @@
-import logging
-
-from fastapi import Request
-from starlette.middleware.base import BaseHTTPMiddleware
-
-
-# Create logging middleware
-class RequestLoggingMiddleware(BaseHTTPMiddleware):
-    async def dispatch(self, request: Request, call_next):
-        # Log the request details
-        # logging.info(f"Request: {request.method} {request.url}")
-        # logging.info(f"Headers: {request.headers}")
-
-        # You can also log other request details like body, client IP, etc.
-        # Accessing the request body requires it to be async, managing it carefully since it is a stream
-
-        response = await call_next(request)
-
-        # You can also log response details here if needed
-        logging.info(f"request: {request.method} {request.url} {response.status_code}")
-
-        return response