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

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

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

{maleo_foundation-0.1.35 → maleo_foundation-0.1.36}/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.36}/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

{maleo_foundation-0.1.35 → maleo_foundation-0.1.36}/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.35 → maleo_foundation-0.1.36}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.35 → maleo_foundation-0.1.36}/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.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.1.35"
+version = "0.1.36"
 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)

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

@@ -1,149 +0,0 @@
-import os
-from google.api_core import retry
-from google.api_core.exceptions import NotFound
-from google.auth import default
-from google.cloud import secretmanager
-from google.oauth2 import service_account
-from typing import Optional
-from .base import GoogleCloudClientManager
-
-class GoogleSecretManager:
-    _project:Optional[str] = None
-    _client:Optional[secretmanager.SecretManagerServiceClient] = None
-
-    @classmethod
-    def initialize(cls, project_id:Optional[str] = None) -> None:
-        """Initialize the cloud storage if not already initialized."""
-        cls._project = project_id or os.getenv("GCP_PROJECT_ID")
-        if cls._project is None:
-            raise ValueError("GCP_PROJECT_ID environment variable must be set if no project_id is provided")
-        if cls._client is None:
-            #* Setup credentials with fallback chain
-            credentials = None
-            credentials_file = os.getenv("GOOGLE_CREDENTIALS_PATH")
-            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 = secretmanager.SecretManagerServiceClient(credentials=credentials)
-
-    @classmethod
-    def dispose(cls):
-        """Disposes of the Google Secret Manager client"""
-        if cls._client is not None:
-            cls._client = None
-        if cls._project is not None:
-            cls._project = None
-
-    @classmethod
-    @retry.Retry(
-        predicate=retry.if_exception_type(Exception),
-        timeout=5
-    )
-    def get(
-        cls,
-        name:str,
-        version:str = "latest",
-    ) -> Optional[str]:
-        try:
-            secret_path = f"projects/{cls._project}/secrets/{name}/versions/{version}"
-            request = secretmanager.AccessSecretVersionRequest(name=secret_path)
-            response = cls._client.access_secret_version(request=request)
-            return response.payload.data.decode()
-        except Exception as e:
-            return None
-
-    @classmethod
-    @retry.Retry(
-        predicate=retry.if_exception_type(Exception),
-        timeout=5
-    )
-    def create(
-        cls,
-        name:str,
-        data:str
-    ) -> Optional[str]:
-        parent = f"projects/{cls._project}"
-        secret_path = f"{parent}/secrets/{name}"
-        try:
-            #* Check if the secret already exists
-            request = secretmanager.GetSecretRequest(name=secret_path)
-            cls._client.get_secret(request=request)
-
-        except NotFound:
-            #* Secret does not exist, create it first
-            try:
-                secret = secretmanager.Secret(name=name, replication={"automatic": {}})
-                request = secretmanager.CreateSecretRequest(parent=parent, secret_id=name, secret=secret)
-                cls._client.create_secret(request=request)
-            except Exception as e:
-                return None
-
-        #* Add a new secret version
-        try:
-            payload = secretmanager.SecretPayload(data=data.encode())  # ✅ Fixed attribute name
-            request = secretmanager.AddSecretVersionRequest(parent=secret_path, payload=payload)
-            response = cls._client.add_secret_version(request=request)
-            return data
-        except Exception as e:
-            return None
-
-class GoogleSecretManagerV2(GoogleCloudClientManager):
-    def __init__(self, google_credentials_path = None) -> None:
-        super().__init__(google_credentials_path)
-        self._project_id = self.credentials.project_id
-        self._client = secretmanager.SecretManagerServiceClient(credentials=self.credentials)
-
-    @property
-    def project_id(self):
-        return self._project_id
-
-    @property
-    def client(self) -> secretmanager.SecretManagerServiceClient:
-        return self._client
-
-    def dispose(self):
-        if self._client is not None:
-            self._client = None
-        return super().dispose()
-
-    @retry.Retry(predicate=retry.if_exception_type(Exception), timeout=5)
-    def get(self, name:str, version:str = "latest") -> Optional[str]:
-        try:
-            secret_path = f"projects/{self._project_id}/secrets/{name}/versions/{version}"
-            request = secretmanager.AccessSecretVersionRequest(name=secret_path)
-            response = self._client.access_secret_version(request=request)
-            return response.payload.data.decode()
-        except Exception as e:
-            return None
-
-    @retry.Retry(predicate=retry.if_exception_type(Exception), timeout=5)
-    def create(self, name:str, data:str) -> Optional[str]:
-        parent = f"projects/{self._project_id}"
-        secret_path = f"{parent}/secrets/{name}"
-        try:
-            #* Check if the secret already exists
-            request = secretmanager.GetSecretRequest(name=secret_path)
-            self._client.get_secret(request=request)
-
-        except NotFound:
-            #* Secret does not exist, create it first
-            try:
-                secret = secretmanager.Secret(name=name, replication={"automatic": {}})
-                request = secretmanager.CreateSecretRequest(parent=parent, secret_id=name, secret=secret)
-                self._client.create_secret(request=request)
-            except Exception as e:
-                return None
-
-        #* Add a new secret version
-        try:
-            payload = secretmanager.SecretPayload(data=data.encode())  # ✅ Fixed attribute name
-            request = secretmanager.AddSecretVersionRequest(parent=secret_path, payload=payload)
-            response = self._client.add_secret_version(request=request)
-            return data
-        except Exception as e:
-            return None

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

