maleo-foundation 0.1.85__py3-none-any.whl → 0.1.87__py3-none-any.whl

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/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/managers/service.py

@@ -113,26 +113,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 +128,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 +154,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 +229,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/models/schemas/result.py

@@ -4,6 +4,10 @@ from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.types import BaseTypes
 
 class BaseResultSchemas:
+    class BaseRow(BaseModel):
+        class Config:
+            from_attributes=True
+
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
         code:BaseTypes.OptionalString = Field(None, description="Optional result code")

maleo_foundation/models/transfers/results/service/query.py

@@ -7,10 +7,9 @@ class BaseServiceQueryResultsTransfers:
     class Row(
         BaseGeneralSchemas.Status,
         BaseGeneralSchemas.Timestamps,
-        BaseGeneralSchemas.Identifiers
-    ):
-        class Config:
-            from_attributes=True
+        BaseGeneralSchemas.Identifiers,
+        BaseResultSchemas.BaseRow
+    ): pass
 
     class Fail(BaseResultSchemas.Fail): pass
 

{maleo_foundation-0.1.85.dist-info → maleo_foundation-0.1.87.dist-info}/METADATA

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

{maleo_foundation-0.1.85.dist-info → maleo_foundation-0.1.87.dist-info}/RECORD

@@ -5,7 +5,7 @@ maleo_foundation/enums.py,sha256=uvwl3dl2r6BoJMEbtSETiLoyJubHup9Lc7VOg7w7zQo,294
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/types.py,sha256=aKXnIgEhYGSfFqNMGLc4qIKGkINBRpkOo9R9cb2CbwI,2414
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/client/manager.py,sha256=pFWLFYW4eE9MLyFmFS05IgnMBdqqUHbdyTkSbnBtm5E,2620
+maleo_foundation/client/manager.py,sha256=5-wGZEwCocg06_cRh0dW5V5cXS2_4mnEMcIHuMvQyIk,2648
 maleo_foundation/client/services/__init__.py,sha256=uIBnAeQ9a2otQbUAbKBQfYrkEUugXjxXoV8W5QYHuic,1051
 maleo_foundation/client/services/key.py,sha256=Av8OFEJO8-Chlu-lRzR4or1qkJ0ahxtiHwkqF4ktDD4,5537
 maleo_foundation/client/services/signature.py,sha256=brEnNPrkeChx0niDgAYCI2HeANQGHpPI6a0lARGCbZ4,4498
@@ -32,10 +32,10 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=MuhB_DGrjnsl4t96W4pKuCt
 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=ODIQU1Hpu-Xempjjo_VRbVtxiD5oi74mNuoWuDawRh0,4250
-maleo_foundation/managers/service.py,sha256=l5YoDj5mT4B6XtAP4LDF9h93VUkKVQGrgWIZ7nsaklE,16420
+maleo_foundation/managers/service.py,sha256=rXAt2XNy_eeGSd8SEGiYZI9mbh-amj8oUN9iT4_uScw,15132
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=5z9l2GN4QASF0-Lft8o5QQ3SRPXqeNZNT1S1CgaE764,4384
-maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
+maleo_foundation/managers/client/maleo.py,sha256=-QeJ6dwBtXCVGPk3hQOgy9-Um0v5hpp0-e5zPTzT4w0,2327
 maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/google/base.py,sha256=eIdd6C2BFIu4EyZ1j017VZaJn_nSTPGFftBwQmVAUDA,1366
 maleo_foundation/managers/client/google/secret.py,sha256=Ski1CHYeA8vjSk2Oc2Pf4CfFrzT_RcA6NEZwza7gM7Y,4464
@@ -52,7 +52,7 @@ maleo_foundation/models/schemas/general.py,sha256=KGPP67ciKeL8cvOS3kYrVwmRx3kD33
 maleo_foundation/models/schemas/hash.py,sha256=db2uyCeUzvF2zDCcbiZMh1MxIOGOGezOMOx-M1ta4zI,441
 maleo_foundation/models/schemas/key.py,sha256=7FZxVqTL5qRK48AXL1odrMNhAwhwtCwSkBUPsJwuBII,594
 maleo_foundation/models/schemas/parameter.py,sha256=K47z2NzmTEhUiOfRiRLyRPXoQurbWsKBL7ObXAxIWRY,2100
-maleo_foundation/models/schemas/result.py,sha256=V3dljS2AdtWW4Pf8YsnQuiCylN1bZtEY1AtYC7okWuI,1747
+maleo_foundation/models/schemas/result.py,sha256=fvS7yxqdCmBgU-zIcS0QkoFzuGRfPotFCRVk6uk1Lz8,1833
 maleo_foundation/models/schemas/signature.py,sha256=-5ldTnJsjwqPRbHw7PFcLKITqEXJ_qKDdRHShK75NVA,620
 maleo_foundation/models/schemas/token.py,sha256=oaK4XVb-2q31ooZMwPDfQhaGFLzs2QZxEgIGz8rp_Y4,562
 maleo_foundation/models/transfers/__init__.py,sha256=oJLJ3Geeme6vBw7R2Dhvdvg4ziVvzEYAGJaP-tm_90w,299
@@ -88,7 +88,7 @@ maleo_foundation/models/transfers/results/encryption/aes.py,sha256=yx3hZNhge2lfj
 maleo_foundation/models/transfers/results/encryption/rsa.py,sha256=hlCtiT1TZwmMBEn-sgGs-WocNEmJ4qxWcHS5y9m7Voc,683
 maleo_foundation/models/transfers/results/service/__init__.py,sha256=dTjHe1iGIpdulrzawQoOj003sxxObumF63YpUptKrDA,390
 maleo_foundation/models/transfers/results/service/general.py,sha256=G4x-MhQI7Km9UAcx2uJmrsqA6RBvxpH6VFAd_ynFFd4,1486
-maleo_foundation/models/transfers/results/service/query.py,sha256=G5A4FRkHyRRlpuGWrPV5-vqgyyBjMqu8f-Ka9BjD0lA,1828
+maleo_foundation/models/transfers/results/service/query.py,sha256=9Nl_BDHf9cGMY4mMfgs0VFgMHWM0UKEjsUh9FgwOwb8,1813
 maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256=HZJWMy2dskzOCzLmp_UaL9rjbQ-sDMI7sd2bXb-4QOU,175
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/utils/__init__.py,sha256=SRPEVoqjZoO6W8rtF_Ti8VIangg6Auwm6eHbZMdOthY,520
@@ -107,7 +107,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=deksZXT5wPhEsSMHbZ3x05WHXxCjLDt76Ns-1Tmhp7g,948
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.1.85.dist-info/METADATA,sha256=sg3XSlU15Aog8U__kh4pcz3yctxyUpRbh9SLX8nF3-c,3419
-maleo_foundation-0.1.85.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_foundation-0.1.85.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.85.dist-info/RECORD,,
+maleo_foundation-0.1.87.dist-info/METADATA,sha256=fHG1758lVh2m6laf255Ny581zX92lPSX4OSxDcDi5yc,3419
+maleo_foundation-0.1.87.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_foundation-0.1.87.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.87.dist-info/RECORD,,