maleo-foundation 0.1.35__tar.gz → 0.1.37__tar.gz

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/PKG-INFO

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

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/managers/db.py

@@ -5,17 +5,16 @@ from sqlalchemy.engine import Engine, create_engine
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import sessionmaker, Session, declarative_base
-from typing import Generator, Optional, Type
+from typing import Generator
 from maleo_foundation.types import BaseTypes
-from maleo_foundation.utils.logger import BaseLogger
-from maleo_foundation.db.table import BaseTable
+from maleo_foundation.utils.logging import ServiceLogger
 
 class MetadataManager:
     Base:DeclarativeMeta = declarative_base()
     metadata:MetaData = Base.metadata
 
 class SessionManager:
-    def __init__(self, logger:BaseLogger, engine:Engine):
+    def __init__(self, logger:ServiceLogger, engine:Engine):
         self._logger = logger
         self._logger.info("Initializing SessionMaker")
         self._sessionmaker:sessionmaker[Session] = sessionmaker(bind=engine, expire_on_commit=False)
@@ -62,7 +61,7 @@ class DatabaseManager:
     def __init__(
         self,
         metadata:MetaData,
-        logger:BaseLogger,
+        logger:ServiceLogger,
         url:BaseTypes.OptionalString = None
     ):
         self._metadata = metadata #* Define database metadata

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/managers/service.py

@@ -1,6 +1,5 @@
 import json
 import os
-import uvicorn
 from fastapi import FastAPI, APIRouter
 from fastapi.exceptions import RequestValidationError
 from starlette.exceptions import HTTPException
@@ -21,7 +20,7 @@ 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.keyloader import load_key
+from maleo_foundation.utils.keyloader import BaseKeyLoaders
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, MiddlewareLogger
 
 class LogConfig(BaseModel):
@@ -295,14 +294,14 @@ class ServiceManager:
     def _parse_keys(self) -> None:
         #* Parse private key
         key_type = BaseEnums.KeyType.PRIVATE
