maleo-foundation 0.1.61__py3-none-any.whl → 0.1.62__py3-none-any.whl

maleo_foundation/managers/middleware.py

@@ -1,6 +1,8 @@
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
 from typing import List, Optional
+from maleo_foundation.client.manager import MaleoFoundationClientManager
+from maleo_foundation.models.schemas import BaseGeneralSchemas
 from maleo_foundation.middlewares.authentication import add_authentication_middleware
 from maleo_foundation.middlewares.base import add_base_middleware, RequestProcessor
 from maleo_foundation.middlewares.cors import add_cors_middleware
@@ -38,19 +40,24 @@ class MiddlewareLoggers(BaseModel):
         arbitrary_types_allowed=True
 
 class MiddlewareManager:
-    def __init__(self, app:FastAPI, configurations:MiddlewareConfigurations):
-        self._app = app
-        self._configurations = configurations
-
-    def add_all(
+    def __init__(
         self,
+        app:FastAPI,
+        configurations:MiddlewareConfigurations,
+        keys:BaseGeneralSchemas.RSAKeys,
         loggers:MiddlewareLoggers,
-        key:str,
-        request_processor:Optional[RequestProcessor] = None
+        maleo_foundation:MaleoFoundationClientManager
     ):
+        self._app = app
+        self._configurations = configurations
+        self._keys = keys
+        self._loggers = loggers
+        self._maleo_foundation = maleo_foundation
+
+    def add_all(self):
         self.add_cors()
-        self.add_base(logger=loggers.base, request_processor=request_processor)
-        self.add_authentication(logger=loggers.authentication, key=key)
+        self.add_base()
+        self.add_authentication()
 
     def add_cors(self) -> None:
         add_cors_middleware(
@@ -62,10 +69,12 @@ class MiddlewareManager:
             expose_headers=self._configurations.cors.expose_headers
         )
 
-    def add_base(self, logger:MiddlewareLogger, request_processor:Optional[RequestProcessor] = None):
+    def add_base(self):
         add_base_middleware(
             app=self._app,
-            logger=logger,
+            key=self._keys,
+            logger=self._loggers.base,
+            maleo_foundation=self._maleo_foundation,
             allow_origins=self._configurations.general.allow_origins,
             allow_methods=self._configurations.general.allow_methods,
             allow_headers=self._configurations.general.allow_headers,
@@ -73,9 +82,13 @@ class MiddlewareManager:
             limit=self._configurations.base.limit,
             window=self._configurations.base.window,
             cleanup_interval=self._configurations.base.cleanup_interval,
-            ip_timeout=self._configurations.base.ip_timeout,
-            request_processor=request_processor
+            ip_timeout=self._configurations.base.ip_timeout
         )
 
-    def add_authentication(self, logger:MiddlewareLogger, key:str):
-        add_authentication_middleware(app=self._app, logger=logger, key=key)
+    def add_authentication(self):
+        add_authentication_middleware(
+            app=self._app,
+            key=self._keys,
+            logger=self._loggers.authentication,
+            maleo_foundation=self._maleo_foundation
+        )

maleo_foundation/managers/service.py

@@ -8,13 +8,13 @@ from sqlalchemy import MetaData
 from typing import Optional
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.enums import BaseEnums
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.transfers.general.token import BaseTokenGeneralTransfers
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
 from maleo_foundation.managers.db import DatabaseConfigurations, DatabaseManager
 from maleo_foundation.managers.client.google.secret import GoogleSecretManager
 from maleo_foundation.managers.client.google.storage import GoogleCloudStorage
 from maleo_foundation.managers.middleware import MiddlewareConfigurations, BaseMiddlewareConfigurations, CORSMiddlewareConfigurations, GeneralMiddlewareConfigurations, MiddlewareLoggers, MiddlewareManager
-from maleo_foundation.middlewares.base import RequestProcessor
 from maleo_foundation.utils.exceptions import BaseExceptions
 from maleo_foundation.utils.loaders.json import JSONLoader
 from maleo_foundation.utils.loaders.yaml import YAMLLoader
@@ -28,11 +28,6 @@ class Settings(BaseSettings):
     STATIC_CONFIGURATIONS_PATH:str = Field("configs/static.yaml", description="Maleo's static configurations path")
     RUNTIME_CONFIGURATIONS_PATH:str = Field("configs/runtime.yaml", description="Service's runtime configurations path")
 
-class Keys(BaseModel):
-    password:str = Field(..., description="Key's password")
-    private:str = Field(..., description="Private key")
-    public:str = Field(..., description="Public key")
-
 class GoogleCredentials(BaseModel):
     type:str = Field(..., description="Credentials type")
     project_id:str = Field(..., description="Google project ID")
@@ -231,10 +226,10 @@ class ServiceManager:
         password = self._secret_manager.get(name="maleo-key-password")
         private = self._secret_manager.get(name="maleo-private-key")
         public = self._secret_manager.get(name="maleo-public-key")
-        self._keys = Keys(password=password, private=private, public=public)
+        self._keys = BaseGeneralSchemas.RSAKeys(password=password, private=private, public=public)
 
     @property
-    def keys(self) -> Keys:
+    def keys(self) -> BaseGeneralSchemas.RSAKeys:
         return self._keys
 
     def _initialize_loggers(self) -> None:
@@ -292,15 +287,21 @@ class ServiceManager:
             return ""
         return result.data.token
 
-    def create_app(self, router:APIRouter, lifespan:Optional[Lifespan[AppType]] = None, request_processor:Optional[RequestProcessor] = None) -> FastAPI:
+    def create_app(self, router:APIRouter, lifespan:Optional[Lifespan[AppType]] = None) -> FastAPI:
         self._loggers.application.info("Creating FastAPI application")
         self._app = FastAPI(title=self._configs.service.name, lifespan=lifespan)
         self._loggers.application.info("FastAPI application created successfully")
 
         #* Add middleware(s)
         self._loggers.application.info("Configuring middlewares")
-        self._middleware = MiddlewareManager(app=self._app, configurations=self._configs.middleware)
-        self._middleware.add_all(loggers=self.loggers.middleware, key=self._keys.public, request_processor=request_processor)
+        self._middleware = MiddlewareManager(
+            app=self._app,
+            configurations=self._configs.middleware,
+            keys=self._keys,
+            loggers=self._loggers.middleware,
+            maleo_foundation=self._clients.maleo.foundation
+        )
+        self._middleware.add_all()
         self._loggers.application.info("Middlewares addedd successfully")
 
         #* Add exception handler(s)

maleo_foundation/middlewares/authentication.py

@@ -5,16 +5,16 @@ from starlette.requests import HTTPConnection
 from typing import Tuple
 from maleo_foundation.authentication import Credentials, User
 from maleo_foundation.client.manager import MaleoFoundationClientManager
-from maleo_foundation.managers.service import Keys
+from maleo_foundation.models.schemas import BaseGeneralSchemas
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
 from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 class Backend(AuthenticationBackend):
-    def __init__(self, logger:MiddlewareLogger, keys:Keys, maleo_foundation:MaleoFoundationClientManager):
+    def __init__(self, keys:BaseGeneralSchemas.RSAKeys, logger:MiddlewareLogger, maleo_foundation:MaleoFoundationClientManager):
         super().__init__()
-        self._logger = logger
         self._keys = keys
+        self._logger = logger
         self._maleo_foundation = maleo_foundation
 
     async def authenticate(self, conn:HTTPConnection) -> Tuple[Credentials, User]:
@@ -38,7 +38,7 @@ class Backend(AuthenticationBackend):
         self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | Username: {decode_token_result.data.u_u} | Email: {decode_token_result.data.u_e}")
         return Credentials(token=token), User(authenticated=True, username=decode_token_result.data.u_u, email=decode_token_result.data.u_e)
 
-def add_authentication_middleware(app:FastAPI, logger:MiddlewareLogger, keys:Keys) -> None:
+def add_authentication_middleware(app:FastAPI, keys:BaseGeneralSchemas.RSAKeys, logger:MiddlewareLogger, maleo_foundation:MaleoFoundationClientManager) -> None:
     """
     Adds Authentication middleware to the FastAPI application.
 

maleo_foundation/middlewares/base.py

@@ -9,7 +9,7 @@ from fastapi.responses import JSONResponse
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from typing import Awaitable, Callable, Optional, Sequence
 from maleo_foundation.client.manager import MaleoFoundationClientManager
-from maleo_foundation.managers.service import Keys
+from maleo_foundation.models.schemas import BaseGeneralSchemas
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.parameters.signature import BaseSignatureParametersTransfers
 from maleo_foundation.utils.extractor import BaseExtractors
@@ -22,8 +22,8 @@ class BaseMiddleware(BaseHTTPMiddleware):
     def __init__(
         self,
         app:FastAPI,
+        keys:BaseGeneralSchemas.RSAKeys,
         logger:MiddlewareLogger,
-        keys:Keys,
         maleo_foundation:MaleoFoundationClientManager,
         allow_origins:Sequence[str] = (),
         allow_methods:Sequence[str] = ("GET",),
@@ -35,8 +35,8 @@ class BaseMiddleware(BaseHTTPMiddleware):
         ip_timeout:int = 300
     ):
         super().__init__(app)
-        self._logger = logger
         self._keys = keys
+        self._logger = logger
         self._maleo_foundation = maleo_foundation
         self._allow_origins = allow_origins
         self._allow_methods = allow_methods
@@ -113,12 +113,17 @@ class BaseMiddleware(BaseHTTPMiddleware):
 
         return response
 
-    def _add_response_headers(self, request:Request, response:Response, request_timestamp:datetime, process_time:int) -> Response:
+    def _add_response_headers(
+        self,
+        request:Request,
+        response:Response,
+        request_timestamp:datetime,
+        response_timestamp:datetime,
+        process_time:int
+    ) -> Response:
         response.headers["X-Process-Time"] = str(process_time) #* Add Process Time Header
         response.headers["X-Request-Timestamp"] = request_timestamp.isoformat() #* Add request timestamp header
-        #* Define and add response timestamp header
-        response_timestamp = datetime.now(tz=timezone.utc)
-        response.headers["X-Response-Timestamp"] = response_timestamp.isoformat()
+        response.headers["X-Response-Timestamp"] = response_timestamp.isoformat() #* Define and add response timestamp header
         #* Generate signature header
         message = f"{request.method}|{request.url.path}|{request_timestamp.isoformat()}|{response_timestamp.isoformat()}|{str(process_time)}"
         sign_parameters = BaseSignatureParametersTransfers.Sign(key=self._keys.private, password=self._keys.password, message=message)
@@ -133,11 +138,12 @@ class BaseMiddleware(BaseHTTPMiddleware):
         request:Request,
         response:Response,
         request_timestamp:datetime,
+        response_timestamp:datetime,
         process_time:int,
         log_level:str = "info",
         client_ip:str = "unknown"
     ) -> Response:
-        response = self._add_response_headers(request, response, request_timestamp, process_time)
+        response = self._add_response_headers(request, response, request_timestamp, response_timestamp, process_time)
         log_func = getattr(self._logger, log_level)
         log_func(
             f"Request | IP: {client_ip} | Method: {request.method} | URL: {request.url.path} | "
@@ -145,7 +151,15 @@ class BaseMiddleware(BaseHTTPMiddleware):
         )
         return response
 
-    def _handle_exception(self, request:Request, error, request_timestamp:datetime, process_time:int, client_ip):
+    def _handle_exception(
+        self,
+        request:Request,
+        error,
+        request_timestamp:datetime,
+        response_timestamp:datetime,
+        process_time:int,
+        client_ip
+    ):
         traceback_str = traceback.format_exc().split("\n")
         error_details = {
             "error": str(error),
@@ -166,7 +180,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
             f"Headers: {dict(request.headers)} - Response | Status: 500 | Exception:\n{json.dumps(error_details, indent=4)}"
         )
 
-        return self._add_response_headers(request, response, request_timestamp, process_time)
+        return self._add_response_headers(request, response, request_timestamp, response_timestamp, process_time)
 
     async def _request_processor(self, request:Request) -> Optional[Response]:
         return None
@@ -187,6 +201,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
                         status_code=status.HTTP_429_TOO_MANY_REQUESTS,
                     ),
                     request_timestamp=request_timestamp,
+                    response_timestamp=datetime.now(tz=timezone.utc),
                     process_time=time.perf_counter() - start_time,
                     log_level="warning",
                     client_ip=client_ip,
@@ -199,6 +214,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
                     request=request,
                     response=pre_response,
                     request_timestamp=request_timestamp,
+                    response_timestamp=datetime.now(tz=timezone.utc),
                     process_time=time.perf_counter() - start_time,
                     log_level="info",
                     client_ip=client_ip,
@@ -210,6 +226,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
                 request=request,
                 response=response,
                 request_timestamp=request_timestamp,
+                response_timestamp=datetime.now(tz=timezone.utc),
                 process_time=time.perf_counter() - start_time,
                 log_level="info",
                 client_ip=client_ip,
@@ -218,11 +235,20 @@ class BaseMiddleware(BaseHTTPMiddleware):
             return response
 
         except Exception as e:
-            return self._handle_exception(request, e, request_timestamp, time.perf_counter() - start_time, client_ip)
+            return self._handle_exception(
+                request=request,
+                error=e,
+                request_timestamp=request_timestamp,
+                response_timestamp=datetime.now(tz=timezone.utc),
+                process_time=time.perf_counter() - start_time,
+                client_ip=client_ip
+            )
 
 def add_base_middleware(
     app:FastAPI,
+    keys:BaseGeneralSchemas.RSAKeys,
     logger:MiddlewareLogger,
+    maleo_foundation:MaleoFoundationClientManager,
     allow_origins:Sequence[str] = (),
     allow_methods:Sequence[str] = ("GET",),
     allow_headers:Sequence[str] = (),
@@ -230,8 +256,7 @@ def add_base_middleware(
     limit:int = 10,
     window:int = 1,
     cleanup_interval:int = 60,
-    ip_timeout:int = 300,
-    request_processor:Optional[RequestProcessor] = None
+    ip_timeout:int = 300
 ) -> None:
     """
     Adds Base middleware to the FastAPI application.
@@ -270,7 +295,9 @@ def add_base_middleware(
     """
     app.add_middleware(
         BaseMiddleware,
+        keys=keys,
         logger=logger,
+        maleo_foundation=maleo_foundation,
         allow_origins=allow_origins,
         allow_methods=allow_methods,
         allow_headers=allow_headers,
@@ -278,6 +305,5 @@ def add_base_middleware(
         limit=limit,
         window=window,
         cleanup_interval=cleanup_interval,
-        ip_timeout=ip_timeout,
-        request_processor=request_processor
+        ip_timeout=ip_timeout
     )

maleo_foundation/models/schemas/general.py

@@ -81,4 +81,9 @@ class BaseGeneralSchemas:
         secret:UUID = Field(..., description="Data's secret")
 
     class Data(BaseModel):
-        data:BaseTypes.StringToAnyDict = Field(..., description="Data")
+        data:BaseTypes.StringToAnyDict = Field(..., description="Data")
+
+    class RSAKeys(BaseModel):
+        password:str = Field(..., description="Key's password")
+        private:str = Field(..., description="Private key")
+        public:str = Field(..., description="Public key")

{maleo_foundation-0.1.61.dist-info → maleo_foundation-0.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.61
+Version: 0.1.62
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.1.61.dist-info → maleo_foundation-0.1.62.dist-info}/RECORD

@@ -18,8 +18,8 @@ maleo_foundation/expanded_types/signature.py,sha256=zNgXRrxVCfEIGXsRANIa1Ljj-ebH
 maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQwfu9WxwrMipc,355
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=Pn5EZ-c1Hy6-BihN7KokHJWmBIt3Ty96fZ0zF-srtF4,5208
-maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
-maleo_foundation/managers/service.py,sha256=UI5aXIgVqTud4PtI5QCSFApOALdSvMhR9O3cMW1NqIE,16960
+maleo_foundation/managers/middleware.py,sha256=79G6L3p6wiKjoObK1jf1qIaPOJ-ttlIgx9ii2_p_yr4,4276
+maleo_foundation/managers/service.py,sha256=X2NgK5yVRkO5HSVGhN6PgoN-1sGn9w-_PDx1lFVGj2c,16844
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=qfWu_wxoPSSzgZwuTEwRiXERg60diAkz65Qk3fnQej4,3972
 maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
@@ -28,14 +28,14 @@ maleo_foundation/managers/client/google/base.py,sha256=j3W18Pmcu9jJ5wK12bbWBI6r8
 maleo_foundation/managers/client/google/secret.py,sha256=Uh01RoOp8QOIvu8X4AGJzOJRlrfAeXHO8ZFvmKo7A-E,3114
 maleo_foundation/managers/client/google/storage.py,sha256=MPuVpLTl0QJhlBOqpxv5UtD3ANO1WCCE1sRrfHnlCZM,2355
 maleo_foundation/middlewares/__init__.py,sha256=bqE2EIFC3rWcR2AwFPR0fk2kSFfeTRzgA24GbnuT5RA,3697
-maleo_foundation/middlewares/authentication.py,sha256=SC9p_7lCcGYbO9GedOKiPDF12KaGFbv1OypJsnRzLww,3329
-maleo_foundation/middlewares/base.py,sha256=-tpnutxov5UxrKjWMxktpsZ0JqXYLQCkD3x2B3F3OCI,11821
+maleo_foundation/middlewares/authentication.py,sha256=LHyHb5l8loN6aZ9g0bqQdDj9glGV7FY7rL0ZBeoSGT0,3432
+maleo_foundation/middlewares/base.py,sha256=cPCaOMtKfRBUcg5zBpCdQxZCwcxMauQ2Hy7WsBvAhTw,12508
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
 maleo_foundation/models/responses.py,sha256=Ka9Peb1fVuQKaxyy11FVkUPtGtzyEm_9Xfe8Vla3ml0,4764
 maleo_foundation/models/table.py,sha256=Dk5GXeO0gbBBPN2PJtZhlUx2x3vMbT4dxTBc3YLBbuc,1199
 maleo_foundation/models/schemas/__init__.py,sha256=Xj8Ahsqyra-fmEaVcGPok5GOOsPQlKcknHYMvbjvENA,277
-maleo_foundation/models/schemas/general.py,sha256=hEQQPcddxMsJXMb36nqItIAfp3pqUyJOlaD7nXkNM2I,3609
+maleo_foundation/models/schemas/general.py,sha256=KGPP67ciKeL8cvOS3kYrVwmRx3kD33OcS88UmMn1JPE,3822
 maleo_foundation/models/schemas/parameter.py,sha256=K47z2NzmTEhUiOfRiRLyRPXoQurbWsKBL7ObXAxIWRY,2100
 maleo_foundation/models/schemas/result.py,sha256=V3dljS2AdtWW4Pf8YsnQuiCylN1bZtEY1AtYC7okWuI,1747
 maleo_foundation/models/schemas/signature.py,sha256=4DVcsBR9TnxD2R28oWk51jMtF1j5ylmorVM3jDNVlrU,609
@@ -75,7 +75,7 @@ maleo_foundation/utils/loaders/__init__.py,sha256=Dnuv7BWyglSddnbsFb96s-b3KaW7UK
 maleo_foundation/utils/loaders/json.py,sha256=NsXLq3VZSgzmEf99tV1VtrmiudWdQ8Pzh_hI4Rm0cM8,397
 maleo_foundation/utils/loaders/key.py,sha256=GZ4h1ONfp6Xx8-E8AWoGP4ajAZrwPhZRtidjn_u82Qg,2562
 maleo_foundation/utils/loaders/yaml.py,sha256=jr8v3BlgmRCMTzdNgKhIYt1tnubaJXcDSSGkKVR8pbw,362
-maleo_foundation-0.1.61.dist-info/METADATA,sha256=hK2ChHmwvrqLf-cO6UwXWoGSsusrU2UCjkuAhx02nsg,3390
-maleo_foundation-0.1.61.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.61.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.61.dist-info/RECORD,,
+maleo_foundation-0.1.62.dist-info/METADATA,sha256=-zfYv2zsfV92MMIIfXpwF2qWc2tvyh2Zti01BAm1TKE,3390
+maleo_foundation-0.1.62.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.62.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.62.dist-info/RECORD,,