maleo-foundation 0.1.86__tar.gz → 0.1.88__tar.gz

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/PKG-INFO

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

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/maleo_foundation/client/manager.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
-from maleo_foundation.managers.client.base import ClientManager
+from maleo_foundation.managers.client.maleo import MaleoClientManager
+from maleo_foundation.managers.service import ServiceManager
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.logging import SimpleConfig
 from maleo_foundation.client.services.encryption import (
@@ -20,11 +21,11 @@ from maleo_foundation.client.services import (
     MaleoFoundationServices
 )
 
-class MaleoFoundationClientManager(ClientManager):
-    def __init__(self, log_config:SimpleConfig, service_key:BaseTypes.OptionalString=None):
+class MaleoFoundationClientManager(MaleoClientManager):
+    def __init__(self, service_manager:ServiceManager):
         key = "maleo-foundation"
         name = "MaleoFoundation"
-        super().__init__(key, name, log_config, service_key)
+        super().__init__(key, name, service_manager)
         self._initialize_services()
         self._logger.info("Client manager initialized successfully")
 

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/maleo_foundation/managers/client/maleo.py

@@ -1,4 +1,5 @@
-from pydantic import BaseModel, Field
+from pydantic import Field
+from maleo_foundation.types import BaseTypes
 from maleo_foundation.managers.client.base import ClientManager, ClientHTTPControllerManager, ClientControllerManagers, ClientHTTPController, ClientServiceControllers, ClientControllers
 from maleo_foundation.managers.service import ServiceManager
 
@@ -22,8 +23,8 @@ class MaleoClientManager(ClientManager):
         self,
         key:str,
         name:str,
-        url:str,
-        service_manager:ServiceManager
+        service_manager:ServiceManager,
+        url:BaseTypes.OptionalString = None
     ):
         self._url = url
         self._service_manager = service_manager
@@ -34,6 +35,8 @@ class MaleoClientManager(ClientManager):
         return self._service_manager
 
     def _initialize_controllers(self) -> None:
+        if self._url is None:
+            raise ValueError("'URL' must not be None if initializing controllers")
         #* Initialize managers
         http_controller_manager = ClientHTTPControllerManager(url=self._url)
         self._controller_managers = ClientControllerManagers(http=http_controller_manager)
@@ -47,5 +50,7 @@ class MaleoClientManager(ClientManager):
 
     async def dispose(self) -> None:
         self._logger.info("Disposing client manager")
-        await self._controller_managers.http.dispose()
+        if self._controller_managers is not None:
+            if self._controller_managers.http is not None:
+                await self._controller_managers.http.dispose()
         self._logger.info("Client manager disposed successfully")

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/maleo_foundation/managers/service.py

@@ -8,7 +8,6 @@ from starlette.exceptions import HTTPException
 from starlette.types import Lifespan, AppType
 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 MaleoFoundationTokenGeneralTransfers
@@ -113,26 +112,6 @@ class Loggers(BaseModel):
     class Config:
         arbitrary_types_allowed=True
 
-class GoogleClientManagers(BaseModel):
-    secret:GoogleSecretManager = Field(..., description="Google secret manager's client manager")
-    storage:GoogleCloudStorage = Field(..., description="Google cloud storage's client manager")
-
-    class Config:
-        arbitrary_types_allowed=True
-
-class MaleoClientManagers(BaseModel):
-    foundation:MaleoFoundationClientManager = Field(..., description="MaleoFoundation's client manager")
-
-    class Config:
-        arbitrary_types_allowed=True
-
-class ClientManagers(BaseModel):
-    google:GoogleClientManagers = Field(..., description="Google's client managers")
-    maleo:MaleoClientManagers = Field(..., description="Maleo's client managers")
-
-    class Config:
-        arbitrary_types_allowed=True
-
 class ServiceManager:
     def __init__(
         self,
@@ -148,12 +127,12 @@ class ServiceManager:
             self._log_config.google_cloud_logging = None
         self._load_google_credentials()
         self._initialize_secret_manager()
+        self._initialize_cloud_storage()
         self._load_maleo_credentials()
         self._load_configs()
         self._load_keys()
         self._initialize_loggers()
         self._initialize_db()
-        self._initialize_clients()
 
     @property
     def log_config(self) -> SimpleConfig:
@@ -174,9 +153,17 @@ class ServiceManager:
         self._secret_manager = GoogleSecretManager(log_config=self._log_config, service_key=self._settings.SERVICE_KEY, credentials=self._google_credentials)
 
     @property
-    def secret_manager(self) -> None:
+    def secret_manager(self) -> GoogleSecretManager:
         return self._secret_manager
 
+    def _initialize_cloud_storage(self) -> None:
+        environment = BaseEnums.EnvironmentType.STAGING if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL else self._settings.ENVIRONMENT
+        self._cloud_storage = GoogleCloudStorage(log_config=self._log_config, service_key=self._settings.SERVICE_KEY, bucket_name=f"maleo-suite-{environment}", credentials=self._google_credentials)
+
+    @property
+    def cloud_storage(self) -> GoogleCloudStorage:
+        return self._cloud_storage
+
     def _load_maleo_credentials(self) -> None:
         email = self._secret_manager.get("maleo-service-account-email")
         username = self._secret_manager.get("maleo-service-account-username")
@@ -241,27 +228,6 @@ class ServiceManager:
     def database(self) -> DatabaseManager:
         return self._database
 
-    def _initialize_clients(self) -> None:
-        secret = self._secret_manager
-        environment = BaseEnums.EnvironmentType.STAGING if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL else self._settings.ENVIRONMENT
-        storage = GoogleCloudStorage(log_config=self._log_config, service_key=self._settings.SERVICE_KEY, bucket_name=f"maleo-suite-{environment}", credentials=self._google_credentials)
-        self._google_clients = GoogleClientManagers(secret=secret, storage=storage)
-        foundation = MaleoFoundationClientManager(log_config=self._log_config, service_key=self._settings.SERVICE_KEY)
-        self._maleo_clients = MaleoClientManagers(foundation=foundation)
-        self._clients = ClientManagers(google=self._google_clients, maleo=self._maleo_clients)
-
-    @property
-    def google_clients(self) -> GoogleClientManagers:
-        self._google_clients
-
-    @property
-    def maleo_clients(self) -> MaleoClientManagers:
-        self._maleo_clients
-
-    @property
-    def clients(self) -> ClientManagers:
-        self._clients
-
     @property
     def token(self) -> str:
         payload = MaleoFoundationTokenGeneralTransfers.BaseEncodePayload(

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.86 → maleo_foundation-0.1.88}/pyproject.toml

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