maleo-foundation 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

maleo_foundation/managers/client/maleo.py

@@ -63,7 +63,7 @@ class MaleoClientManager(ClientManager):
             key,
             name,
             service_manager.log_config,
-            service_manager.configs.service.key
+            service_manager.configurations.service.key
         )
 
     @property

maleo_foundation/managers/configuration.py

@@ -5,8 +5,6 @@ from maleo_foundation.models.transfers.general.configurations.cache.redis import
 )
 from maleo_foundation.models.transfers.general.configurations.cache \
     import CacheConfigurations
-from maleo_foundation.models.transfers.general.configurations.database \
-    import DatabaseConfigurations
 from maleo_foundation.models.transfers.general.configurations import (
     RuntimeConfigurations,
     StaticConfigurations,
@@ -23,44 +21,56 @@ class ConfigurationManager:
         settings: Settings,
         credential_manager: CredentialManager
     ):
-        self.settings = settings
-        self.credential_manager = credential_manager
+        self._settings = settings
+        self._credential_manager = credential_manager
 
         self._load_configurations()
 
     def _load_static_configurations(self) -> StaticConfigurations:
-        config_path = Path(self.settings.STATIC_CONFIGURATIONS_PATH)
-        
-        if config_path.exists() and config_path.is_file():
-            data = YAMLLoader.load_from_path(str(config_path))
-        else:
-            secret_data = self.credential_manager.secret_manager.get(
-                f"maleo-static-configurations-{self.settings.ENVIRONMENT}"
-            )
-            data = YAMLLoader.load_from_string(secret_data)
-        
+        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:
-        config_path = Path(self.settings.RUNTIME_CONFIGURATIONS_PATH)
-        
-        if config_path.exists() and config_path.is_file():
-            data = YAMLLoader.load_from_path(str(config_path))
-        else:
-            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)
-        
+        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}"
+        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}"
+        password = self._credential_manager.secret_manager.get(
+            f"maleo-redis-password-{self._settings.ENVIRONMENT}"
         )
         redis = RedisCacheConfigurations(
             namespaces=namespaces, 
@@ -79,7 +89,7 @@ class ConfigurationManager:
             runtime_configurations.model_dump(),
             {"cache": cache_configurations.model_dump()}
         )
-        
+
         self._configurations = Configurations.model_validate(merged_configurations)
 
     @property

maleo_foundation/managers/credential.py

@@ -46,7 +46,7 @@ class CredentialManager:
 
     def _load_maleo_credentials(self) -> None:
         environment = self._get_environment_for_credentials()
-        
+
         try:
             id = int(self._secret_manager.get(f"maleo-service-account-id-{environment}"))
             uuid = UUID(self._secret_manager.get(f"maleo-service-account-uuid-{environment}"))

maleo_foundation/models/transfers/general/database.py

@@ -18,21 +18,4 @@ class DatabaseAccess(BaseModel):
     service: BaseEnums.Service = Field(..., description="Service key")
     table: str = Field(..., description="Table name")
     data_id: int = Field(..., ge=1, description="Data Id")
-    data: BaseTypes.StringToAnyDict = Field(..., description="Data")
-
-    def to_google_pubsub_object(self) -> BaseTypes.StringToAnyDict:
-        result = {
-            "accessed_at": self.accessed_at.isoformat(),
-            "request_id": str(self.request_id),
-            "request_context": self.request_context.to_google_pubsub_object(),
-            "organization_id": None if self.organization_id is None else {"int": self.organization_id},
-            "user_id": self.user_id,
-            "token_string": None if self.token_string is None else {"string": self.token_string},
-            "token_payload": None if self.token_payload is None else {"TokenPayload": self.token_payload.to_google_pubsub_object()},
-            "service": self.service.replace("-", "_"),
-            "table": self.table,
-            "data_id": self.data_id,
-            "data": self.data
-        }
-
-        return result
+    data: BaseTypes.StringToAnyDict = Field(..., description="Data")

maleo_foundation/models/transfers/general/request.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 from datetime import datetime, timezone
-from pydantic import BaseModel, Field, field_serializer
-from starlette.datastructures import QueryParams
-from typing import Dict, Any
+from pydantic import BaseModel, Field
 from uuid import UUID
 from maleo_foundation.types import BaseTypes
 