@@ -1,110 +0,0 @@
-import os
-from datetime import timedelta
-from google.auth import default
-from google.cloud.storage import Bucket, Client
-from google.oauth2 import service_account
-from typing import Optional
-from maleo_foundation.types import BaseTypes
-from .base import GoogleCloudClientManager
-
-class GoogleCloudStorage:
-    _client:Optional[Client] = None
-    _bucket:Optional[Bucket] = None
-
-    @classmethod
-    def initialize(cls) -> None:
-        """Initialize the cloud storage if not already initialized."""
-        if cls._client is None:
-            #* Setup credentials with fallback chain
-            credentials = None
-            credentials_file = os.getenv("GOOGLE_CREDENTIALS_PATH")
-            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)
-
-            #* Preload bucket
-            bucket_name = os.getenv("GCS_BUCKET_NAME")
-            if not bucket_name:
-                cls._client.close()
-                raise ValueError("GCS_BUCKET_NAME environment variable must be set")
-
-            #* Validate bucket existence
-            bucket = cls._client.lookup_bucket(bucket_name)
-            if bucket is None:
-                raise ValueError(f"Bucket '{bucket_name}' does not exist.")
-
-            cls._bucket = bucket
-
-    @classmethod
-    def dispose(cls) -> None:
-        """Dispose of the cloud storage and release any resources."""
-        if cls._client is not None:
-            cls._client.close()
-            cls._client = None
-            cls._bucket = None
-
-    @classmethod
-    def _get_client(cls) -> Client:
-        """Retrieve the cloud storage client, initializing it if necessary."""
-        cls.initialize()
-        return cls._client
-
-    @classmethod
-    def generate_signed_url(cls, location:str) -> str:
-        """
-        generate signed URL of a file in the bucket based on its location.
-
-        Args:
-            location: str
-                Location of the file inside the bucket
-
-        Returns:
-            str: File's pre-signed download url
-
-        Raises:
-            ValueError: If the file does not exist
-        """
-        cls.initialize()
-        blob = cls._bucket.blob(blob_name=location)
-        if not blob.exists():
-            raise ValueError(f"File '{location}' did not exists.")
-
-        url = blob.generate_signed_url(version="v4", expiration=timedelta(minutes=15), method="GET")
-        return url
-
-class GoogleCloudStorageV2(GoogleCloudClientManager):
-    def __init__(self, google_credentials_path = None, bucket_name:BaseTypes.OptionalString = None) -> None:
-        super().__init__(google_credentials_path)
-        self._client = Client(credentials=self._credentials)
-        self._bucket_name = bucket_name or os.getenv("GCS_BUCKET_NAME")
-        if self._bucket_name is None:
-            self._client.close()
-            raise ValueError("GCS_BUCKET_NAME environment variable must be set if 'bucket_name' is set to None")
-        self._bucket = self._client.lookup_bucket(bucket_name=self._bucket_name)
-        if self._bucket is None:
-            raise ValueError(f"Bucket '{self._bucket_name}' does not exist.")
-
-    @property
-    def client(self) -> Client:
-        return self._client
-
-    @property
-    def bucket_name(self) -> str:
-        return self._bucket_name
-
-    @property
-    def bucket(self) -> Bucket:
-        return self._bucket
-
-    def dispose(self):
-        if self._bucket is not None:
-            self._bucket = None
-        if self._client is not None:
-            self._client = None
-        return super().dispose()