maleo-foundation 0.3.23__py3-none-any.whl → 0.3.27__py3-none-any.whl

maleo_foundation/managers/configuration.py

@@ -1,18 +1,7 @@
 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.configurations import 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:
@@ -20,77 +9,28 @@ class ConfigurationManager:
         self,
         settings: Settings,
         credential_manager: CredentialManager
-    ):
+    ) -> None:
         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
+        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)
-                return RuntimeConfigurations.model_validate(data)
+                self._configurations = Configurations.model_validate(data)
+                return
 
         secret_data = (
             self
             ._credential_manager
             .secret_manager
-            .get(f"{self._settings.SERVICE_KEY}-runtime-configurations-{self._settings.ENVIRONMENT}")
+            .get(f"/configurations/{self._settings.SERVICE_KEY}-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)
+        self._configurations = Configurations.model_validate(data)
 
     @property
     def configurations(self) -> Configurations:

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/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/models/transfers/general/configurations/client/maleo.py

@@ -1,4 +1,5 @@
 from pydantic import BaseModel, ConfigDict, Field
+from typing import Optional
 
 class MaleoClientConfigurations(BaseModel):
     key: str = Field(..., description="Client's key")
@@ -8,15 +9,15 @@ class MaleoClientConfigurations(BaseModel):
 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")
+    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/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/models/transfers/general/settings.py

@@ -12,21 +12,13 @@ class Settings(BaseSettings):
         "/credentials/maleo-google-service-account.json",
         description="Internal credential's file path"
     )
-    USE_LOCAL_STATIC_CONFIGURATIONS: bool = Field(
+    USE_LOCAL_CONFIGURATIONS: bool = Field(
         False,
-        description="Whether to use local static configurations"
+        description="Whether to use local configurations"
     )
-    STATIC_CONFIGURATIONS_PATH: BaseTypes.OptionalString = Field(
+    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"
+        description="Configurations path"
     )
     KEY_PASSWORD: BaseTypes.OptionalString = Field(
         None,
@@ -41,50 +33,14 @@ class Settings(BaseSettings):
         description="Public key"
     )
 
-    @classmethod
-    @model_validator(mode="before")
-    def define_configurations_path(
-        cls,
-        values: BaseTypes.StringToAnyDict
-    ) -> BaseTypes.StringToAnyDict:
-        # Define and check environment
-        environment: BaseTypes.OptionalString = values.get("ENVIRONMENT", None)
-        if environment is None:
-            raise ValueError("'ENVIRONMENT' variable not defined/found")
-
-        # Define and check service key
-        service_key: BaseTypes.OptionalString = values.get("SERVICE_KEY", None)
-        if service_key is None:
-            raise ValueError("'SERVICE_KEY' variable not defined/found")
-
-        # Define and check use local static configurations
-        use_local_static_configurations: BaseTypes.OptionalBoolean = values.get("USE_LOCAL_STATIC_CONFIGURATIONS", None)
-        if use_local_static_configurations is None:
-            raise ValueError("'USE_LOCAL_STATIC_CONFIGURATIONS' variable not defined/found")
-
-        # Define static configurations path if necessary
-        static_configurations_path: BaseTypes.OptionalString = values.get("STATIC_CONFIGURATIONS_PATH", None)
-        if use_local_static_configurations and static_configurations_path is None:
-            values["STATIC_CONFIGURATIONS_PATH"] = f"/static-configurations/maleo-static-configurations-{environment}.yaml"
-
-        # Define and check use local runtime configurations
-        use_local_runtime_configurations: BaseTypes.OptionalBoolean = values.get("USE_LOCAL_RUNTIME_CONFIGURATIONS", None)
-        if use_local_runtime_configurations is None:
-            raise ValueError("'USE_LOCAL_RUNTIME_CONFIGURATIONS' variable not defined/found")
-
-        # Define runtime configurations path if necessary
-        runtime_configurations_path: BaseTypes.OptionalString = values.get("RUNTIME_CONFIGURATIONS_PATH", None)
-        if use_local_runtime_configurations and runtime_configurations_path is None:
-            values["RUNTIME_CONFIGURATIONS_PATH"] = f"/runtime-configurations/{service_key}-runtime-configurations-{environment}.yaml"
-
-        return values
-
     @model_validator(mode="after")
     def validate_configurations_path(self) -> Self:
-        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:
-            raise ValueError("Runtime configurations path must exist if use local runtime configurations is set to true")
+        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.23.dist-info → maleo_foundation-0.3.27.dist-info}/METADATA

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

{maleo_foundation-0.3.23.dist-info → maleo_foundation-0.3.27.dist-info}/RECORD

@@ -33,7 +33,7 @@ maleo_foundation/expanded_types/encryption/aes.py,sha256=1rj43qjIO0TePpr1mErT_NJ
 maleo_foundation/expanded_types/encryption/rsa.py,sha256=Esf_H8nMz2kOLAWa3M7dlD-sFdFIZylNjB_qB20Yaww,488
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/cache.py,sha256=IgcA-NAJbW83jRyApuQPbSJdth2LUpix9o-5CMWNwdI,274
-maleo_foundation/managers/configuration.py,sha256=IyefI1GDDRYf5FRjxpJ2LfYiRL1fuzIOwrO1aAy5zy0,3814
+maleo_foundation/managers/configuration.py,sha256=B2ho_-QkXh4KkHuiVA_GPrn2QvhoZL_KqNwQCIea_1c,1433
 maleo_foundation/managers/credential.py,sha256=i1w9bVozf7FYG8NGfLgJYRdLWBQBf35yyzVOEDgdXSA,3108
 maleo_foundation/managers/db.py,sha256=y5oP3bTXKeXYKqng-E_HZ-3wC0ZPtl5bls0AEEej6zM,6050
 maleo_foundation/managers/middleware.py,sha256=ecTNloglV67xoC_hqIEMIxhfQwzXRKHLI3ThJdd-lbY,2480
@@ -68,17 +68,17 @@ maleo_foundation/models/transfers/general/credentials.py,sha256=kLS0ymFipQmL3QaA
 maleo_foundation/models/transfers/general/database.py,sha256=bFNPd-1x3jNHPscwCk0besnpwartAeLY2e5PfKVyI4M,1201
 maleo_foundation/models/transfers/general/key.py,sha256=S37SqD3qwTbgMk7785hW7Kl9d4Kouh4uPZcGoyMQ_-Q,755
 maleo_foundation/models/transfers/general/request.py,sha256=xOeBbtXygK5P6DxPyf3C4LIH3nb262tqWsgvALB4yfQ,1792
-maleo_foundation/models/transfers/general/settings.py,sha256=K2gQDBPRqCXGrivKZJuGiyE1mBncGbDJFKg9Lon0Q8k,4114
+maleo_foundation/models/transfers/general/settings.py,sha256=p0PSec_8y-gpYZjx4r29L5QAV68hHikWetGkI9qqeoo,1690
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
 maleo_foundation/models/transfers/general/token.py,sha256=PU-_wLFaY2i8pwRi9-jlk4nh7XzoTKOk0BEsUCGbD80,4979
-maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=DMiBLOnA4Ye2q0-n0EyUU6U8YbpyqRn1l_vl4kuMKAI,2042
+maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=xKU7f5V8I-pEzOXlL0CS82Zo60CqDjdB6Bnp3LUzcsg,1272
 maleo_foundation/models/transfers/general/configurations/database.py,sha256=v-IzSm8kZa1TQByCc8dpIU-8csJN_G2irWeN4EClNlo,690
-maleo_foundation/models/transfers/general/configurations/middleware.py,sha256=UV4vUg936Wb4xq1AMgFGcfPewAIJHswadK25jqoETB8,2254
+maleo_foundation/models/transfers/general/configurations/middleware.py,sha256=-6dk6C2QBDfmTDENhsgyMHpRUGfrSxQY3BDwo_WtgAs,1710
 maleo_foundation/models/transfers/general/configurations/service.py,sha256=8lag1KXkS43IwsMGWka7L-peQ9YT1-dmWeEhQ1hnnLU,304
 maleo_foundation/models/transfers/general/configurations/cache/__init__.py,sha256=a7p5LWkQJlgcfKpdJrKnCfe1LUAnwltXwTOThANlR6s,286
 maleo_foundation/models/transfers/general/configurations/cache/redis.py,sha256=CFUkIgE6OyFeHcVBqShI8NBbG1G0wpJg6b2t8Ssq3OI,1161
-maleo_foundation/models/transfers/general/configurations/client/__init__.py,sha256=BC4KHpGte5ZSw8TH2s_zWDvFEFOGl-mfAOPhtNOREyk,292
-maleo_foundation/models/transfers/general/configurations/client/maleo.py,sha256=d83tJx1e_yR2YiQUwR5fSav_5beoiJSwKBLbqW52yAc,1581
+maleo_foundation/models/transfers/general/configurations/client/__init__.py,sha256=2Iln1K23ad283y_PxVf4Zo25LZrGlrIIYlqm0cCFO5U,331
+maleo_foundation/models/transfers/general/configurations/client/maleo.py,sha256=0ecfHUW-gkmUZBrCINdoFJN9t03VGV9a8ND1D-LpmNc,1741
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=wI2-ML99yn5HR0AciFg2C9EQixrWjbIR8x_bDbqKeDM,4069
 maleo_foundation/models/transfers/parameters/general.py,sha256=-nSIcn0thtodk-69Uwj6qdrX8zfe-PX-gWwD-_VCVyY,779
@@ -133,7 +133,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=ZglnLdW3lHmaKER4mwGe5N5ERus-bdsamfpwGmQYPIo,6344
 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.3.23.dist-info/METADATA,sha256=3H2A66vb8aerq9yrPSCWstkDSk_ujy5awgMqXpTPVGA,3740
-maleo_foundation-0.3.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.23.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.23.dist-info/RECORD,,
+maleo_foundation-0.3.27.dist-info/METADATA,sha256=daIDsRpkAI2bjdV4LqhFm-p31oe6xxfPv_EdHlLj1yA,3740
+maleo_foundation-0.3.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.27.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.27.dist-info/RECORD,,