-        private = load_key(
+        private = BaseKeyLoaders.load_rsa(
             type=key_type,
             path=self._settings.PRIVATE_KEY_PATH,
             password=self._settings.KEY_PASSWORD
         )
         #* Parse public key
         key_type = BaseEnums.KeyType.PUBLIC
-        public = load_key(
+        public = BaseKeyLoaders.load_rsa(
             type=key_type,
             path=self._settings.PUBLIC_KEY_PATH
         )

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/middlewares/authentication.py

@@ -6,7 +6,7 @@ from typing import Tuple
 from maleo_foundation.authentication import Credentials, User
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
 from maleo_foundation.services.token import BaseTokenService
-from maleo_foundation.utils.extractor import extract_client_ip
+from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 class Backend(AuthenticationBackend):
@@ -16,7 +16,7 @@ class Backend(AuthenticationBackend):
         self._key = key
 
     async def authenticate(self, conn:HTTPConnection) -> Tuple[Credentials, User]:
-        client_ip = extract_client_ip(conn)
+        client_ip = BaseExtractors.extract_client_ip(conn)
         if "Authorization" not in conn.headers:
             self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Header did not contain authorization")
             return Credentials(), User(authenticated=False)

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/middlewares/base.py

@@ -9,7 +9,7 @@ from fastapi.responses import JSONResponse
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from typing import Awaitable, Callable, Optional, Sequence
 from maleo_foundation.models.responses import BaseResponses
-from maleo_foundation.utils.extractor import extract_client_ip
+from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 RequestProcessor = Callable[[Request], Awaitable[Optional[Response]]]
@@ -80,23 +80,6 @@ class BaseMiddleware(BaseHTTPMiddleware):
                 self.last_cleanup = now
                 self.logger.debug(f"Cleaned up request cache. Removed {len(inactive_ips)} inactive IPs. Current tracked IPs: {len(self.requests)}")
 
-    def _extract_client_ip(self, request:Request) -> str:
-        """Extract client IP with more robust handling of proxies"""
-        #* Check for X-Forwarded-For header (common when behind proxy/load balancer)
-        x_forwarded_for = request.headers.get("X-Forwarded-For")
-        if x_forwarded_for:
-            #* The client's IP is the first one in the list
-            ips = [ip.strip() for ip in x_forwarded_for.split(",")]
-            return ips[0]
-        
-        #* Check for X-Real-IP header (used by some proxies)
-        x_real_ip = request.headers.get("X-Real-IP")
-        if x_real_ip:
-            return x_real_ip
-            
-        #* Fall back to direct client connection
-        return request.client.host if request.client else "unknown"
-
     def _check_rate_limit(self, client_ip:str) -> bool:
         """Check if the client has exceeded their rate limit"""
         with self._lock:
@@ -179,7 +162,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
         self._cleanup_old_data() #* Run periodic cleanup
         request_timestamp = datetime.now(tz=timezone.utc) #* Record the request timestamp
         start_time = time.perf_counter() #* Record the start time
-        client_ip = extract_client_ip(request) #* Get request IP with improved extraction
+        client_ip = BaseExtractors.extract_client_ip(request) #* Get request IP with improved extraction
 
         try:
             #* 1. Rate limit check

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/utils/__init__.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 from .formatter import BaseFormatter
-from .logger import BaseLogger
 from .exceptions import BaseExceptions
+from .extractor import BaseExtractors
+from .keyloader import BaseKeyLoaders
 from .controller import BaseControllerUtils
 from .query import BaseQueryUtils
 
 class BaseUtils:
     Formatter = BaseFormatter
-    Logger = BaseLogger
     Exceptions = BaseExceptions
+    Extractors = BaseExtractors
+    KeyLoader = BaseKeyLoaders
     Controller = BaseControllerUtils
     Query = BaseQueryUtils

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation/utils/exceptions.py

@@ -8,7 +8,7 @@ from typing import Optional
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.results.service.general import BaseServiceGeneralResultsTransfers
 from maleo_foundation.models.transfers.results.service.query import BaseServiceQueryResultsTransfers
-from maleo_foundation.utils.logger import BaseLogger, LoggerFactory
+from maleo_foundation.utils.logging import BaseLogger
 
 class BaseExceptions:
     @staticmethod
@@ -27,15 +27,9 @@ class BaseExceptions:
     def database_exception_handler(
         operation:str,
         logger:Optional[BaseLogger] = None,
-        logger_factory:Optional[LoggerFactory] = None,
         fail_result_class:type[BaseServiceQueryResultsTransfers.Fail] = BaseServiceQueryResultsTransfers.Fail
     ):
         """Decorator to handle database-related exceptions consistently."""
-        if logger is not None and logger_factory is not None:
-            raise RuntimeError("Only one of 'logger' or 'logger_factory' should be provided, not both.")
-        if logger is None and logger_factory is None:
-            raise RuntimeError("One of 'logger' or 'logger_factory' must be provided.")
-        logger = logger or logger_factory()
         def decorator(func):
             @wraps(func)
             def wrapper(*args, **kwargs):
@@ -62,15 +56,9 @@ class BaseExceptions:
     def service_exception_handler(
         operation:str,
         logger:Optional[BaseLogger] = None,
-        logger_factory:Optional[LoggerFactory] = None,
         fail_result_class:type[BaseServiceGeneralResultsTransfers.Fail] = BaseServiceGeneralResultsTransfers.Fail
     ):
         """Decorator to handle service-related exceptions consistently."""
-        if logger is not None and logger_factory is not None:
-            raise RuntimeError("Only one of 'logger' or 'logger_factory' should be provided, not both.")
-        if logger is None and logger_factory is None:
-            raise RuntimeError("One of 'logger' or 'logger_factory' must be provided.")
-        logger = logger or logger_factory()
         def decorator(func):
             @wraps(func)
             def wrapper(*args, **kwargs):

maleo_foundation-0.1.37/maleo_foundation/utils/extractor.py

@@ -0,0 +1,20 @@
+from starlette.requests import HTTPConnection
+
+class BaseExtractors:
+    @staticmethod
+    def extract_client_ip(conn:HTTPConnection) -> str:
+        """Extract client IP with more robust handling of proxies"""
+        #* Check for X-Forwarded-For header (common when behind proxy/load balancer)
+        x_forwarded_for = conn.headers.get("X-Forwarded-For")
+        if x_forwarded_for:
+            #* The client's IP is the first one in the list
+            ips = [ip.strip() for ip in x_forwarded_for.split(",")]
+            return ips[0]
+
+        #* Check for X-Real-IP header (used by some proxies)
+        x_real_ip = conn.headers.get("X-Real-IP")
+        if x_real_ip:
+            return x_real_ip
+
+        #* Fall back to direct client connection
+        return conn.client.host if conn.client else "unknown"

maleo_foundation-0.1.37/maleo_foundation/utils/keyloader.py

@@ -0,0 +1,67 @@
+import pathlib
+from cryptography.hazmat.primitives import serialization
+from typing import Optional, Union
+from maleo_foundation.enums import BaseEnums
+
+class BaseKeyLoaders:
+    @staticmethod
+    def load_rsa(
+        type:BaseEnums.KeyType,
+        path: Union[str, pathlib.Path],
+        password:Optional[Union[str, bytes]] = None,
+        format:BaseEnums.KeyFormatType = BaseEnums.KeyFormatType.STRING,
+    ) -> Union[bytes, str]:
+        """
+        Load an RSA private or public key strictly from a file.
+
+        Args:
+            path (str | pathlib.Path): Path to the PEM file.
+            password (str | bytes | None): Password for encrypted private keys (optional).
+
+        Returns:
+            rsa.RSAPrivateKey | rsa.RSAPublicKey
+        """
+        if not isinstance(type, BaseEnums.KeyType):
+            raise TypeError("Invalid key type")
+
+        file_path = pathlib.Path(path)
+
+        if not file_path.is_file():
+            raise FileNotFoundError(f"Key file not found: {file_path}")
+
+        if password is not None and not isinstance(password, (str, bytes)):
+            raise TypeError("Invalid passsword type")
+
+        if not isinstance(format, BaseEnums.KeyFormatType):
+            raise TypeError("Invalid key format type")
+
+        key_data = file_path.read_bytes()
+
+        if type == BaseEnums.KeyType.PRIVATE:
+            private_key = serialization.load_pem_private_key(
+                key_data,
+                password=password.encode() if isinstance(password, str) else password,
+            )
+            private_key_bytes = private_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption()
+            )
+            if format == BaseEnums.KeyFormatType.BYTES:
+                return private_key_bytes
+            elif format == BaseEnums.KeyFormatType.STRING:
+                return private_key_bytes.decode()
+
+        elif type == BaseEnums.KeyType.PUBLIC:
+            public_key = serialization.load_pem_public_key(key_data)
+            public_key_bytes = public_key.public_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PublicFormat.SubjectPublicKeyInfo
+            )
+            if format == BaseEnums.KeyFormatType.BYTES:
+                return public_key_bytes
+            elif format == BaseEnums.KeyFormatType.STRING:
+                return public_key_bytes.decode()
+
+        else:
+            raise ValueError(f"Unsupported key type: {type}")

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/maleo_foundation.egg-info/SOURCES.txt

