maleo-database 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

maleo/database/managers/session.py

@@ -4,18 +4,41 @@ from contextlib import (
     asynccontextmanager,
     contextmanager,
 )
+from datetime import datetime, timezone
 from pydantic import ValidationError
 from sqlalchemy.engine import Engine
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker, AsyncSession
 from sqlalchemy.orm import sessionmaker, Session
 from typing import AsyncGenerator, Generator, Literal, Tuple, Union, overload
+from uuid import UUID, uuid4
+from maleo.mixins.timestamp import OperationTimestamp
+from maleo.types.base.uuid import OptionalUUID
+from maleo.logging.logger import Database
 from ..enums import Connection
+from ..config import (
+    PostgreSQLDatabaseConfig,
+    MySQLDatabaseConfig,
+    SQLiteDatabaseConfig,
+    SQLServerDatabaseConfig,
+)
 
 
 class SessionManager:
-    def __init__(self, engines: Tuple[AsyncEngine, Engine]) -> None:
+    def __init__(
+        self,
+        config: Union[
+            PostgreSQLDatabaseConfig,
+            MySQLDatabaseConfig,
+            SQLiteDatabaseConfig,
+            SQLServerDatabaseConfig,
+        ],
+        engines: Tuple[AsyncEngine, Engine],
+        logger: Database,
+    ) -> None:
+        self._config = config
         self._async_engine, self._sync_engine = engines
+        self._logger = logger
         self._async_sessionmaker: async_sessionmaker[AsyncSession] = async_sessionmaker[
             AsyncSession
         ](bind=self._async_engine, expire_on_commit=True)
@@ -23,101 +46,211 @@ class SessionManager:
             bind=self._sync_engine, expire_on_commit=True
         )
 
-    async def _async_session_handler(self) -> AsyncGenerator[AsyncSession, None]:
+    async def _async_session_handler(
+        self, operation_id: UUID
+    ) -> AsyncGenerator[AsyncSession, None]:
         """Async session handler with proper error handling."""
