maleo-foundation 0.3.11__tar.gz → 0.3.13__tar.gz

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/PKG-INFO

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

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/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-0.3.11 → maleo_foundation-0.3.13}/maleo_foundation/managers/service.py

@@ -72,31 +72,43 @@ class ServiceManager:
     @property
     def settings(self) -> Settings:
         return self._settings
-    
+
     @property
     def log_config(self) -> SimpleConfig:
         return self._log_config
-    
+
     @property
     def google_credentials(self) -> Credentials:
         return self._credential_manager.google_credentials
-    
+
     @property
     def secret_manager(self) -> GoogleSecretManager:
         return self._credential_manager.secret_manager
-    
+
     @property
     def maleo_credentials(self) -> MaleoCredentials:
         return self._credential_manager.maleo_credentials
-    
+
     @property
     def configurations(self) -> Configurations:
         return self._configuration_manager.configurations
 
     def _load_keys(self) -> None:
-        password = self.secret_manager.get(name="maleo-key-password")
-        private = self.secret_manager.get(name="maleo-private-key")
-        public = self.secret_manager.get(name="maleo-public-key")
+        if self.settings.KEY_PASSWORD is not None:
+            password = self.settings.KEY_PASSWORD
+        else:
+            password = self.secret_manager.get(name="maleo-key-password")
+
+        if self.settings.PRIVATE_KEY is not None:
+            private = self.settings.PRIVATE_KEY
+        else:
+            private = self.secret_manager.get(name="maleo-private-key")
+
+        if self.settings.PUBLIC_KEY is not None:
+            public = self.settings.PUBLIC_KEY
+        else:
+            public = self.secret_manager.get(name="maleo-public-key")
+
         self._keys = BaseGeneralSchemas.RSAKeys(
             password=password,
             private=private,
@@ -231,12 +243,14 @@ class ServiceManager:
     def create_app(
         self,
         router: APIRouter,
-        lifespan: Optional[Lifespan[AppType]] = None
+        lifespan: Optional[Lifespan[AppType]] = None,
+        version: str = "unknown"
     ) -> FastAPI:
         self._loggers.application.info("Creating FastAPI application")
-        root_path = "" if self._settings.ENVIRONMENT == "local" else f"/{self.configurations.service.key.removeprefix("maleo-")}"
+        root_path = self._settings.ROOT_PATH
         self._app = FastAPI(
             title=self.configurations.service.name,
+            version=version,
             lifespan=lifespan,
             root_path=root_path
         )

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/maleo_foundation/models/transfers/general/configurations/cache/redis.py

@@ -21,5 +21,5 @@ class RedisCacheConfigurations(BaseModel):
     port: int = Field(6379, description="Redis instance's port")
     db: int = Field(0, description="Redis instance's db")
     password: BaseTypes.OptionalString = Field(None, description="AUTH password")
-    decode_responses: bool = Field(False, description="Whether to decode responses")
+    decode_responses: bool = Field(True, description="Whether to decode responses")
     health_check_interval: int = Field(30, description="Health check interval")

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/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-0.3.13/maleo_foundation/models/transfers/general/request.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+from datetime import datetime, timezone
+from pydantic import BaseModel, Field
+from uuid import UUID
+from maleo_foundation.types import BaseTypes
+
+class RequestContext(BaseModel):
+    request_id: UUID = Field(..., description="Unique identifier for tracing the request")
+    requested_at: datetime = Field(datetime.now(tz=timezone.utc), description="Request timestamp")
+    method: str = Field(..., description="Request's method")
+    url: str = Field(..., description="Request's URL")
+    path_params: BaseTypes.OptionalStringToAnyDict = Field(None, description="Request's path parameters")
+    query_params: BaseTypes.OptionalString = Field(None, description="Request's query parameters")
+    ip_address: str = Field("unknown", description="Client's IP address")
+    is_internal: BaseTypes.OptionalBoolean = Field(None, description="True if IP is internal")
+    user_agent: BaseTypes.OptionalString = Field(None, description="User-Agent string")
+    ua_browser: BaseTypes.OptionalString = Field(None, description="Browser info from sec-ch-ua")
+    ua_mobile: BaseTypes.OptionalString = Field(None, description="Is mobile device?")
+    platform: BaseTypes.OptionalString = Field(None, description="Client platform or OS")
+    referer: BaseTypes.OptionalString = Field(None, description="Referrer URL")
+    origin: BaseTypes.OptionalString = Field(None, description="Origin of the request")
+    host: BaseTypes.OptionalString = Field(None, description="Host header from request")
+    forwarded_proto: BaseTypes.OptionalString = Field(None, description="Forwarded protocol (http/https)")
+    language: BaseTypes.OptionalString = Field(None, description="Accepted languages from client")
+
+    class Config:
+        arbitrary_types_allowed = True

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/maleo_foundation/models/transfers/general/settings.py

@@ -7,6 +7,7 @@ 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"
@@ -27,6 +28,18 @@ class Settings(BaseSettings):
         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"
+    )
 
     @classmethod
     @model_validator(mode="before")

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.3.11 → maleo_foundation-0.3.13}/pyproject.toml

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

maleo_foundation-0.3.11/maleo_foundation/models/transfers/general/request.py

@@ -1,78 +0,0 @@
-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 uuid import UUID
-from maleo_foundation.types import BaseTypes
-
-class RequestContext(BaseModel):
-    request_id: UUID = Field(..., description="Unique identifier for tracing the request")
-    requested_at: datetime = Field(datetime.now(tz=timezone.utc), description="Request timestamp")
-    method: str = Field(..., description="Request's method")
-    url: str = Field(..., description="Request's URL")
-    path_params: BaseTypes.OptionalStringToAnyDict = Field(None, description="Request's path parameters")
-    query_params: BaseTypes.OptionalString = Field(None, description="Request's query parameters")
-    ip_address: str = Field("unknown", description="Client's IP address")
-    is_internal: BaseTypes.OptionalBoolean = Field(None, description="True if IP is internal")
-    user_agent: BaseTypes.OptionalString = Field(None, description="User-Agent string")
-    ua_browser: BaseTypes.OptionalString = Field(None, description="Browser info from sec-ch-ua")
-    ua_mobile: BaseTypes.OptionalString = Field(None, description="Is mobile device?")
-    platform: BaseTypes.OptionalString = Field(None, description="Client platform or OS")
-    referer: BaseTypes.OptionalString = Field(None, description="Referrer URL")
-    origin: BaseTypes.OptionalString = Field(None, description="Origin of the request")
-    host: BaseTypes.OptionalString = Field(None, description="Host header from request")
-    forwarded_proto: BaseTypes.OptionalString = Field(None, description="Forwarded protocol (http/https)")
-    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"],
-        )