maleo-foundation 0.1.32__py3-none-any.whl → 0.1.33__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -40,7 +40,6 @@ class Settings(BaseSettings):
     PUBLIC_KEY_PATH:str = Field("/keys/maleo-public-key.pem", description="Maleo's public key path")
     KEY_PASSWORD:str = Field(..., description="Maleo key's password")
     CONFIGURATIONS_PATH:str = Field(..., description="Service's configuration file path")
-    GCS_BUCKET_NAME:str = Field(..., description="Google cloud storage (GCS)'s bucket name")
 
 class Keys(BaseModel):
     password:str = Field(..., description="Key's password")
@@ -90,6 +89,12 @@ class DatabaseConfigurations(BaseModel):
     def url(self) -> str:
         return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"
 
+class GoogleCloudStorageConfigurations(BaseModel):
+    bucket_name:str = Field(..., description="Bucket's name")
+
+class GoogleClientConfigurations(BaseModel):
+    storage:GoogleCloudStorageConfigurations = Field(..., description="Google cloud storage client configurations")
+
 class MaleoClientConfiguration(BaseModel):
     key:str = Field(..., description="Client's key")
     name:str = Field(..., description="Client's name")
@@ -113,8 +118,12 @@ class MaleoClientConfigurations(BaseModel):
         arbitrary_types_allowed=True
 
 class ClientConfigurations(BaseModel):
+    google:GoogleClientConfigurations = Field(..., description="Google client's configurations")
     maleo:MaleoClientConfigurations = Field(..., description="Maleo client's configurations")
 
+    class Config:
+        arbitrary_types_allowed=True
+
 class Configurations(BaseModel):
     service:ServiceConfigurations = Field(..., description="Service's configurations")
     middleware:MiddlewareConfigurations = Field(..., description="Middleware's configurations")
@@ -315,7 +324,7 @@ class ServiceManager:
     def _initialize_clients(self) -> None:
         #* Initialize google clients
         secret = GoogleSecretManager(**self._log_config.model_dump())
-        storage = GoogleCloudStorage(**self._log_config.model_dump())
+        storage = GoogleCloudStorage(**self._log_config.model_dump(), bucket_name=self._configs.client.google.storage.bucket_name)
         self._google_clients = GoogleClientManagers(secret=secret, storage=storage)
         #* Initialize http clients
         self._http_client = HTTPClientManager

maleo_foundation/middlewares/authentication.py

@@ -18,22 +18,22 @@ class Backend(AuthenticationBackend):
     async def authenticate(self, conn:HTTPConnection) -> Tuple[Credentials, User]:
         client_ip = extract_client_ip(conn)
         if "Authorization" not in conn.headers:
-            self._logger.info(f"Authentication - Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Header did not contain authorization")
+            self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Header did not contain authorization")
             return Credentials(), User(authenticated=False)
 
         auth = conn.headers["Authorization"]
         scheme, token = auth.split()
         if scheme != 'Bearer':
-            self._logger.info(f"Authentication - Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Authorization scheme is not Bearer")
+            self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Authorization scheme is not Bearer")
             return Credentials(), User(authenticated=False)
 
         decode_token_parameters = BaseTokenParametersTransfers.Decode(key=self._key, token=token)
         decode_token_result = BaseTokenService.decode(parameters=decode_token_parameters)
         if not decode_token_result.success:
-            self._logger.error(f"Authentication - Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Failed decoding authorization token")
+            self._logger.error(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Failed decoding authorization token")
             return Credentials(token=token), User(authenticated=False)
 
-        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}")
+        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, key:str) -> None:

{maleo_foundation-0.1.32.dist-info → maleo_foundation-0.1.33.dist-info}/METADATA

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

{maleo_foundation-0.1.32.dist-info → maleo_foundation-0.1.33.dist-info}/RECORD

@@ -32,7 +32,7 @@ maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQw
 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=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
-maleo_foundation/managers/service.py,sha256=FVsMitDat1UYIsEz0S1HGHQhoP9Oj4AlcjIF1zyKmjM,20026
+maleo_foundation/managers/service.py,sha256=JlE-aKAr0q0ztJ6I50_R2TcVctu6TaUWGoyHUEWgcIM,20423
 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=y67sWz6FLl6NAtUWyK4mxC661dsBeKsDYRH3o7L_ZFQ,3188
+maleo_foundation/middlewares/authentication.py,sha256=j1IcNnsfVVgDL4eVPP3LARjh5rKHm2KUEfS3E3j7snc,3120
 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.32.dist-info/METADATA,sha256=kJKuK_VSe2qGOGE39crL6srneNL_X1LMUBOs_TTtCZ8,3190
-maleo_foundation-0.1.32.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.32.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.32.dist-info/RECORD,,
+maleo_foundation-0.1.33.dist-info/METADATA,sha256=QZECMQ-23FYQBioeOoYSKKA8I4eUTQpD1JobLMdX6p8,3190
+maleo_foundation-0.1.33.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.33.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.33.dist-info/RECORD,,