maleo-foundation 0.2.100__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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/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/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/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

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/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.100.dist-info → maleo_foundation-0.3.1.dist-info}/METADATA

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

{maleo_foundation-0.2.100.dist-info → maleo_foundation-0.3.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 maleo_foundation/authentication.py,sha256=6Kw-cl9PlxPNc2nD7Z4sYug2_MhRas6IfyVygQyTHlc,1584
 maleo_foundation/authorization.py,sha256=HGXCJ47AU1YFMDSmGhrMMmlHnAyghcFZVUiPa1FSvog,283
 maleo_foundation/constants.py,sha256=JLQNTY5LJ0gjsT2aicNTRyi9hcOtk31ffFS6ywZXbZM,1449
-maleo_foundation/enums.py,sha256=_xPH4Vdg6DmbRKJw9NP0yBbX8IQO-WMZaRrejCITQfI,4905
+maleo_foundation/enums.py,sha256=POXtnQq6i7DRlfSUvEOR2YxyViqjsILxucrBQuxlJ-c,5350
 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
@@ -32,9 +32,9 @@ maleo_foundation/expanded_types/encryption/__init__.py,sha256=yvqKW_VprQP_3YSL-A
 maleo_foundation/expanded_types/encryption/aes.py,sha256=1rj43qjIO0TePpr1mErT_NJnqFZSgMM9gybfFxsTams,488
 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/db.py,sha256=qPRm9MI9lJUAdZeJqv6CB3A2xvLzgN-pm-IQtcU9C8w,5352
+maleo_foundation/managers/db.py,sha256=y5oP3bTXKeXYKqng-E_HZ-3wC0ZPtl5bls0AEEej6zM,6050
 maleo_foundation/managers/middleware.py,sha256=IjHPuOzXKEK44DqhJejJ6wXacAiUi9GwWAdeuwD0lI4,4271
-maleo_foundation/managers/service.py,sha256=b9rNukydWfA8JnIvEbK5crkv3f1VWS5TKivAObTS9Xc,19334
+maleo_foundation/managers/service.py,sha256=LwkDW2U8NRiMrZxtlA9xYx2uj23PBayKqJIaO9NzGpM,19727
 maleo_foundation/managers/cache/__init__.py,sha256=CeY0oof2bVl_v5WS-FKXNwn2gf3xrEMfUsHK9cHo59s,471
 maleo_foundation/managers/cache/base.py,sha256=oXxeMjw4iptFwvdESeYF0mgmEzoAzzCAQbnYwTO5tZ4,867
 maleo_foundation/managers/cache/redis.py,sha256=LMxBNCmal6JjsAi7FTeN191PR1zFGw4jjfrJ9lJ_zu0,1162
@@ -47,7 +47,7 @@ maleo_foundation/managers/client/google/parameter.py,sha256=Jy-rMz_xhepmxBI2rWPx
 maleo_foundation/managers/client/google/secret.py,sha256=m-mjaLvYMLgAEn1OxmP0IVTYFQi1jSpDdutLxNA6t6g,4620
 maleo_foundation/managers/client/google/storage.py,sha256=lEPw4N07nV9r7KjvF2Pb3RM1ZQBK9Riqj7vh6XOEY5Q,5417
 maleo_foundation/middlewares/authentication.py,sha256=PkC1mtI1LwX6iBTNvpFf-kxFNt6YkshWupM_lt7CaCI,4851
-maleo_foundation/middlewares/base.py,sha256=7uR6UQKOAeAwjy8deI2z1VgsMl4rd6rvm9V3gSAewEI,16303
+maleo_foundation/middlewares/base.py,sha256=IszulI930Fm4T4LQZJIyV8kebAlXt4joR6knB3QZUgA,16437
 maleo_foundation/middlewares/cors.py,sha256=9hLh_h253bvIn7-A7mUblyrJQ37XNpV7aLeHW6ZTHz8,2294
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
 maleo_foundation/models/responses.py,sha256=rhCQ9ERe1BgM2Bx7c4_Qj0Eoq7bJG0xdbnhCiTao6eI,5668
@@ -63,9 +63,9 @@ maleo_foundation/models/schemas/signature.py,sha256=pP78JZpoizQguVKXv4AXQmB8ebVy
 maleo_foundation/models/schemas/token.py,sha256=Ay-ntAiKeBjCT4YYw0S3Zd4e-KvHSYvG_hzCMYzd5qY,567
 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/database.py,sha256=BRWQL6g3BmizPoq3-0SaiDmaxGMGrSUaamVJz_63Kt8,1984
+maleo_foundation/models/transfers/general/database.py,sha256=LEMhHNmqoT7zhZisdI0ZEmFX8zENWUKfcQ4FJsAfr8E,1956
 maleo_foundation/models/transfers/general/key.py,sha256=S37SqD3qwTbgMk7785hW7Kl9d4Kouh4uPZcGoyMQ_-Q,755
-maleo_foundation/models/transfers/general/request.py,sha256=rKol7_Qs-Ylv51P7p_amg13heBzJePoz3yjE96xpsN8,4369
+maleo_foundation/models/transfers/general/request.py,sha256=NTYFOmucc4bMfoocBeHGNLs6mbRdqXyVtp1_yDiv_Gg,4849
 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/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
@@ -104,7 +104,7 @@ maleo_foundation/utils/cleaner.py,sha256=dv80jDd8uAXuqyB5_UPbT2JksJ-hsq286DB2WCj
 maleo_foundation/utils/client.py,sha256=CGwn8eH5WlwnE5tPMfMAH5V3BItBgVmYBZnXpLjTVSc,2826
 maleo_foundation/utils/controller.py,sha256=Ub1R-JN6spmXakYrOY7igwaNt4Sg8LASASdXymxZcCI,6954
 maleo_foundation/utils/exceptions.py,sha256=z24kzEP2geaAEElxXaEy7ln6KodebXvtlu-h1inZ_nw,6376
-maleo_foundation/utils/extractor.py,sha256=5ijen3e6mgUXVXIxzvKJqrn5t0g4V5lRzq50PdVhdjo,2092
+maleo_foundation/utils/extractor.py,sha256=ZNX0sQKcUwwh7paUZpdR04a18s8Ru2xNXhWZl-XN3l4,2197
 maleo_foundation/utils/logging.py,sha256=yXo2ztzt5PBEtyPR8OtYhz5Ob5uwDVwa9wpbxnh_pys,7827
 maleo_foundation/utils/merger.py,sha256=MdocyCOtIhqjcmqx2mJ0V8vtwsrunRXqhRdrBCruh7Q,622
 maleo_foundation/utils/query.py,sha256=hhISpBAZ4SV_pGf7uGBC6fzLrs_yj5_8gj-kFFeeNrw,8060
@@ -122,7 +122,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=yEL0DIVjiKSlZOxogC5pr_NAdWth9dj_ZatLjRsutIk,1269
 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.2.100.dist-info/METADATA,sha256=vM9xZ3jQQCw6ofcprNRVxsaQ4e8Rsf01i3maXDu_AoE,3599
-maleo_foundation-0.2.100.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.2.100.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.100.dist-info/RECORD,,
+maleo_foundation-0.3.1.dist-info/METADATA,sha256=7ZpZo-lRgi3r6lL7pMtWUQPrRcP8yn6rNlqKR5KKRY8,3597
+maleo_foundation-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.1.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.1.dist-info/RECORD,,