maleo-foundation 0.1.8__tar.gz → 0.1.9__tar.gz

{maleo_foundation-0.1.8 → maleo_foundation-0.1.9}/PKG-INFO

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

{maleo_foundation-0.1.8 → maleo_foundation-0.1.9}/maleo_foundation/managers/service.py

@@ -18,6 +18,10 @@ from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.keyloader import load_key
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, ClientLoggerManager
 
+class LogConfig(BaseModel):
+    logs_dir:str = Field(..., description="Logs directory")
+    google_cloud_logging:GoogleCloudLogging = Field(..., description="Google cloud's logging")
+
 class Settings(BaseSettings):
     GOOGLE_CREDENTIALS_PATH:str = Field("/creds/maleo-google-service-account.json", description="Internal credential's file path")
     INTERNAL_CREDENTIALS_PATH:str = Field("/creds/maleo-internal-service-account.json", description="Internal credential's file path")
@@ -77,10 +81,36 @@ class DatabaseConfigurations(BaseModel):
     def url(self) -> str:
         return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"
 
+class MaleoClientConfiguration(BaseModel):
+    key:str = Field(..., description="Client's key")
+    name:str = Field(..., description="Client's name")
+    url:str = Field(..., description="Client's URL")
+
+class MaleoClientConfigurations(BaseModel):
+    metadata:MaleoClientConfiguration = Field(..., description="MaleoMetadata client's configuration")
+    security:MaleoClientConfiguration = Field(..., description="MaleoSecurity client's configuration")
+    storage:MaleoClientConfiguration = Field(..., description="MaleoStorage client's configuration")
+    identity:MaleoClientConfiguration = Field(..., description="MaleoIdentity client's configuration")
+    access:MaleoClientConfiguration = Field(..., description="MaleoAccess client's configuration")
+    soapie:MaleoClientConfiguration = Field(..., description="MaleoSOAPIE client's configuration")
+    fhir:MaleoClientConfiguration = Field(..., description="MaleoFHIR client's configuration")
+    dicom:MaleoClientConfiguration = Field(..., description="MaleoDICOM client's configuration")
+    scribe:MaleoClientConfiguration = Field(..., description="MaleoScribe client's configuration")
+    cds:MaleoClientConfiguration = Field(..., description="MaleoCDS client's configuration")
+    imaging:MaleoClientConfiguration = Field(..., description="MaleoImaging client's configuration")
+    mcu:MaleoClientConfiguration = Field(..., description="MaleoMCU client's configuration")
+
+    class Config:
+        arbitrary_types_allowed=True
+
+class ClientConfigurations(BaseModel):
+    maleo:MaleoClientConfigurations = Field(..., description="Maleo client's configurations")
+
 class Configurations(BaseModel):
     service:ServiceConfigurations = Field(..., description="Service's configurations")
     middleware:MiddlewareConfigurations = Field(..., description="Middleware's configurations")
     database:DatabaseConfigurations = Field(..., description="Database's configurations")
+    client:ClientConfigurations = Field(...)
 
     class Config:
         arbitrary_types_allowed=True
@@ -103,6 +133,23 @@ class GoogleClientManagers(BaseModel):
     class Config:
         arbitrary_types_allowed=True
 
+class MaleoClientManagerClasses(BaseModel):
+    metadata:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoMetadata client manager")
+    security:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoSecurity client manager")
+    storage:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoStorage client manager")
+    identity:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoIdentity client manager")
+    access:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoAccess client manager")
+    soapie:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoSOAPIE client manager")
+    fhir:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoFHIR client manager")
+    dicom:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoDICOM client manager")
+    scribe:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoScribe client manager")
+    cds:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoCDS client manager")
+    imaging:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoImaging client manager")
+    mcu:Optional[Type[MaleoClientManager]] = Field(None, description="MaleoMCU client manager")
+
+    class Config:
+        arbitrary_types_allowed=True
+
 class MaleoClientManagers(BaseModel):
     metadata:Optional[MaleoClientManager] = Field(None, description="MaleoMetadata client manager")
     security:Optional[MaleoClientManager] = Field(None, description="MaleoSecurity client manager")
@@ -136,6 +183,7 @@ class ServiceManager:
         settings:Optional[Settings] = None,
         google_cloud_logging:Optional[GoogleCloudLogging] = None,
         client_logger_managers:ClientLoggerManagers = {},
+        maleo_client_manager_classes:Optional[MaleoClientManagerClasses] = None,
         maleo_client_managers:Optional[MaleoClientManagers] = None
     ):
         self._db_metadata = db_metadata
@@ -162,6 +210,11 @@ class ServiceManager:
         else:
             self._google_cloud_logging = google_cloud_logging
 
+        self._log_config = LogConfig(
+            logs_dir=self._logs_dir,
+            google_cloud_logging=self._google_cloud_logging
+        )
+
         self._client_logger_managers = client_logger_managers
         self._initialize_loggers()
         self._load_credentials()
@@ -169,10 +222,14 @@ class ServiceManager:
         self._initialize_db()
 
         #* Initialize maleo client managers
+        if maleo_client_manager_classes is None:
+            self._maleo_client_manager_classes = MaleoClientManagerClasses()
+        else:
+            self._maleo_client_manager_classes = maleo_client_manager_classes
         if maleo_client_managers is None:
-            self._maleo_client_managers = MaleoClientManagers()
+            self._maleo_clients = MaleoClientManagers()
         else:
-            self._maleo_client_managers = maleo_client_managers
+            self._maleo_clients = maleo_client_managers
         self._initialize_clients()
 
     @property
@@ -182,6 +239,10 @@ class ServiceManager:
     @property
     def logs_dir(self) -> str:
         return self._logs_dir
+    
+    @property
+    def log_config(self) -> LogConfig:
+        return self._log_config
 
     @property
     def settings(self) -> Settings:
@@ -260,7 +321,11 @@ class ServiceManager:
         #* Initialize http clients
         self._http_client = HTTPClientManager
         self._http_client.initialize()
-        self._clients = ClientManagers(google=self._google_clients, http=self._http_client, maleo=self._maleo_client_managers)
+        #* Initialize maleo clients
+        self._maleo_clients = MaleoClientManagers()
+        if self._maleo_client_manager_classes.metadata is not None and issubclass(self._maleo_client_manager_classes.metadata, MaleoClientManager):
+            self._maleo_clients.metadata = self._maleo_client_manager_classes.metadata(**self._configs.client.maleo.metadata.model_dump(), **self._log_config.model_dump())
+        self._clients = ClientManagers(google=self._google_clients, http=self._http_client, maleo=self._maleo_clients)
 
     @property
     def google_clients(self) -> GoogleClientManagers:
@@ -270,6 +335,10 @@ class ServiceManager:
     def http_client(self) -> Type[HTTPClientManager]:
         return self._http_client
 
+    @property
+    def maleo_clients(self) -> MaleoClientManagers:
+        return self._maleo_clients
+
     @property
     def clients(self) -> ClientManagers:
         return self._clients

{maleo_foundation-0.1.8 → maleo_foundation-0.1.9}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.8 → maleo_foundation-0.1.9}/pyproject.toml

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