@@ -11,25 +11,6 @@ maleo_foundation.egg-info/SOURCES.txt
 maleo_foundation.egg-info/dependency_links.txt
 maleo_foundation.egg-info/requires.txt
 maleo_foundation.egg-info/top_level.txt
-maleo_foundation/clients/__init__.py
-maleo_foundation/clients/general/__init__.py
-maleo_foundation/clients/general/http.py
-maleo_foundation/clients/google/__init__.py
-maleo_foundation/clients/google/base.py
-maleo_foundation/clients/google/secret.py
-maleo_foundation/clients/google/storage.py
-maleo_foundation/clients/google/cloud/__init__.py
-maleo_foundation/clients/google/cloud/base.py
-maleo_foundation/clients/google/cloud/logging.py
-maleo_foundation/clients/google/cloud/secret.py
-maleo_foundation/clients/google/cloud/storage.py
-maleo_foundation/clients/utils/__init__.py
-maleo_foundation/clients/utils/logger.py
-maleo_foundation/db/__init__.py
-maleo_foundation/db/engine.py
-maleo_foundation/db/manager.py
-maleo_foundation/db/session.py
-maleo_foundation/db/table.py
 maleo_foundation/expanded_types/__init__.py
 maleo_foundation/expanded_types/client.py
 maleo_foundation/expanded_types/general.py
