maleo-foundation 0.1.39__tar.gz → 0.1.41__tar.gz

{maleo_foundation-0.1.39 → maleo_foundation-0.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.39
+Version: 0.1.41
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT
@@ -13,6 +13,7 @@ Requires-Dist: cachetools>=5.5.2
 Requires-Dist: certifi>=2025.1.31
 Requires-Dist: cffi>=1.17.1
 Requires-Dist: charset-normalizer>=3.4.1
+Requires-Dist: click>=8.1.8
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: Deprecated>=1.2.18
 Requires-Dist: docutils>=0.21.2
@@ -55,10 +56,13 @@ Requires-Dist: pyasn1>=0.6.1
 Requires-Dist: pyasn1_modules>=0.4.2
 Requires-Dist: pycparser>=2.22
 Requires-Dist: pydantic>=2.11.3
+Requires-Dist: pydantic-settings>=2.9.1
 Requires-Dist: pydantic_core>=2.33.1
 Requires-Dist: Pygments>=2.19.1
 Requires-Dist: PyJWT>=2.10.1
 Requires-Dist: pyproject_hooks>=1.2.0
+Requires-Dist: python-dotenv>=1.1.0
+Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: readme_renderer>=44.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: requests-toolbelt>=1.0.0
@@ -73,6 +77,7 @@ Requires-Dist: twine>=6.1.0
 Requires-Dist: typing-inspection>=0.4.0
 Requires-Dist: typing_extensions>=4.13.2
 Requires-Dist: urllib3>=2.4.0
+Requires-Dist: uvicorn>=0.34.2
 Requires-Dist: wrapt>=1.17.2
 Requires-Dist: zipp>=3.21.0
 

{maleo_foundation-0.1.39 → maleo_foundation-0.1.41}/maleo_foundation/managers/service.py

@@ -15,13 +15,14 @@ from maleo_foundation.managers.client.google.secret import GoogleSecretManager
 from maleo_foundation.managers.client.google.storage import GoogleCloudStorage
 from maleo_foundation.managers.client.maleo import MaleoClientManager
 from maleo_foundation.managers.db import DatabaseManager
-from maleo_foundation.managers.middleware import MiddlewareConfigurations, MiddlewareLoggers, MiddlewareManager
+from maleo_foundation.managers.middleware import MiddlewareConfigurations, BaseMiddlewareConfigurations, CORSMiddlewareConfigurations, GeneralMiddlewareConfigurations, MiddlewareLoggers, MiddlewareManager
 from maleo_foundation.middlewares.base import RequestProcessor
 from maleo_foundation.services.token import BaseTokenService
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.exceptions import BaseExceptions
 from maleo_foundation.utils.loaders.json import JSONLoader
 from maleo_foundation.utils.loaders.key import KeyLoader
+from maleo_foundation.utils.loaders.yaml import YAMLLoader
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, MiddlewareLogger
 
 class LogConfig(BaseModel):
@@ -33,12 +34,13 @@ class LogConfig(BaseModel):
 
 class Settings(BaseSettings):
     ENVIRONMENT:BaseEnums.EnvironmentType = Field(..., description="Environment")
-    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")
-    PRIVATE_KEY_PATH:str = Field("/keys/maleo-private-key.pem", description="Maleo's private key path")
-    PUBLIC_KEY_PATH:str = Field("/keys/maleo-public-key.pem", description="Maleo's public key path")
+    GOOGLE_CREDENTIALS_PATH:str = Field("credentials/maleo-google-service-account.json", description="Internal credential's file path")
+    INTERNAL_CREDENTIALS_PATH:str = Field("credentials/maleo-internal-service-account.json", description="Internal credential's file path")
+    PRIVATE_KEY_PATH:str = Field("keys/maleo-private-key.pem", description="Maleo's private key path")
+    PUBLIC_KEY_PATH:str = Field("keys/maleo-public-key.pem", description="Maleo's public key path")
     KEY_PASSWORD:str = Field(..., description="Maleo key's password")
-    CONFIGURATIONS_PATH:str = Field(..., description="Service's configuration file path")
+    STATIC_CONFIGURATIONS_PATH:str = Field("configs/static.yaml", description="Maleo's static configurations path")
+    RUNTIME_CONFIGURATIONS_PATH:str = Field("configs/runtime.yaml", description="Service's runtime configurations path")
     DB_PASSWORD:str = Field(..., description="Database's password")
 
 class Keys(BaseModel):
@@ -72,6 +74,12 @@ class Credentials(BaseModel):
     class Config:
         arbitrary_types_allowed=True
 
+class MiddlewareRuntimeConfigurations(BaseModel):
+    base:BaseMiddlewareConfigurations = Field(..., description="Base middleware's configurations")
+
+    class Config:
+        arbitrary_types_allowed=True
+
 class ServiceConfigurations(BaseModel):
     key:str = Field(..., description="Service's key")
     name:str = Field(..., description="Service's name")
@@ -80,7 +88,6 @@ class ServiceConfigurations(BaseModel):
 
 class DatabaseConfigurations(BaseModel):
     username:str = Field("postgres", description="Database user's username")
-    password_env:str = Field("DB_PASSWORD", description="Database user's password .env")
     password:str = Field(..., description="Database user's password")
     host:str = Field(..., description="Database's host")
     port:int = Field(5432, description="Database's port")
@@ -89,12 +96,9 @@ class DatabaseConfigurations(BaseModel):
     @model_validator(mode='before')
     @classmethod
     def populate_password(cls, values:Dict):
-        env_name = values.get("password_env")
-        if not env_name:
-            raise ValueError("password_env is required to fetch password from environment.")
-        env_value = os.getenv(env_name)
+        env_value = os.getenv("DB_PASSWORD")
         if env_value is None:
-            raise ValueError(f"'{env_name}' must be set.")
+            raise ValueError("'DB_PASSWORD' environmet variable must be set.")
         values["password"] = env_value
         return values
 
@@ -102,6 +106,21 @@ class DatabaseConfigurations(BaseModel):
     def url(self) -> str:
         return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"
 
+class RuntimeConfigurations(BaseModel):
+    service:ServiceConfigurations = Field(..., description="Service's configurations")
+    middleware:MiddlewareRuntimeConfigurations = Field(..., description="Middleware's runtime configurations")
+    database:DatabaseConfigurations = Field(..., description="Database's configurations")
+
+    class Config:
+        arbitrary_types_allowed=True
+
+class MiddlewareStaticConfigurations(BaseModel):
+    general:GeneralMiddlewareConfigurations = Field(..., description="Middleware's general configurations")
+    cors:CORSMiddlewareConfigurations = Field(..., description="CORS middleware's configurations")
+
+    class Config:
+        arbitrary_types_allowed=True
+
 class GoogleCloudStorageConfigurations(BaseModel):
     bucket_name:str = Field(..., description="Bucket's name")
 
@@ -137,11 +156,18 @@ class ClientConfigurations(BaseModel):
     class Config:
         arbitrary_types_allowed=True
 
+class StaticConfigurations(BaseModel):
+    middleware:MiddlewareStaticConfigurations = Field(..., description="Middleware's static configurations")
+    client:ClientConfigurations = Field(..., description="Client's configurations")
+
+    class Config:
+        arbitrary_types_allowed=True
+
 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(..., description="Service's configurations")
+    client:ClientConfigurations = Field(..., description="Client's configurations")
 
     class Config:
         arbitrary_types_allowed=True
@@ -269,8 +295,11 @@ class ServiceManager:
         return self._settings
 
     def _load_configs(self) -> None:
-        data = JSONLoader.load(self._settings.CONFIGURATIONS_PATH)
-        self._configs = Configurations.model_validate(data)
+        static_configurations = YAMLLoader.load(self._settings.STATIC_CONFIGURATIONS_PATH)
+        self._static_configs = StaticConfigurations.model_validate(static_configurations)
+        runtime_configurations = YAMLLoader.load(self._settings.RUNTIME_CONFIGURATIONS_PATH)
+        self._runtime_configs = RuntimeConfigurations.model_validate(runtime_configurations)
+        self._configs = Configurations.model_validate(self._static_configs.model_dump() | self._runtime_configs)
 
     @property
     def configs(self) -> Configurations:

{maleo_foundation-0.1.39 → maleo_foundation-0.1.41}/maleo_foundation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.39
+Version: 0.1.41
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT
@@ -13,6 +13,7 @@ Requires-Dist: cachetools>=5.5.2
 Requires-Dist: certifi>=2025.1.31
 Requires-Dist: cffi>=1.17.1
 Requires-Dist: charset-normalizer>=3.4.1
+Requires-Dist: click>=8.1.8
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: Deprecated>=1.2.18
 Requires-Dist: docutils>=0.21.2
@@ -55,10 +56,13 @@ Requires-Dist: pyasn1>=0.6.1
 Requires-Dist: pyasn1_modules>=0.4.2
 Requires-Dist: pycparser>=2.22
 Requires-Dist: pydantic>=2.11.3
+Requires-Dist: pydantic-settings>=2.9.1
 Requires-Dist: pydantic_core>=2.33.1
 Requires-Dist: Pygments>=2.19.1
 Requires-Dist: PyJWT>=2.10.1
 Requires-Dist: pyproject_hooks>=1.2.0
+Requires-Dist: python-dotenv>=1.1.0
+Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: readme_renderer>=44.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: requests-toolbelt>=1.0.0
@@ -73,6 +77,7 @@ Requires-Dist: twine>=6.1.0
 Requires-Dist: typing-inspection>=0.4.0
 Requires-Dist: typing_extensions>=4.13.2
 Requires-Dist: urllib3>=2.4.0
+Requires-Dist: uvicorn>=0.34.2
 Requires-Dist: wrapt>=1.17.2
 Requires-Dist: zipp>=3.21.0
 

{maleo_foundation-0.1.39 → maleo_foundation-0.1.41}/maleo_foundation.egg-info/requires.txt

@@ -5,6 +5,7 @@ cachetools>=5.5.2
 certifi>=2025.1.31
 cffi>=1.17.1
 charset-normalizer>=3.4.1
+click>=8.1.8
 cryptography>=44.0.2
 Deprecated>=1.2.18
 docutils>=0.21.2
@@ -47,10 +48,13 @@ pyasn1>=0.6.1
 pyasn1_modules>=0.4.2
 pycparser>=2.22
 pydantic>=2.11.3
+pydantic-settings>=2.9.1
 pydantic_core>=2.33.1
 Pygments>=2.19.1
 PyJWT>=2.10.1
 pyproject_hooks>=1.2.0
+python-dotenv>=1.1.0
+PyYAML>=6.0.2
 readme_renderer>=44.0
 requests>=2.32.3
 requests-toolbelt>=1.0.0
@@ -65,5 +69,6 @@ twine>=6.1.0
 typing-inspection>=0.4.0
 typing_extensions>=4.13.2
 urllib3>=2.4.0
+uvicorn>=0.34.2
 wrapt>=1.17.2
 zipp>=3.21.0

{maleo_foundation-0.1.39 → maleo_foundation-0.1.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.1.39"
+version = "0.1.41"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -20,6 +20,7 @@ dependencies = [
     "certifi>=2025.1.31",
     "cffi>=1.17.1",
     "charset-normalizer>=3.4.1",
+    "click>=8.1.8",
     "cryptography>=44.0.2",
     "Deprecated>=1.2.18",
     "docutils>=0.21.2",
@@ -62,10 +63,13 @@ dependencies = [
     "pyasn1_modules>=0.4.2",
     "pycparser>=2.22",
     "pydantic>=2.11.3",
+    "pydantic-settings>=2.9.1",
     "pydantic_core>=2.33.1",
     "Pygments>=2.19.1",
     "PyJWT>=2.10.1",
     "pyproject_hooks>=1.2.0",
+    "python-dotenv>=1.1.0",
+    "PyYAML>=6.0.2",
     "readme_renderer>=44.0",
     "requests>=2.32.3",
     "requests-toolbelt>=1.0.0",
@@ -80,6 +84,7 @@ dependencies = [
     "typing-inspection>=0.4.0",
     "typing_extensions>=4.13.2",
     "urllib3>=2.4.0",
+    "uvicorn>=0.34.2",
     "wrapt>=1.17.2",
     "zipp>=3.21.0"
 ]