maleo-foundation 0.2.99__tar.gz → 0.3.1__tar.gz

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/PKG-INFO

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

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/enums.py

@@ -169,4 +169,19 @@ class BaseEnums:
         EXP_3DY = int(3*24*60*60)
         EXP_1WK = int(1*7*24*60*60)
         EXP_2WK = int(2*7*24*60*60)
-        EXP_1MO = int(1*30*24*60*60)
+        EXP_1MO = int(1*30*24*60*60)
+
+    class Service(StrEnum):
+        TELEMETRY = "maleo-telemetry"
+        METADATA = "maleo-metadata"
+        IDENTITY = "maleo-identity"
+        ACCESS = "maleo-access"
+        WORKSHOP = "maleo-workshop"
+        SOAPIE = "maleo-soapie"
+        MEDIX = "maleo-medix"
+        FHIR = "maleo-fhir"
+        DICOM = "maleo-dicom"
+        SCRIBE = "maleo-scribe"
+        CDS = "maleo-cds"
+        IMAGING = "maleo-imaging"
+        MCU = "maleo-mcu"

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/managers/db.py

@@ -1,7 +1,7 @@
 import os
 from contextlib import contextmanager
 from pydantic import BaseModel, Field
-from sqlalchemy import MetaData
+from sqlalchemy import MetaData, text
 from sqlalchemy.engine import Engine, create_engine
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.declarative import DeclarativeMeta
@@ -124,6 +124,21 @@ class DatabaseManager:
     def session(self) -> SessionManager:
         return self._session
 
+    def check_connection(self) -> bool:
+        """Check database connectivity by executing a simple query."""
+        self._logger.info("Checking database connectivity...")
+        try:
+            with self._session.get() as session:
+                session.execute(text("SELECT 1"))
+            self._logger.info("Database connectivity check successful.")
+            return True
+        except SQLAlchemyError as se:
+            self._logger.error(f"Database connectivity check failed: {se}", exc_info=True)
+            return False
+        except Exception as e:
+            self._logger.error(f"Unexpected error during connectivity check: {e}", exc_info=True)
+            return False
+
     def dispose(self) -> None:
         #* Dispose session
         if self._session is not None:

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/managers/service.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from pydantic_settings import BaseSettings
 from pydantic import BaseModel, Field
 from redis.asyncio.client import Redis
+from redis.exceptions import RedisError
 from starlette.exceptions import HTTPException
 from starlette.types import Lifespan, AppType
 from sqlalchemy import MetaData
@@ -332,6 +333,15 @@ class ServiceManager:
     def cache(self) -> CacheManagers:
         return self._cache
 