+        executed_at = datetime.now(tz=timezone.utc)
         session = self._async_sessionmaker()
         try:
             yield session
             await session.commit()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.info(
+                f"Operation {operation_id} - success - Committed async database transaction",
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": True,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
         except (SQLAlchemyError, ValidationError, Exception):
             await session.rollback()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.error(
+                f"Operation {operation_id} - failed - Error handling async database session",
+                exc_info=True,
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": False,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
             raise
         finally:
             await session.close()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.info(
+                f"Operation {operation_id} - success - Closed async database session",
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": True,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
 
-    def _sync_session_handler(self) -> Generator[Session, None, None]:
+    def _sync_session_handler(
+        self, operation_id: UUID
+    ) -> Generator[Session, None, None]:
         """Sync session handler with proper error handling."""
+        executed_at = datetime.now(tz=timezone.utc)
         session = self._sync_sessionmaker()
         try:
             yield session
             session.commit()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.info(
+                f"Operation {operation_id} - success - Committed sync database transaction",
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": True,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
         except (SQLAlchemyError, ValidationError, Exception):
             session.rollback()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.error(
+                f"Operation {operation_id} - failed - Error handling sync database session",
+                exc_info=True,
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": False,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
             raise
         finally:
             session.close()
+            completed_at = datetime.now(tz=timezone.utc)
+            self._logger.info(
+                f"Operation {operation_id} - success - Closed sync database session",
+                extra={
+                    "json_fields": {
+                        "config": self._config.model_dump(mode="json"),
+                        "operation_id": operation_id,
+                        "success": True,
+                        "timestamp": OperationTimestamp(
+                            executed_at=executed_at,
+                            completed_at=completed_at,
+                            duration=(completed_at - executed_at).total_seconds(),
+                        ).model_dump(mode="json"),
+                    },
+                },
+            )
 
-    # Overloaded inject methods
-    @overload
-    def inject(
-        self, connection: Literal[Connection.ASYNC]
-    ) -> AsyncGenerator[AsyncSession, None]: ...
+    @asynccontextmanager
+    async def _async_context_manager(
+        self, operation_id: UUID
+    ) -> AsyncGenerator[AsyncSession, None]:
+        """Async context manager implementation."""
+        async for session in self._async_session_handler(operation_id):
+            yield session
 
-    @overload
-    def inject(
-        self, connection: Literal[Connection.SYNC]
-    ) -> Generator[Session, None, None]: ...
-
-    def inject(
-        self, connection: Connection = Connection.ASYNC
-    ) -> Union[AsyncGenerator[AsyncSession, None], Generator[Session, None, None]]:
-        """Returns a generator for dependency injection."""
-        if connection is Connection.ASYNC:
-            return self._async_session_handler()
-        else:
-            return self._sync_session_handler()
+    @contextmanager
+    def _sync_context_manager(
+        self, operation_id: UUID
+    ) -> Generator[Session, None, None]:
+        """Sync context manager implementation."""
+        yield from self._sync_session_handler(operation_id)
 
     # Overloaded context manager methods
     @overload
     def get(
-        self, connection: Literal[Connection.ASYNC]
+        self, connection: Literal[Connection.ASYNC], operation_id: OptionalUUID = None
     ) -> AbstractAsyncContextManager[AsyncSession]: ...
 
     @overload
     def get(
-        self, connection: Literal[Connection.SYNC]
+        self, connection: Literal[Connection.SYNC], operation_id: OptionalUUID = None
     ) -> AbstractContextManager[Session]: ...
 
     def get(
-        self, connection: Connection = Connection.ASYNC
+        self,
+        connection: Connection = Connection.ASYNC,
+        operation_id: OptionalUUID = None,
     ) -> Union[
         AbstractAsyncContextManager[AsyncSession], AbstractContextManager[Session]
     ]:
         """Context manager for manual session handling."""
+        if operation_id is None:
+            operation_id = uuid4()
         if connection is Connection.ASYNC:
-            return self._async_context_manager()
+            return self._async_context_manager(operation_id)
         else:
-            return self._sync_context_manager()
-
-    @asynccontextmanager
-    async def _async_context_manager(self) -> AsyncGenerator[AsyncSession, None]:
-        """Async context manager implementation."""
-        async for session in self._async_session_handler():
-            yield session
-
-    @contextmanager
-    def _sync_context_manager(self) -> Generator[Session, None, None]:
-        """Sync context manager implementation."""
-        yield from self._sync_session_handler()
+            return self._sync_context_manager(operation_id)
 
     # Alternative: More explicit methods
     @asynccontextmanager
-    async def get_async(self) -> AsyncGenerator[AsyncSession, None]:
+    async def get_async(
+        self, operation_id: OptionalUUID = None
+    ) -> AsyncGenerator[AsyncSession, None]:
         """Explicit async context manager."""
-        async for session in self._async_session_handler():
+        if operation_id is None:
+            operation_id = uuid4()
+        async for session in self._async_session_handler(operation_id):
             yield session
 
     @contextmanager
-    def get_sync(self) -> Generator[Session, None, None]:
+    def get_sync(
+        self, operation_id: OptionalUUID = None
+    ) -> Generator[Session, None, None]:
         """Explicit sync context manager."""
-        yield from self._sync_session_handler()
-        # with self._sync_session_handler() as session:
-        #     yield session
+        if operation_id is None:
+            operation_id = uuid4()
+        yield from self._sync_session_handler(operation_id)
 
-    def inject_async(self) -> AsyncGenerator[AsyncSession, None]:
+    def as_async_dependency(self, operation_id: OptionalUUID = None):
         """Explicit async dependency injection."""
-        return self._async_session_handler()
+        if operation_id is None:
+            operation_id = uuid4()
+
+        def dependency() -> AsyncGenerator[AsyncSession, None]:
+            return self._async_session_handler(operation_id)
+
+        return dependency
 
-    def inject_sync(self) -> Generator[Session, None, None]:
+    def as_sync_dependency(self, operation_id: OptionalUUID = None):
         """Explicit sync dependency injection."""
-        return self._sync_session_handler()
+        if operation_id is None:
+            operation_id = uuid4()
+
+        def dependency() -> AsyncGenerator[AsyncSession, None]:
+            return self._async_session_handler(operation_id)
+
+        return dependency

{maleo_database-0.0.1.dist-info → maleo_database-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.1
+Version: 0.0.3
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -16,6 +16,7 @@ Requires-Dist: cachetools>=5.5.2
 Requires-Dist: certifi>=2025.8.3
 Requires-Dist: cffi>=1.17.1
 Requires-Dist: cfgv>=3.4.0
+Requires-Dist: charset-normalizer>=3.4.3
 Requires-Dist: click>=8.2.1
 Requires-Dist: cryptography>=45.0.6
 Requires-Dist: distlib>=0.4.0
@@ -24,23 +25,37 @@ Requires-Dist: elastic-transport>=9.1.0
 Requires-Dist: elasticsearch>=9.1.0
 Requires-Dist: fastapi>=0.116.1
 Requires-Dist: filelock>=3.19.1
+Requires-Dist: google-api-core>=2.25.1
 Requires-Dist: google-auth>=2.40.3
+Requires-Dist: google-cloud-appengine-logging>=1.6.2
+Requires-Dist: google-cloud-audit-log>=0.3.2
+Requires-Dist: google-cloud-core>=2.4.3
+Requires-Dist: google-cloud-logging>=3.12.1
+Requires-Dist: googleapis-common-protos>=1.70.0
 Requires-Dist: greenlet>=3.2.4
+Requires-Dist: grpc-google-iam-v1>=0.14.2
+Requires-Dist: grpcio>=1.74.0
+Requires-Dist: grpcio-status>=1.74.0
 Requires-Dist: identify>=2.6.13
 Requires-Dist: idna>=3.10
+Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: maleo-constants>=0.0.2
 Requires-Dist: maleo-enums>=0.0.2
-Requires-Dist: maleo-mixins>=0.0.2
+Requires-Dist: maleo-logging>=0.0.1
+Requires-Dist: maleo-mixins>=0.0.5
 Requires-Dist: maleo-types-base>=0.0.2
 Requires-Dist: maleo-types-enums>=0.0.2
 Requires-Dist: maleo-utils>=0.0.3
 Requires-Dist: motor>=3.7.1
 Requires-Dist: mypy_extensions>=1.1.0
 Requires-Dist: nodeenv>=1.9.1
+Requires-Dist: opentelemetry-api>=1.36.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: pathspec>=0.12.1
 Requires-Dist: platformdirs>=4.4.0
 Requires-Dist: pre_commit>=4.3.0
+Requires-Dist: proto-plus>=1.26.1
+Requires-Dist: protobuf>=6.32.0
 Requires-Dist: pyasn1>=0.6.1
 Requires-Dist: pyasn1_modules>=0.4.2
 Requires-Dist: pycparser>=2.22
@@ -51,6 +66,7 @@ Requires-Dist: pymongo>=4.14.1
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: redis>=6.4.0
+Requires-Dist: requests>=2.32.5
 Requires-Dist: rsa>=4.9.1
 Requires-Dist: six>=1.17.0
 Requires-Dist: sniffio>=1.3.1
@@ -60,6 +76,7 @@ Requires-Dist: typing-inspection>=0.4.1
 Requires-Dist: typing_extensions>=4.15.0
 Requires-Dist: urllib3>=2.5.0
 Requires-Dist: virtualenv>=20.34.0
+Requires-Dist: zipp>=3.23.0
 Dynamic: license-file
 
 # README #

{maleo_database-0.0.1.dist-info → maleo_database-0.0.3.dist-info}/RECORD

@@ -6,7 +6,7 @@ maleo/database/config/connection.py,sha256=lfnEE69355CNtPVlfoXaIu-IWiw4VPEkiY9tf
 maleo/database/config/identifier.py,sha256=b1MjhoKl3h7xJe1eVIj1wjvYH9BrjHzKnjzdjaEaTeQ,626
 maleo/database/config/pooling.py,sha256=tVJTxFV-fSEp4xJEVVLkTHFhhKEClSTGDQw5_pqLZgo,9246
 maleo/database/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/database/managers/session.py,sha256=qXNKxdBaY6tFqkMnj-dOLutdB5BosdsrmF60z1ooafE,4428
+maleo/database/managers/session.py,sha256=2kfHOziwnjyQVNAskQ2LLx2xbrCcnxb760T5yP1xXM0,10054
 maleo/database/managers/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/database/managers/clients/elasticsearch.py,sha256=2US-S26N2o61iGwZZ8L0baYU7cXzJ8yFKmYFCHZ9sg0,2471
 maleo/database/managers/clients/mongodb.py,sha256=h20IW1BDvZWBH-XH1U_8quoNMBDV44uyg3AAS2vIXoA,2012
@@ -25,8 +25,8 @@ maleo/database/orm/models/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 maleo/database/orm/models/mixins/identifier.py,sha256=jICVsLUFw_f7TV_aX4KTTs_ycH35MRtRj5boTqctmZo,425
 maleo/database/orm/models/mixins/status.py,sha256=Jzithn-Hl2ct1AqboGZSXrA35aaQEDvqtaB8oL7KIyo,376
 maleo/database/orm/models/mixins/timestamp.py,sha256=TWqBTBvgSxcPsK0m7ggVrkHqzlqCM-2Zox7TAwCxd0I,1500
-maleo_database-0.0.1.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_database-0.0.1.dist-info/METADATA,sha256=leFM_T3mKI2qPUA01R-PPKXUg3B52IuR-jkdlZzzKsY,2595
-maleo_database-0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_database-0.0.1.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_database-0.0.1.dist-info/RECORD,,
+maleo_database-0.0.3.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_database-0.0.3.dist-info/METADATA,sha256=aYpB8hcTx8HQXyBT0DKnOtZzxGCf365WAGAoqXpXYUE,3258
+maleo_database-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_database-0.0.3.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_database-0.0.3.dist-info/RECORD,,