maleo-foundation 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

maleo_foundation/enums.py

@@ -3,6 +3,11 @@ from enum import IntEnum, StrEnum, Enum
 from fastapi import responses
 
 class BaseEnums:
+    class EnvironmentType(StrEnum):
+        LOCAL = "local"
+        STAGING = "staging"
+        PRODUCTION = "production"
+
     class StatusType(StrEnum):
         DELETED = "deleted"
         INACTIVE = "inactive"

maleo_foundation/managers/middleware.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
 from typing import List, Optional
-from maleo_foundation.middlewares.authentication import Backend, add_authentication_middleware
+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
 from maleo_foundation.utils.logging import MiddlewareLogger
@@ -46,16 +46,11 @@ class MiddlewareManager:
         self,
         loggers:MiddlewareLoggers,
         key:str,
-        authentication_backend:Optional[Backend] = None,
         request_processor:Optional[RequestProcessor] = None
     ):
         self.add_cors()
         self.add_base(logger=loggers.base, request_processor=request_processor)
-        if authentication_backend is None:
-            self._authentication_backend = Backend(logger=loggers.authentication, key=key)
-        else:
-            self._authentication_backend = authentication_backend
-        self.add_authentication(backend=self._authentication_backend)
+        self.add_authentication(logger=loggers.authentication, key=key)
 
     def add_cors(self) -> None:
         add_cors_middleware(
@@ -82,9 +77,5 @@ class MiddlewareManager:
             request_processor=request_processor
         )
 
-    def add_authentication(self, logger:MiddlewareLogger, key:str, backend:Optional[Backend] = None):
-        if backend is None:
-            self._authentication_backend = Backend(logger=logger, key=key)
-        else:
-            self._authentication_backend = backend
-        add_authentication_middleware(app=self._app, backend=self._authentication_backend)
+    def add_authentication(self, logger:MiddlewareLogger, key:str):
+        add_authentication_middleware(app=self._app, logger=logger, key=key)

maleo_foundation/managers/service.py

@@ -33,6 +33,7 @@ class LogConfig(BaseModel):
         arbitrary_types_allowed=True
 
 class Settings(BaseSettings):
+    ENVIRONMENT:BaseEnums.EnvironmentType = Field(..., description="Environment")
     GOOGLE_CREDENTIALS_PATH:str = Field("/creds/maleo-google-service-account.json", description="Internal credential's file path")
     INTERNAL_CREDENTIALS_PATH:str = Field("/creds/maleo-internal-service-account.json", description="Internal credential's file path")
     PRIVATE_KEY_PATH:str = Field("/keys/maleo-private-key.pem", description="Maleo's private key path")
@@ -383,7 +384,23 @@ class ServiceManager:
         return self._app
 
     def run_app(self) -> None:
-        uvicorn.run(self._app, host=self._configs.service.host, port=self._configs.service.port, reload=True)
+        if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL:
+            import importlib.util
+            import sys
+            # Get the module path and add it to sys.path if needed
+            spec = importlib.util.find_spec("app")
+            if spec and spec.origin:
+                module_path = os.path.dirname(os.path.dirname(spec.origin))
+                if module_path not in sys.path:
+                    sys.path.insert(0, module_path)
+
+                # Create the import string for uvicorn
+                app_import_string = "app.main:app"
+
+                # Run with reload enabled
+                uvicorn.run(app_import_string, host=self._configs.service.host, port=self._configs.service.port, reload=True)
+        else:
+            uvicorn.run(self._app, host=self._configs.service.host, port=self._configs.service.port)
 
     async def dispose(self) -> None:
         self._loggers.application.info("Disposing service manager")

maleo_foundation/middlewares/authentication.py