@@ -53,6 +34,7 @@ maleo_foundation/middlewares/base.py
 maleo_foundation/middlewares/cors.py
 maleo_foundation/models/__init__.py
 maleo_foundation/models/responses.py
+maleo_foundation/models/table.py
 maleo_foundation/models/schemas/__init__.py
 maleo_foundation/models/schemas/general.py
 maleo_foundation/models/schemas/parameter.py
@@ -84,7 +66,6 @@ maleo_foundation/utils/controller.py
 maleo_foundation/utils/exceptions.py
 maleo_foundation/utils/extractor.py
 maleo_foundation/utils/keyloader.py
-maleo_foundation/utils/logger.py
 maleo_foundation/utils/logging.py
 maleo_foundation/utils/query.py
 maleo_foundation/utils/formatter/__init__.py

{maleo_foundation-0.1.35 → maleo_foundation-0.1.37}/pyproject.toml

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

maleo_foundation-0.1.35/maleo_foundation/clients/__init__.py

@@ -1,7 +0,0 @@
-from __future__ import annotations
-from .general import BaseGeneralClients
-from .google import GoogleClients
-
-class BaseClients:
-    General = BaseGeneralClients
-    Google = GoogleClients

maleo_foundation-0.1.35/maleo_foundation/clients/general/__init__.py

@@ -1,4 +0,0 @@
-from .http import HTTPClientManager
-
-class BaseGeneralClients:
-    HTTP = HTTPClientManager

maleo_foundation-0.1.35/maleo_foundation/clients/general/http.py

@@ -1,50 +0,0 @@
-import httpx
-from contextlib import asynccontextmanager
-from typing import AsyncGenerator, Optional
-
-class HTTPClientManager:
-    client:Optional[httpx.AsyncClient] = None
-    base_url:Optional[str] = None
-
-    @classmethod
-    def initialize(cls) -> None:
-        """Initialize the HTTP client if not already initialized."""
-        if cls.client is None:
-            cls.client = httpx.AsyncClient()
-
-    @classmethod
-    async def _client_handler(cls) -> AsyncGenerator[httpx.AsyncClient, None]:
-        """Reusable generator for client handling."""
-        if cls.client is None:
-            raise RuntimeError("Client has not been initialized. Call initialize first.")
-
-        yield cls.client
-
-    @classmethod
-    async def inject_client(cls) -> AsyncGenerator[httpx.AsyncClient, None]:
-        return cls._client_handler()
-
-    @classmethod
-    @asynccontextmanager
-    async def get_client(cls) -> AsyncGenerator[httpx.AsyncClient, None]:
-        """
-        Async context manager for manual HTTP client handling.
-        Supports `async with HTTPClientManager.get() as client:`
-        """
-        async for client in cls._client_handler():
-            yield client
-
-    @classmethod
-    def get_url(cls) -> str:
-        if cls.base_url is None:
-            raise RuntimeError("Base URL has not been initialized. Call initialize first.")
-        return cls.base_url
-
-    @classmethod
-    async def dispose(cls) -> None:
-        """Dispose of the HTTP client and release any resources."""
-        if cls.client is not None:
-            await cls.client.aclose()
-            cls.client = None
-        if cls.base_url is not None:
-            cls.base_url = None

maleo_foundation-0.1.35/maleo_foundation/clients/google/__init__.py

@@ -1,4 +0,0 @@
-from .cloud import GoogleCloudClients
-
-class GoogleClients:
-    Cloud = GoogleCloudClients

maleo_foundation-0.1.35/maleo_foundation/clients/google/base.py

@@ -1,32 +0,0 @@
-import os
-from google.auth import default
-from google.oauth2 import service_account
-from maleo_foundation.types import BaseTypes
-
-class GoogleClientManager:
-    def __init__(self, google_credentials_path:BaseTypes.OptionalString = None) -> None:
-        google_credentials_path = google_credentials_path or os.getenv("GOOGLE_CREDENTIALS_PATH")
-        try:
-            if google_credentials_path is not None:
-                self._credentials = service_account.Credentials.from_service_account_file(filename=google_credentials_path)
-            else:
-                self._credentials, _ = default()
-        except Exception as e:
-            raise ValueError(f"Failed to initialize credentials: {str(e)}")
-
-    @property
-    def credentials(self) -> service_account.Credentials:
-        return self._credentials
-    
-    @property
-    def name(self) -> str:
-        raise NotImplementedError()
-
-    @property
-    def client(self):
-        raise NotImplementedError()
-
-    def dispose(self) -> None:
-        """Dispose of the client and release any resources."""
-        if self._credentials is not None:
-            self._credentials = None