@@ -26,53 +24,4 @@ class RequestContext(BaseModel):
     language: BaseTypes.OptionalString = Field(None, description="Accepted languages from client")
 
     class Config:
-        arbitrary_types_allowed = True
-
-    @field_serializer('query_params', when_used='json')
-    def serialize_query_params(self, qp: QueryParams, _info) -> str:
-        return str(qp)
-
-    def to_google_pubsub_object(self) -> Dict[str, Any]:
-        result = {
-            "request_id": str(self.request_id),
-            "requested_at": self.requested_at.isoformat(),
-            "method": self.method,
-            "url": self.url,
-            "path_params": None if self.path_params is None else {"map": self.path_params},
-            "query_params": None if self.query_params is None else {"string": self.query_params},
-            "ip_address": self.ip_address,
-            "is_internal": None if self.is_internal is None else {"boolean": self.is_internal},
-            "user_agent": None if self.user_agent is None else {"string": self.user_agent},
-            "ua_browser": None if self.ua_browser is None else {"string": self.ua_browser},
-            "ua_mobile": None if self.ua_mobile is None else {"string": self.ua_mobile},
-            "platform": None if self.platform is None else {"string": self.platform},
-            "referer": None if self.referer is None else {"array": self.referer},
-            "origin": None if self.origin is None else {"array": self.origin},
-            "host": None if self.host is None else {"array": self.host},
-            "forwarded_proto": None if self.forwarded_proto is None else {"array": self.forwarded_proto},
-            "language": None if self.language is None else {"array": self.language}
-        }
-
-        return result
-
-    @classmethod
-    def from_google_pubsub_object(cls, obj:Dict[str, Any]):
-        return cls(
-            request_id = UUID(obj["request_id"]),
-            requested_at = datetime.fromisoformat(obj["requested_at"]),
-            method = obj["method"],
-            url = obj["url"],
-            path_params = None if obj["path_params`"] is None else obj["path_params"]["map"],
-            query_params = None if obj["query_params"] is None else obj["query_params"]["string"],
-            ip_address = obj["ip_address"],
-            is_internal = None if obj["is_internal"] is None else bool(obj["is_internal"]["boolean"]),
-            user_agent = None if obj["user_agent"] is None else obj["user_agent"]["string"],
-            ua_browser = None if obj["ua_browser"] is None else obj["ua_browser"]["string"],
-            ua_mobile = None if obj["ua_mobile"] is None else obj["ua_mobile"]["string"],
-            platform = None if obj["platform"] is None else obj["platform"]["string"],
-            referer = None if obj["referer"] is None else obj["referer"]["string"],
-            origin = None if obj["origin"] is None else obj["origin"]["string"],
-            host = None if obj["host"] is None else obj["host"]["string"],
-            forwarded_proto = None if obj["forwarded_proto"] is None else obj["forwarded_proto"]["string"],
-            language = None if obj["language"] is None else obj["language"]["string"],
-        )
+        arbitrary_types_allowed = True

maleo_foundation/types.py

@@ -1,4 +1,5 @@
 from datetime import date, datetime
+from pathlib import Path
 from typing import Dict, Optional, Union, Literal, List, Any
 from uuid import UUID
 from maleo_foundation.enums import BaseEnums
@@ -24,6 +25,9 @@ class BaseTypes:
     OptionalInteger = Optional[int]
     OptionalListOfIntegers = Optional[List[int]]
 
+    #* Path-related types
+    OptionalPath = Optional[Path]
+
     #* String-related types
     ListOfStrings = List[str]
     OptionalString = Optional[str]

{maleo_foundation-0.3.10.dist-info → maleo_foundation-0.3.12.dist-info}/METADATA

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

{maleo_foundation-0.3.10.dist-info → maleo_foundation-0.3.12.dist-info}/RECORD

@@ -5,7 +5,7 @@ maleo_foundation/constants.py,sha256=LjMIy_Fcr6HLuhIuXs5lCtkyScZXXHOtBMPYx5lwg00
 maleo_foundation/enums.py,sha256=08rkuG3Y4-8kvd5BOBhhIS0UhzBT4kAPQX4L95GqnWQ,5316
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/rest_controller_result.py,sha256=4KbCmk70IEHj1L1bNJfFg1Y3ifnRSnmvK6dYyVJddok,2014
-maleo_foundation/types.py,sha256=bUcCR-qRlxxttMxJQnVmtBic3EXEd_urcC2P55evWPc,2451
+maleo_foundation/types.py,sha256=VFdnBuEh5QW_ytaZ4sNBqb6XxALU5g0RtzP0fR4svNY,2537
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/client/manager.py,sha256=zI6LCRQmBynK3LYU8tfd9RXE2QIzaOTzl12B24tpAxw,2720
 maleo_foundation/client/services/__init__.py,sha256=uIBnAeQ9a2otQbUAbKBQfYrkEUugXjxXoV8W5QYHuic,1051