@@ -36,7 +36,7 @@ class Backend(AuthenticationBackend):
         self._logger.info(f"Authentication - 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, backend:Backend) -> None:
+def add_authentication_middleware(app:FastAPI, logger:MiddlewareLogger, key:str) -> None:
     """
     Adds Authentication middleware to the FastAPI application.
 
@@ -44,8 +44,11 @@ def add_authentication_middleware(app:FastAPI, backend:Backend) -> None:
         app: FastAPI
             The FastAPI application instance to which the middleware will be added.
 
-        backend: Backend
-            The authentication middleware backend to be used.
+        logger: MiddlewareLogger
+            Authentication middleware logger to be used.
+
+        key: str
+            Public key to be used for token decoding.
 
     Returns:
         None: The function modifies the FastAPI app by adding Base middleware.
@@ -59,4 +62,4 @@ def add_authentication_middleware(app:FastAPI, backend:Backend) -> None:
     add_authentication_middleware(app=app, limit=10, window=1, cleanup_interval=60, ip_timeout=300)
     ```
     """
-    app.add_middleware(AuthenticationMiddleware, backend=backend)
+    app.add_middleware(AuthenticationMiddleware, backend=Backend(logger=logger, key=key))

{maleo_foundation-0.1.22.dist-info → maleo_foundation-0.1.24.dist-info}/METADATA

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

{maleo_foundation-0.1.22.dist-info → maleo_foundation-0.1.24.dist-info}/RECORD

@@ -1,7 +1,7 @@
 maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/authentication.py,sha256=iwc9cGGi5srW3goPRyuZjoPvdyA3XPgYzIEbVl-IW78,842
 maleo_foundation/constants.py,sha256=aBmEfWlBqZxi0k-n6h2NM1YRLOjMnheEiLyQcjP-zCQ,1164
-maleo_foundation/enums.py,sha256=93fqLJvg0oZAXuJSFCf0-gsW8JmB6AkJvZzXLd47dIo,2820
+maleo_foundation/enums.py,sha256=uvwl3dl2r6BoJMEbtSETiLoyJubHup9Lc7VOg7w7zQo,2943
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/types.py,sha256=aKXnIgEhYGSfFqNMGLc4qIKGkINBRpkOo9R9cb2CbwI,2414
 maleo_foundation/clients/__init__.py,sha256=W8vydJYeDEi6gdmOZSBFSSDsfZJtb8C05CHErZgsZ30,188
@@ -31,8 +31,8 @@ maleo_foundation/expanded_types/service.py,sha256=q8jpKdbCbLWwH1UPQavKpVE14rC5rv
 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=Jf0w-9JOAG5X2quDxqqw6d2WUIX7MYGdlPGxWP0rxHs,4699
-maleo_foundation/managers/middleware.py,sha256=uwCKIL7vPGDt4L7uH7ZOdeKZytby1bgTNUOTWQs3tv8,4526
-maleo_foundation/managers/service.py,sha256=RSjaJDjrvzfTE2z0IYpzJMKYnl4BFaF7UEPl3uupH5k,19215
+maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
+maleo_foundation/managers/service.py,sha256=DLp2y7tPQVyBCg8TB5nraeDz4Z5uX-Tr-9thA49QhuE,20040
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=K8AFV2MTZrC1jbTqxkx7eedmxodJirNIjoRXGGcppy4,1022
 maleo_foundation/managers/client/http.py,sha256=dWFZlG1z4TERYBITReR5oSrlzvdhh2EtztVnsU8gCeA,2712
@@ -42,7 +42,7 @@ maleo_foundation/managers/client/google/base.py,sha256=1lrGoyGnYW5Xq05bVXbKqnsqq
 maleo_foundation/managers/client/google/secret.py,sha256=bWR_3Xl_wUFqj4M48w8ZE692U7PQKX9ap0ndDJviV80,3074
 maleo_foundation/managers/client/google/storage.py,sha256=041iSSaFubnZrP-pS8MiLVtOgeLQ591Iz64JekZ5K7o,2350
 maleo_foundation/middlewares/__init__.py,sha256=bqE2EIFC3rWcR2AwFPR0fk2kSFfeTRzgA24GbnuT5RA,3697
-maleo_foundation/middlewares/authentication.py,sha256=acMYZES6OPan6U15s8Nr5C1DC43U2Yz0MY-cla1Zkk4,3072
+maleo_foundation/middlewares/authentication.py,sha256=y67sWz6FLl6NAtUWyK4mxC661dsBeKsDYRH3o7L_ZFQ,3188
 maleo_foundation/middlewares/base.py,sha256=3OaB5F57F3epKNieoAgarYM6PimoUdUl3DgpadtVuqs,11743
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
@@ -83,7 +83,7 @@ maleo_foundation/utils/logging.py,sha256=MwvZmZSA8SIdfq-knEvpYIgqnSpHcyHrZY9TVHW
 maleo_foundation/utils/query.py,sha256=ODQ3adOYQNj5E2cRW9ytbjBz56nEDcnfq8mQ6YZbCCM,4375
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.1.22.dist-info/METADATA,sha256=MK5iu1Yso43P86J7LaFtbt_mwvZBesHvGcNeyP-uHjg,3190
-maleo_foundation-0.1.22.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.22.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.22.dist-info/RECORD,,
+maleo_foundation-0.1.24.dist-info/METADATA,sha256=7yxL5FgFIua_89OydBwsndTLQPfKvMqAZamurVMUHnE,3190
+maleo_foundation-0.1.24.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.24.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.24.dist-info/RECORD,,