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

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

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

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

@@ -18,7 +18,7 @@ from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.general.token import MaleoFoundationTokenGeneralTransfers
 from maleo_foundation.models.transfers.parameters.token import MaleoFoundationTokenParametersTransfers
 from maleo_foundation.models.transfers.parameters.signature import MaleoFoundationSignatureParametersTransfers
-from maleo_foundation.models.transfers.general import RequestContextTransfers
+from maleo_foundation.models.transfers.general.request import RequestContext
 from maleo_foundation.utils.extractor import extract_request_context
 from maleo_foundation.utils.logging import MiddlewareLogger
 
@@ -46,7 +46,7 @@ class RateLimiter:
 
     def is_rate_limited(
         self,
-        request_context: RequestContextTransfers
+        request_context: RequestContext
     ) -> bool:
         """Check if client IP is rate limited and record the request."""
         with self._lock:
@@ -117,7 +117,7 @@ class ResponseBuilder:
         self,
         authentication: Authentication,
         response: Response,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         responded_at: datetime,
         process_time: float
     ) -> Response:
@@ -139,7 +139,7 @@ class ResponseBuilder:
     def _add_signature_header(
         self,
         response: Response,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         responded_at: datetime,
         process_time: float
     ) -> None:
@@ -161,7 +161,7 @@ class ResponseBuilder:
 
     def _add_new_authorization_header(
         self,
-        request_context:RequestContextTransfers,
+        request_context:RequestContext,
         authentication:Authentication,
         response:Response
     ) -> None:
@@ -185,7 +185,7 @@ class ResponseBuilder:
 
     def _should_regenerate_auth(
         self,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         authentication: Authentication,
         response: Response
     ) -> bool:
@@ -207,7 +207,7 @@ class RequestLogger:
         self,
         authentication: Authentication,
         response: Response,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         log_level: str = "info"
     ) -> None:
         """Log request and response details."""
@@ -225,7 +225,7 @@ class RequestLogger:
         self,
         authentication: Authentication,
         error: Exception,
-        request_context: RequestContextTransfers
+        request_context: RequestContext
     ) -> None:
         """Log exception details."""
         authentication_info = self._get_authentication_info(authentication)
@@ -338,7 +338,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
     def _create_rate_limit_response(
         self,
         authentication: Authentication,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         start_time: float
     ) -> Response:
         """Create rate limit exceeded response."""
@@ -355,7 +355,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
         self,
         authentication: Authentication,
         response: Response,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         start_time: float,
         log_level: str = "info"
     ) -> Response:
@@ -379,7 +379,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
         self,
         authentication: Authentication,
         error: Exception,
-        request_context: RequestContextTransfers,
+        request_context: RequestContext,
         start_time: float
     ) -> Response:
         """Handle exceptions and create error response."""

maleo_foundation-0.2.99/maleo_foundation/models/transfers/general/pubsub.py

@@ -0,0 +1,37 @@
+from datetime import datetime, timezone
+from uuid import UUID
+from pydantic import BaseModel, Field, model_validator
+from typing import Dict, Optional, Any
+from .request import RequestContext
+from .token import MaleoFoundationTokenGeneralTransfers
+from maleo_foundation.types import BaseTypes
+
+class DatabaseAccess(BaseModel):
+    accessed_at: datetime = Field(datetime.now(tz=timezone.utc), description="Accessed at timestamp")
+    request_id: UUID = Field(..., description="Request Id")
+    request_context: RequestContext = Field(..., description="Request context")
+    organization_id: BaseTypes.OptionalInteger = Field(None, ge=1, description="Organization Id")
+    user_id: int = Field(0, ge=0, description="User Id")
+    token_string: BaseTypes.OptionalString = Field(None, description="Token string")
+    token_payload: Optional[MaleoFoundationTokenGeneralTransfers.DecodePayload] = Field(None, description="Token payload")
+    service: str = 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 self.token_payload.to_google_pubsub_object(),
+            "service": self.service,
+            "table": self.table,
+            "data_id": self.data_id,
+            "data": self.data
+        }
+
+        return result

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

@@ -0,0 +1,70 @@
+from __future__ import annotations
+from datetime import datetime, timezone
+from pydantic import BaseModel, Field
+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: Dict = Field(..., description="Request's path parameters")
+    query_params: Dict = Field(..., 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")
+
+    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},
+            "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 = obj["path_params"]["map"] or {},
+            query_params = obj["query_params"]["map"] or {},
+            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"],
+        )

maleo_foundation-0.2.99/maleo_foundation/utils/dependencies/context.py

@@ -0,0 +1,9 @@
+from fastapi.requests import Request
+from maleo_foundation.models.transfers.general.request import RequestContext
+
+class ContextDependencies:
+    @staticmethod
+    def get_request_context(
+        request: Request
+    ) -> RequestContext:
+        return request.state.request_context

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

@@ -2,7 +2,7 @@ from datetime import datetime, timezone
 from fastapi import Request
 from starlette.requests import HTTPConnection
 from uuid import uuid4
-from maleo_foundation.models.transfers.general import RequestContextTransfers
+from maleo_foundation.models.transfers.general.request import RequestContext
 
 def extract_client_ip(conn: HTTPConnection) -> str:
     """Extract client IP with more robust handling of proxies"""
@@ -21,7 +21,7 @@ def extract_client_ip(conn: HTTPConnection) -> str:
     #* Fall back to direct client connection
     return conn.client.host if conn.client else "unknown"
 
-def extract_request_context(request: Request) -> RequestContextTransfers:
+def extract_request_context(request: Request) -> RequestContext:
     headers = request.headers
 
     request_id = headers.get("x-request-id")
@@ -34,7 +34,7 @@ def extract_request_context(request: Request) -> RequestContextTransfers:
     if ua_browser:
         ua_browser = ua_browser.replace('"', "").split(",")[0].strip()
 
-    return RequestContextTransfers(
+    return RequestContext(
         request_id=request_id,
         requested_at=datetime.now(tz=timezone.utc),
         method=request.method,

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

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

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

@@ -71,6 +71,8 @@ maleo_foundation/models/schemas/token.py
 maleo_foundation/models/transfers/__init__.py
 maleo_foundation/models/transfers/general/__init__.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/models/transfers/parameters/__init__.py

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

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

maleo_foundation-0.2.98/maleo_foundation/utils/dependencies/context.py

@@ -1,9 +0,0 @@
-from fastapi.requests import Request
-from maleo_foundation.models.transfers.general import RequestContextTransfers
-
-class ContextDependencies:
-    @staticmethod
-    def get_request_context(
-        request: Request
-    ) -> RequestContextTransfers:
-        return request.state.request_context