+    def check_redis_connection(self) -> bool:
+        try:
+            self._redis.ping()
+            self._loggers.application.info("Redis connection check successful.")
+            return True
+        except RedisError as e:
+            self._loggers.application.error(f"Redis connection check failed: {e}", exc_info=True)
+            return False
+
     def _initialize_cloud_storage(self) -> None:
         environment = (
             BaseEnums.EnvironmentType.STAGING
@@ -395,7 +405,7 @@ class ServiceManager:
     def create_app(
         self,
         router: APIRouter,
-        lifespan: Optional[Lifespan[AppType]]=None
+        lifespan: Optional[Lifespan[AppType]] = None
     ) -> FastAPI:
         self._loggers.application.info("Creating FastAPI application")
         root_path = "" if self._settings.ENVIRONMENT == "local" else f"/{self._configs.service.key.removeprefix("maleo-")}"

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/middlewares/base.py

@@ -217,7 +217,8 @@ class RequestLogger:
         log_func(
             f"Request | ID: {request_context.request_id} {authentication_info} | "
             f"IP: {request_context.ip_address} | Host: {request_context.host} | "
-            f"Method: {request_context.method} | URL: {request_context.url} - "
+            f"Method: {request_context.method} | URL: {request_context.url} | "
+            f"Query Parameters: {request_context.query_params} - "
             f"Response | Status: {response.status_code}"
         )
     
@@ -239,7 +240,8 @@ class RequestLogger:
         self.logger.error(
             f"Request | ID: {request_context.request_id} {authentication_info} | "
             f"IP: {request_context.ip_address} | Host: {request_context.host} | "
-            f"Method: {request_context.method} | URL: {request_context.url} - "
+            f"Method: {request_context.method} | URL: {request_context.url} | "
+            f"Query Parameters: {request_context.query_params} - "
             f"Response | Status: 500 | Exception:\n{json.dumps(error_details, indent=4)}"
         )
 

maleo_foundation-0.2.99/maleo_foundation/models/transfers/general/pubsub.py → maleo_foundation-0.3.1/maleo_foundation/models/transfers/general/database.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from uuid import UUID
-from pydantic import BaseModel, Field, model_validator
-from typing import Dict, Optional, Any
+from pydantic import BaseModel, Field
+from typing import Optional
 from .request import RequestContext
 from .token import MaleoFoundationTokenGeneralTransfers
 from maleo_foundation.types import BaseTypes
@@ -27,7 +27,7 @@ class DatabaseAccess(BaseModel):
             "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 self.token_payload.to_google_pubsub_object(),
+            "token_payload": None if self.token_payload is None else {"TokenPayload": self.token_payload.to_google_pubsub_object()},
             "service": self.service,
             "table": self.table,
             "data_id": self.data_id,

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/models/transfers/general/request.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from datetime import datetime, timezone
-from pydantic import BaseModel, Field
+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
@@ -10,8 +11,8 @@ class RequestContext(BaseModel):
     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: Dict = Field(..., description="Request's path parameters")
-    query_params: Dict = Field(..., description="Request's query parameters")
+    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")
@@ -24,14 +25,21 @@ class RequestContext(BaseModel):
     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": {"map": self.path_params},
-            "query_params": {"map": self.query_params},
+            "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},
@@ -54,8 +62,8 @@ class RequestContext(BaseModel):
             requested_at = datetime.fromisoformat(obj["requested_at"]),
             method = obj["method"],
             url = obj["url"],
-            path_params = obj["path_params"]["map"] or {},
-            query_params = obj["query_params"]["map"] or {},
+            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"],

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/utils/cleaner.py

@@ -2,13 +2,13 @@ from typing import Any, Dict, List, Optional
 
 def clean_pubsub_message(
     msg:Dict[str, Any],
-    enums:Optional[List[str]] = None
+    custom_types:Optional[List[str]] = None
 ) -> Dict[str, Any]:
     for k, v in msg.items():
-        # Clean enums
+        # Clean custom_types
         if isinstance(v, dict) and len(v) == 1:
             only_key = next(iter(v))
-            if enums is not None and only_key in enums:
+            if custom_types is not None and only_key in custom_types:
                 msg[k] = v[only_key]
 
         # Clean "map"

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation/utils/extractor.py

@@ -39,10 +39,10 @@ def extract_request_context(request: Request) -> RequestContext:
         requested_at=datetime.now(tz=timezone.utc),
         method=request.method,
         url=request.url.path,
-        path_params=dict(request.path_params),
-        query_params=dict(request.query_params),
+        path_params=None if not request.path_params else request.path_params,
+        query_params=None if not request.query_params else str(request.query_params),
         ip_address=ip_address,
-        is_internal=ip_address.startswith("10.") or ip_address.startswith("192.168.") or ip_address.startswith("172."),
+        is_internal=None if ip_address=="unknown" else (ip_address.startswith("10.") or ip_address.startswith("192.168.") or ip_address.startswith("172.")),
         user_agent=headers.get("user-agent"),
         ua_browser=ua_browser,
         ua_mobile=headers.get("sec-ch-ua-mobile"),

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/maleo_foundation.egg-info/SOURCES.txt

@@ -70,8 +70,8 @@ maleo_foundation/models/schemas/signature.py
 maleo_foundation/models/schemas/token.py
 maleo_foundation/models/transfers/__init__.py
 maleo_foundation/models/transfers/general/__init__.py
+maleo_foundation/models/transfers/general/database.py
 maleo_foundation/models/transfers/general/key.py
-maleo_foundation/models/transfers/general/pubsub.py
 maleo_foundation/models/transfers/general/request.py
 maleo_foundation/models/transfers/general/signature.py
 maleo_foundation/models/transfers/general/token.py

{maleo_foundation-0.2.99 → maleo_foundation-0.3.1}/pyproject.toml

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