maleo-foundation 0.3.25__tar.gz → 0.3.29__tar.gz

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/PKG-INFO

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

maleo_foundation-0.3.29/maleo_foundation/managers/configuration.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+from maleo_foundation.models.transfers.general.configurations import Configurations
+from maleo_foundation.models.transfers.general.settings import Settings
+from maleo_foundation.utils.loaders.yaml import YAMLLoader
+from .credential import CredentialManager
+
+class ConfigurationManager:
+    def __init__(
+        self,
+        settings: Settings,
+        credential_manager: CredentialManager
+    ) -> None:
+        self._settings = settings
+        self._credential_manager = credential_manager
+
+        use_local = self._settings.USE_LOCAL_CONFIGURATIONS
+        config_path = self._settings.CONFIGURATIONS_PATH
+
+        if use_local and config_path is not None and isinstance(config_path, str):
+            config_path = Path(config_path)
+            if config_path.exists() and config_path.is_file():
+                data = YAMLLoader.load_from_path(config_path)
+                self._configurations = Configurations.model_validate(data)
+                return
+
+        secret_data = (
+            self
+            ._credential_manager
+            .secret_manager
+            .get(f"{self._settings.SERVICE_KEY}-configurations-{self._settings.ENVIRONMENT}")
+        )
+        data = YAMLLoader.load_from_string(secret_data)
+        self._configurations = Configurations.model_validate(data)
+
+    @property
+    def configurations(self) -> Configurations:
+        return self._configurations

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/maleo_foundation/models/transfers/general/configurations/__init__.py

@@ -3,34 +3,17 @@ from maleo_foundation.utils.logging import MiddlewareLogger, ServiceLogger
 from .cache import CacheConfigurations
 from .client import ClientConfigurations
 from .database import DatabaseConfigurations
-from .middleware import (
-    MiddlewareRuntimeConfigurations,
-    MiddlewareStaticConfigurations,
-    MiddlewareConfigurations
-)
+from .middleware import MiddlewareConfigurations
 from .service import ServiceConfigurations
 
