maleo-foundation 0.1.88__py3-none-any.whl → 0.1.90__py3-none-any.whl

maleo_foundation/client/manager.py

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

maleo_foundation/managers/client/maleo.py

@@ -1,5 +1,4 @@
-from pydantic import Field
-from maleo_foundation.types import BaseTypes
+from pydantic import BaseModel, Field
 from maleo_foundation.managers.client.base import ClientManager, ClientHTTPControllerManager, ClientControllerManagers, ClientHTTPController, ClientServiceControllers, ClientControllers
 from maleo_foundation.managers.service import ServiceManager
 
@@ -23,8 +22,8 @@ class MaleoClientManager(ClientManager):
         self,
         key:str,
         name:str,
-        service_manager:ServiceManager,
-        url:BaseTypes.OptionalString = None
+        url:str,
+        service_manager:ServiceManager
     ):
         self._url = url
         self._service_manager = service_manager
@@ -35,8 +34,6 @@ 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)
@@ -50,7 +47,5 @@ class MaleoClientManager(ClientManager):
 
     async def dispose(self) -> None:
         self._logger.info("Disposing client manager")
-        if self._controller_managers is not None:
-            if self._controller_managers.http is not None:
-                await self._controller_managers.http.dispose()
+        await self._controller_managers.http.dispose()
         self._logger.info("Client manager disposed successfully")

maleo_foundation/managers/service.py

@@ -8,6 +8,7 @@ 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
@@ -133,6 +134,7 @@ class ServiceManager:
         self._load_keys()
         self._initialize_loggers()
         self._initialize_db()
+        self._initialize_foundation()
 
     @property
     def log_config(self) -> SimpleConfig:
@@ -228,6 +230,13 @@ class ServiceManager:
     def database(self) -> DatabaseManager:
         return self._database
 
+    def _initialize_foundation(self) -> None:
+        self._foundation = MaleoFoundationClientManager(log_config=self._log_config, service_key=self._settings.SERVICE_KEY)
+
+    @property
+    def foundation(self) -> MaleoFoundationClientManager:
+        return self._foundation
+
     @property
     def token(self) -> str:
         payload = MaleoFoundationTokenGeneralTransfers.BaseEncodePayload(
@@ -237,7 +246,7 @@ class ServiceManager:
             u_ut="service"
         )
         parameters = MaleoFoundationTokenParametersTransfers.Encode(key=self._keys.private, password=self._keys.password, payload=payload)
-        result = self._clients.maleo.foundation.services.token.encode(parameters=parameters)
+        result = self._foundation.services.token.encode(parameters=parameters)
         if not result.success:
             raise RuntimeError("Failed encoding payload into token")
         return result.data.token
@@ -255,7 +264,7 @@ class ServiceManager:
             configurations=self._configs.middleware,
             keys=self._keys,
             loggers=self._loggers.middleware,
-            maleo_foundation=self._clients.maleo.foundation
+            maleo_foundation=self._foundation
         )
         self._middleware.add_all()
         self._loggers.application.info("Middlewares addedd successfully")

{maleo_foundation-0.1.88.dist-info → maleo_foundation-0.1.90.dist-info}/METADATA

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

{maleo_foundation-0.1.88.dist-info → maleo_foundation-0.1.90.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=5-wGZEwCocg06_cRh0dW5V5cXS2_4mnEMcIHuMvQyIk,2648
+maleo_foundation/client/manager.py,sha256=pFWLFYW4eE9MLyFmFS05IgnMBdqqUHbdyTkSbnBtm5E,2620
 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=Amz0dSeJsSQkAW9ED0VtZUMQdGWtSfTW9RDM6Pp9ScM,15059
+maleo_foundation/managers/service.py,sha256=hPimC1VYQv2e8kZz6omCKWCtnvEnY5Wa1BdqxtFLoo8,15419
 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=-QeJ6dwBtXCVGPk3hQOgy9-Um0v5hpp0-e5zPTzT4w0,2327
+maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
 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
@@ -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.88.dist-info/METADATA,sha256=qm6uc-F3xAXtid3r-beYOBKR5rKXteN_LDhvZ04exbc,3419
-maleo_foundation-0.1.88.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_foundation-0.1.88.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.88.dist-info/RECORD,,
+maleo_foundation-0.1.90.dist-info/METADATA,sha256=s6loO-JepMDGZsq5r3d5SxNnCIxouIhrbAXWBImrRp4,3419
+maleo_foundation-0.1.90.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_foundation-0.1.90.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.90.dist-info/RECORD,,