@@ -33,14 +33,14 @@ 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=91IvQGCXC3QkhB61m6qLDMaRykmMYOwzMgrSOodfY1A,257
-maleo_foundation/managers/configuration.py,sha256=JPXgxNVBO_i7Znqwa36uMMXLU9LBDldvak-jKoP75W0,3420
-maleo_foundation/managers/credential.py,sha256=pTsd1sPFw64cOfSffqsdJFkVfsciqxjAvvt6RZJCkDY,3116
+maleo_foundation/managers/configuration.py,sha256=IyefI1GDDRYf5FRjxpJ2LfYiRL1fuzIOwrO1aAy5zy0,3814
+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
 maleo_foundation/managers/service.py,sha256=1rqxXMJ9E-pla0LuhKZ83JS4boTnUhiXxn1EbzYQlWA,10859
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=j5_CsToA_7nn_2mP9TWWz7qKalXSWqxfKY_9gTNGJJA,4282
-maleo_foundation/managers/client/maleo.py,sha256=JCbuIWu5gW--o7H8xvWtSNb_Of3d05FKLRTcvDciLfE,2662
+maleo_foundation/managers/client/maleo.py,sha256=DoMmRitPQkBKvi92NtW20awUQRhcaBXdBzfDyFdSM3Q,2669
 maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/google/base.py,sha256=sxALVZIyKUUbNamMrXSlyb3ftI8wSl5YUlRY2sG-iBg,1383
 maleo_foundation/managers/client/google/parameter.py,sha256=Jy-rMz_xhepmxBI2rWPxdP8AENBbiApg04nO6cIGXN8,1429
@@ -65,9 +65,9 @@ maleo_foundation/models/schemas/token.py,sha256=Ay-ntAiKeBjCT4YYw0S3Zd4e-KvHSYvG
 maleo_foundation/models/transfers/__init__.py,sha256=oJLJ3Geeme6vBw7R2Dhvdvg4ziVvzEYAGJaP-tm_90w,299
 maleo_foundation/models/transfers/general/__init__.py,sha256=rzHpxhyNphl5RVrsAlzEvuYEonmWgb69gJ8XOLMvFDc,4686
 maleo_foundation/models/transfers/general/credentials.py,sha256=kLS0ymFipQmL3QaA2YFQepRfrQYlEm0jp1MiviAnfXM,345
-maleo_foundation/models/transfers/general/database.py,sha256=E3bWaMlvxIRrEGUT29AN5k42FNI5MnrmLq9rnEh0igE,2033
+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=NTYFOmucc4bMfoocBeHGNLs6mbRdqXyVtp1_yDiv_Gg,4849
+maleo_foundation/models/transfers/general/request.py,sha256=b-Bi8yEETtX58GiG1ROFcLGnc2LjMeccXYWqteHNwpY,1777
 maleo_foundation/models/transfers/general/settings.py,sha256=bEvsbhlFi5DO2tS3OmxL2LAG3q1cesW3ceYsT5iGNsE,3702
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
 maleo_foundation/models/transfers/general/token.py,sha256=PU-_wLFaY2i8pwRi9-jlk4nh7XzoTKOk0BEsUCGbD80,4979
@@ -134,7 +134,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=vmVObdAyXehb3L6ASOuUJ63mNvGPb9fiXSpdRndN-4A,6528
 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.10.dist-info/METADATA,sha256=WC7PtWk0jsVpJqU8rnErqEcam_3nsXaSmWG1YMcZf_0,3740
-maleo_foundation-0.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.10.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.10.dist-info/RECORD,,
+maleo_foundation-0.3.12.dist-info/METADATA,sha256=EGdGe8N4zLGGDJ7w6NK6V_6JmDV9_2EdnMFeuNAeHOY,3740
+maleo_foundation-0.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.12.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.12.dist-info/RECORD,,