-class RuntimeConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    service: ServiceConfigurations = Field(..., description="Service's configurations")
-    middleware: MiddlewareRuntimeConfigurations = Field(..., description="Middleware's runtime configurations")
-    database: DatabaseConfigurations = Field(..., description="Database's configurations")
-
-class StaticConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    middleware: MiddlewareStaticConfigurations = Field(..., description="Middleware's static configurations")
-    client: ClientConfigurations = Field(..., description="Client's configurations")
-
 class Configurations(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    service: ServiceConfigurations = Field(..., description="Service's configurations")
-    middleware: MiddlewareConfigurations = Field(..., description="Middleware's configurations")
     cache: CacheConfigurations = Field(..., description="Cache's configurations")
-    database: DatabaseConfigurations = Field(..., description="Database's configurations")
     client: ClientConfigurations = Field(..., description="Client's configurations")
+    database: DatabaseConfigurations = Field(..., description="Database's configurations")
+    middleware: MiddlewareConfigurations = Field(..., description="Middleware's configurations")
+    service: ServiceConfigurations = Field(..., description="Service's configurations")
 
 class Loggers(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/maleo_foundation/models/transfers/general/configurations/client/__init__.py

@@ -4,4 +4,4 @@ from .maleo import MaleoClientsConfigurations
 class ClientConfigurations(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    maleo: MaleoClientsConfigurations = Field(..., description="Maleo client's configurations")
+    maleo: MaleoClientsConfigurations = Field(default_factory=MaleoClientsConfigurations, description="Maleo client's configurations")

maleo_foundation-0.3.29/maleo_foundation/models/transfers/general/configurations/client/maleo.py

@@ -0,0 +1,23 @@
+from pydantic import BaseModel, ConfigDict, Field
+from typing import Optional
+
+class MaleoClientConfigurations(BaseModel):
+    key: str = Field(..., description="Client's key")
+    name: str = Field(..., description="Client's name")
+    url: str = Field(..., description="Client's URL")
+
+class MaleoClientsConfigurations(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    telemetry: Optional[MaleoClientConfigurations] = Field(None, description="MaleoTelemetry client's configuration")
+    metadata: Optional[MaleoClientConfigurations] = Field(None, description="MaleoMetadata client's configuration")
+    identity: Optional[MaleoClientConfigurations] = Field(None, description="MaleoIdentity client's configuration")
+    access: Optional[MaleoClientConfigurations] = Field(None, description="MaleoAccess client's configuration")
+    workshop: Optional[MaleoClientConfigurations] = Field(None, description="MaleoWorkshop client's configuration")
+    soapie: Optional[MaleoClientConfigurations] = Field(None, description="MaleoSOAPIE client's configuration")
+    medix: Optional[MaleoClientConfigurations] = Field(None, description="MaleoMedix client's configuration")
+    dicom: Optional[MaleoClientConfigurations] = Field(None, description="MaleoDICOM client's configuration")
+    scribe: Optional[MaleoClientConfigurations] = Field(None, description="MaleoScribe client's configuration")
+    cds: Optional[MaleoClientConfigurations] = Field(None, description="MaleoCDS client's configuration")
+    imaging: Optional[MaleoClientConfigurations] = Field(None, description="MaleoImaging client's configuration")
+    mcu: Optional[MaleoClientConfigurations] = Field(None, description="MaleoMCU client's configuration")

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/maleo_foundation/models/transfers/general/configurations/middleware.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, Field
 from typing import List
 
 _ALLOW_METHODS: List[str] = [
@@ -34,23 +34,12 @@ class GeneralMiddlewareConfigurations(BaseModel):
 class CORSMiddlewareConfigurations(BaseModel):
     expose_headers: List[str] = Field(_EXPOSE_HEADERS, description="Exposed headers")
 
-class MiddlewareStaticConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    general: GeneralMiddlewareConfigurations = Field(..., description="Middleware's general configurations")
-    cors: CORSMiddlewareConfigurations = Field(..., description="CORS middleware's configurations")
-
 class BaseMiddlewareConfigurations(BaseModel):
     limit: int = Field(10, description="Request limit (per 'window' seconds)")
     window: int = Field(1, description="Request limit window (seconds)")
     cleanup_interval: int = Field(60, description="Interval for middleware cleanup (seconds)")
     ip_timeout: int = Field(300, description="Idle IP's timeout (seconds)")
 
-class MiddlewareRuntimeConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    base: BaseMiddlewareConfigurations = Field(..., description="Base middleware's configurations")
-
 class MiddlewareConfigurations(BaseModel):
     general: GeneralMiddlewareConfigurations = Field(..., description="Middleware's general configurations")
     cors: CORSMiddlewareConfigurations = Field(..., description="CORS middleware's configurations")

maleo_foundation-0.3.29/maleo_foundation/models/transfers/general/settings.py

@@ -0,0 +1,46 @@
+from pydantic_settings import BaseSettings
+from pydantic import Field, model_validator
+from typing import Self
+from maleo_foundation.enums import BaseEnums
+from maleo_foundation.types import BaseTypes
+
+class Settings(BaseSettings):
+    ENVIRONMENT: BaseEnums.EnvironmentType = Field(..., description="Environment")
+    SERVICE_KEY: str = Field(..., description="Service's key")
+    ROOT_PATH: str = Field("", description="Application's root path")
+    GOOGLE_CREDENTIALS_PATH: str = Field(
+        "/credentials/maleo-google-service-account.json",
+        description="Internal credential's file path"
+    )
+    USE_LOCAL_CONFIGURATIONS: bool = Field(
+        False,
+        description="Whether to use local configurations"
+    )
+    CONFIGURATIONS_PATH: BaseTypes.OptionalString = Field(
+        None,
+        description="Configurations path"
+    )
+    KEY_PASSWORD: BaseTypes.OptionalString = Field(
+        None,
+        description="Key's password"
+    )
+    PRIVATE_KEY: BaseTypes.OptionalString = Field(
+        None,
+        description="Private key"
+    )
+    PUBLIC_KEY: BaseTypes.OptionalString = Field(
+        None,
+        description="Public key"
+    )
+
+    @model_validator(mode="after")
+    def validate_configurations_path(self) -> Self:
+        if self.USE_LOCAL_CONFIGURATIONS and self.CONFIGURATIONS_PATH is None:
+            self.CONFIGURATIONS_PATH = (
+                f"/configurations/{self.SERVICE_KEY}-configurations-{self.ENVIRONMENT}.yaml"
+            )
+
+        if self.USE_LOCAL_CONFIGURATIONS and self.CONFIGURATIONS_PATH is None:
+            raise ValueError("Configurations path must exist if use local configurations is set to true")
+
+        return self

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.3.25 → maleo_foundation-0.3.29}/pyproject.toml

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

maleo_foundation-0.3.25/maleo_foundation/managers/configuration.py

@@ -1,97 +0,0 @@
-from pathlib import Path
-from maleo_foundation.models.transfers.general.configurations.cache.redis import (
-    RedisCacheNamespaces,
-    RedisCacheConfigurations
-)
-from maleo_foundation.models.transfers.general.configurations.cache \
-    import CacheConfigurations
-from maleo_foundation.models.transfers.general.configurations import (
-    RuntimeConfigurations,
-    StaticConfigurations,
-    Configurations
-)
-from maleo_foundation.models.transfers.general.settings import Settings
-from maleo_foundation.utils.loaders.yaml import YAMLLoader
-from maleo_foundation.utils.merger import deep_merge
-from .credential import CredentialManager
-
-class ConfigurationManager:
-    def __init__(
-        self,
-        settings: Settings,
-        credential_manager: CredentialManager
-    ):
-        self._settings = settings
-        self._credential_manager = credential_manager
-
-        self._load_configurations()
-
-    def _load_static_configurations(self) -> StaticConfigurations:
-        use_local = self._settings.USE_LOCAL_STATIC_CONFIGURATIONS
-        config_path = self._settings.STATIC_CONFIGURATIONS_PATH
-
-        if use_local and config_path is not None and isinstance(config_path, str):
-            config_path = Path(config_path)
-            if config_path.exists() and config_path.is_file():
-                data = YAMLLoader.load_from_path(config_path)
-                return StaticConfigurations.model_validate(data)
-
-        secret_data = (
-            self
-            ._credential_manager
-            .secret_manager
-            .get(f"maleo-static-configurations-{self._settings.ENVIRONMENT}")
-        )
-        data = YAMLLoader.load_from_string(secret_data)
-        return StaticConfigurations.model_validate(data)
-
-    def _load_runtime_configurations(self) -> RuntimeConfigurations:
-        use_local = self._settings.USE_LOCAL_STATIC_CONFIGURATIONS
-        config_path = self._settings.RUNTIME_CONFIGURATIONS_PATH
-
-        if use_local and config_path is not None and isinstance(config_path, str):
-            config_path = Path(config_path)
-            if config_path.exists() and config_path.is_file():
-                data = YAMLLoader.load_from_path(config_path)
-                return RuntimeConfigurations.model_validate(data)
-
-        secret_data = (
-            self
-            ._credential_manager
-            .secret_manager
-            .get(f"{self._settings.SERVICE_KEY}-runtime-configurations-{self._settings.ENVIRONMENT}")
-        )
-        data = YAMLLoader.load_from_string(secret_data)
-        return RuntimeConfigurations.model_validate(data)
-
-    def _load_cache_configurations(self) -> CacheConfigurations:
-        namespaces = RedisCacheNamespaces(base=self._settings.SERVICE_KEY)
-        host = self._credential_manager.secret_manager.get(
-            f"maleo-redis-host-{self._settings.ENVIRONMENT}"
-        )
-        password = self._credential_manager.secret_manager.get(
-            f"maleo-redis-password-{self._settings.ENVIRONMENT}"
-        )
-        redis = RedisCacheConfigurations(
-            namespaces=namespaces, 
-            host=host, 
-            password=password
-        )
-        return CacheConfigurations(redis=redis)
-
-    def _load_configurations(self) -> None:
-        static_configurations = self._load_static_configurations()
-        runtime_configurations = self._load_runtime_configurations()
-        cache_configurations = self._load_cache_configurations()
-
-        merged_configurations = deep_merge(
-            static_configurations.model_dump(),
-            runtime_configurations.model_dump(),
-            {"cache": cache_configurations.model_dump()}
-        )
-
-        self._configurations = Configurations.model_validate(merged_configurations)
-
-    @property
-    def configurations(self) -> Configurations:
-        return self._configurations

maleo_foundation-0.3.25/maleo_foundation/models/transfers/general/configurations/client/maleo.py

@@ -1,22 +0,0 @@
-from pydantic import BaseModel, ConfigDict, Field
-
-class MaleoClientConfigurations(BaseModel):
-    key: str = Field(..., description="Client's key")
-    name: str = Field(..., description="Client's name")
-    url: str = Field(..., description="Client's URL")
-
-class MaleoClientsConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    telemetry: MaleoClientConfigurations = Field(..., description="MaleoTelemetry client's configuration")
-    metadata: MaleoClientConfigurations = Field(..., description="MaleoMetadata client's configuration")
-    identity: MaleoClientConfigurations = Field(..., description="MaleoIdentity client's configuration")
-    access: MaleoClientConfigurations = Field(..., description="MaleoAccess client's configuration")
-    workshop: MaleoClientConfigurations = Field(..., description="MaleoWorkshop client's configuration")
-    soapie: MaleoClientConfigurations = Field(..., description="MaleoSOAPIE client's configuration")
-    medix: MaleoClientConfigurations = Field(..., description="MaleoMedix client's configuration")
-    dicom: MaleoClientConfigurations = Field(..., description="MaleoDICOM client's configuration")
-    scribe: MaleoClientConfigurations = Field(..., description="MaleoScribe client's configuration")
-    cds: MaleoClientConfigurations = Field(..., description="MaleoCDS client's configuration")
-    imaging: MaleoClientConfigurations = Field(..., description="MaleoImaging client's configuration")
-    mcu: MaleoClientConfigurations = Field(..., description="MaleoMCU client's configuration")

maleo_foundation-0.3.25/maleo_foundation/models/transfers/general/settings.py

@@ -1,62 +0,0 @@
-from pydantic_settings import BaseSettings
-from pydantic import Field, model_validator
-from typing import Self
-from maleo_foundation.enums import BaseEnums
-from maleo_foundation.types import BaseTypes
-
-class Settings(BaseSettings):
-    ENVIRONMENT: BaseEnums.EnvironmentType = Field(..., description="Environment")
-    SERVICE_KEY: str = Field(..., description="Service's key")
-    ROOT_PATH: str = Field("", description="Application's root path")
-    GOOGLE_CREDENTIALS_PATH: str = Field(
-        "/credentials/maleo-google-service-account.json",
-        description="Internal credential's file path"
-    )
-    USE_LOCAL_STATIC_CONFIGURATIONS: bool = Field(
-        False,
-        description="Whether to use local static configurations"
-    )
-    STATIC_CONFIGURATIONS_PATH: BaseTypes.OptionalString = Field(
-        None,
-        description="Maleo's static configurations path"
-    )
-    USE_LOCAL_RUNTIME_CONFIGURATIONS: bool = Field(
-        False,
-        description="Whether to use local runtime configurations"
-    )
-    RUNTIME_CONFIGURATIONS_PATH: BaseTypes.OptionalString = Field(
-        None,
-        description="Service's runtime configurations path"
-    )
-    KEY_PASSWORD: BaseTypes.OptionalString = Field(
-        None,
-        description="Key's password"
-    )
-    PRIVATE_KEY: BaseTypes.OptionalString = Field(
-        None,
-        description="Private key"
-    )
-    PUBLIC_KEY: BaseTypes.OptionalString = Field(
-        None,
-        description="Public key"
-    )
-
-    @model_validator(mode="after")
-    def validate_configurations_path(self) -> Self:
-        if self.USE_LOCAL_STATIC_CONFIGURATIONS and self.STATIC_CONFIGURATIONS_PATH is None:
-            self.STATIC_CONFIGURATIONS_PATH = (
-                f"/static-configurations/maleo-static-configurations-{self.ENVIRONMENT}.yaml"
-            )
-
-        if self.USE_LOCAL_STATIC_CONFIGURATIONS and self.STATIC_CONFIGURATIONS_PATH is None:
-            raise ValueError("Static configurations path must exist if use local static configurations is set to true")
-
-        if self.USE_LOCAL_RUNTIME_CONFIGURATIONS and self.RUNTIME_CONFIGURATIONS_PATH is None:
-            self.RUNTIME_CONFIGURATIONS_PATH = (
-                f"/runtime-configurations/{self.SERVICE_KEY}-runtime-configurations-{self.ENVIRONMENT}.yaml"
-            )
-
-        if self.USE_LOCAL_RUNTIME_CONFIGURATIONS and self.RUNTIME_CONFIGURATIONS_PATH is None:
-            raise ValueError("Runtime configurations path must exist if use local runtime configurations is set to true")
-
-        return self