maleo_foundation-0.1.35/maleo_foundation/clients/google/cloud/__init__.py

@@ -1,8 +0,0 @@
-from .logging import GoogleCloudLogging
-from .secret import GoogleSecretManager
-from .storage import GoogleCloudStorage
-
-class GoogleCloudClients:
-    Logging = GoogleCloudLogging
-    Secret = GoogleSecretManager
-    Storage = GoogleCloudStorage

maleo_foundation-0.1.35/maleo_foundation/clients/google/cloud/base.py

@@ -1,32 +0,0 @@
-import os
-from google.auth import default
-from google.oauth2 import service_account
-from maleo_foundation.types import BaseTypes
-
-class GoogleCloudClientManager:
-    def __init__(self, google_credentials_path:BaseTypes.OptionalString = None) -> None:
-        google_credentials_path = google_credentials_path or os.getenv("GOOGLE_CREDENTIALS_PATH")
-        try:
-            if google_credentials_path is not None:
-                self._credentials = service_account.Credentials.from_service_account_file(filename=google_credentials_path)
-            else:
-                self._credentials, _ = default()
-        except Exception as e:
-            raise ValueError(f"Failed to initialize credentials: {str(e)}")
-
-    @property
-    def credentials(self) -> service_account.Credentials:
-        return self._credentials
-    
-    @property
-    def name(self) -> str:
-        raise NotImplementedError()
-
-    @property
-    def client(self):
-        raise NotImplementedError()
-
-    def dispose(self) -> None:
-        """Dispose of the client and release any resources."""
-        if self._credentials is not None:
-            self._credentials = None

maleo_foundation-0.1.35/maleo_foundation/clients/google/cloud/logging.py

@@ -1,63 +0,0 @@
-import os
-from google.auth import default
-from google.cloud.logging import Client
-from google.cloud.logging.handlers import CloudLoggingHandler
-from google.oauth2 import service_account
-from typing import Optional
-from .base import GoogleCloudClientManager
-
-class GoogleCloudLogging:
-    _client:Optional[Client] = None
-
-    @classmethod
-    def initialize(cls) -> Client:
-        """Initialize the cloud logging if not already initialized."""
-        if cls._client is None:
-            #* Setup credentials with fallback chain
-            credentials = None
-            credentials_file = os.getenv("GOOGLE_APPLICATION_CREDENTIALS")
-            try:
-                if credentials_file:
-                    credentials = service_account.Credentials.from_service_account_file(credentials_file)
-                else:
-                    credentials, _ = default()
-            except Exception as e:
-                raise ValueError(f"Failed to initialize credentials: {str(e)}")
-
-            cls._client = Client(credentials=credentials)
-            cls._client.setup_logging()
-
-    @classmethod
-    def dispose(cls) -> None:
-        """Dispose of the cloud logging and release any resources."""
-        if cls._client is not None:
-            cls._client = None
-
-    @classmethod
-    def _get_client(cls) -> Client:
-        """Retrieve the cloud logging client, initializing it if necessary."""
-        cls.initialize()
-        return cls._client
-
-    @classmethod
-    def create_handler(cls, name:str):
-        cls.initialize()
-        return CloudLoggingHandler(client=cls._client, name=name)
-
-class GoogleCloudLoggingV2(GoogleCloudClientManager):
-    def __init__(self, google_credentials_path = None) -> None:
-        super().__init__(google_credentials_path)
-        self._client = Client(credentials=self._credentials)
-        self._client.setup_logging()
-
-    @property
-    def client(self) -> Client:
-        return self._client
-
-    def dispose(self) -> None:
-        if self._client is not None:
-            self._client = None
-        return super().dispose()
-
-    def create_handler(self, name:str) -> CloudLoggingHandler:
-        return CloudLoggingHandler(client=self._client, name=name)