maleo-foundation 0.1.32__tar.gz → 0.1.33__tar.gz

{maleo_foundation-0.1.32 → maleo_foundation-0.1.33}/PKG-INFO

@@ -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 → maleo_foundation-0.1.33}/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-0.1.32 → maleo_foundation-0.1.33}/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 → maleo_foundation-0.1.33}/maleo_foundation.egg-info/PKG-INFO

@@ -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 → maleo_foundation-0.1.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.1.32"
+version = "0.1.33"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }