maleo-database 0.0.22__tar.gz → 0.0.24__tar.gz

{maleo_database-0.0.22 → maleo_database-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.22
+Version: 0.0.24
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_database-0.0.22 → maleo_database-0.0.24}/maleo_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.22
+Version: 0.0.24
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_database-0.0.22 → maleo_database-0.0.24}/maleo_database.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/__init__.py
 src/dtos.py
 src/enums.py
 src/handlers.py
+src/types.py
 src/config/__init__.py
 src/config/additional.py
 src/config/connection.py

{maleo_database-0.0.22 → maleo_database-0.0.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-database"
-version = "0.0.22"
+version = "0.0.24"
 description = "Database package for MaleoSuite"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

{maleo_database-0.0.22 → maleo_database-0.0.24}/src/handlers.py

@@ -1,5 +1,4 @@
 from pydantic import BaseModel, ConfigDict, Field
-from sqlalchemy.orm import DeclarativeBase
 from typing import Generic, Optional, TypeVar
 from .config import (
     ElasticsearchConfig,
@@ -21,6 +20,7 @@ from .managers import (
     SQLServerManager,
     ManagerT,
 )
+from .types import DeclarativeBaseT
 
 
 class Handler(
@@ -51,22 +51,29 @@ class RedisHandler(Handler[RedisConfig, RedisManager]):
     pass
 
 
-T = TypeVar("T", bound=DeclarativeBase)
-
-
-class MySQLHandler(Handler[MySQLConfig, MySQLManager[T]], Generic[T]):
+class MySQLHandler(
+    Handler[MySQLConfig, MySQLManager[DeclarativeBaseT]], Generic[DeclarativeBaseT]
+):
     pass
 
 
-class PostgreSQLHandler(Handler[PostgreSQLConfig, PostgreSQLManager[T]], Generic[T]):
+class PostgreSQLHandler(
+    Handler[PostgreSQLConfig, PostgreSQLManager[DeclarativeBaseT]],
+    Generic[DeclarativeBaseT],
+):
     pass
 
 
-class SQLiteHandler(Handler[SQLiteConfig, SQLiteManager[T]], Generic[T]):
+class SQLiteHandler(
+    Handler[SQLiteConfig, SQLiteManager[DeclarativeBaseT]], Generic[DeclarativeBaseT]
+):
     pass
 
 
-class SQLServerHandler(Handler[SQLServerConfig, SQLServerManager[T]], Generic[T]):
+class SQLServerHandler(
+    Handler[SQLServerConfig, SQLServerManager[DeclarativeBaseT]],
+    Generic[DeclarativeBaseT],
+):
     pass
 
 
@@ -167,7 +174,7 @@ class Handlers(
     ],
 ):
     nosql: NoSQLHandlersT = Field(..., description="NoSQL handlers")
-    sql: NoSQLHandlersT = Field(..., description="SQL handlers")
+    sql: SQLHandlersT = Field(..., description="SQL handlers")
 
 
 HandlersT = TypeVar("HandlersT", bound=Optional[Handlers])

{maleo_database-0.0.22 → maleo_database-0.0.24}/src/managers/__init__.py

@@ -6,7 +6,6 @@ from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo import MongoClient
 from redis.asyncio import Redis as AsyncRedis
 from redis import Redis as SyncRedis
-from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy import text
 from typing import Generic, Optional, Type, TypeVar
 from uuid import uuid4
@@ -44,6 +43,7 @@ from ..config import (
     ConfigT,
 )
 from ..enums import Connection
+from ..types import DeclarativeBaseT
 from .client import (
     AsyncClientT,
     SyncClientT,
@@ -97,13 +97,10 @@ class Manager(ABC, Generic[ConfigT]):
         pass
 
 
-T = TypeVar("T", bound=DeclarativeBase)
-
-
-class SQLManager(Manager[SQLConfigT], Generic[SQLConfigT, T]):
+class SQLManager(Manager[SQLConfigT], Generic[SQLConfigT, DeclarativeBaseT]):
     def __init__(
         self,
-        Base: Type[T],
+        Base: Type[DeclarativeBaseT],
         config: SQLConfigT,
         logger: Database,
         service_context: Optional[ServiceContext] = None,
@@ -255,19 +252,27 @@ class SQLManager(Manager[SQLConfigT], Generic[SQLConfigT, T]):
         await self._engine_manager.dispose()
 
 
-class MySQLManager(SQLManager[MySQLConfig, T], Generic[T]):
+class MySQLManager(
+    SQLManager[MySQLConfig, DeclarativeBaseT], Generic[DeclarativeBaseT]
+):
     pass
 
 
-class PostgreSQLManager(SQLManager[PostgreSQLConfig, T], Generic[T]):
+class PostgreSQLManager(
+    SQLManager[PostgreSQLConfig, DeclarativeBaseT], Generic[DeclarativeBaseT]
+):
     pass
 
 
-class SQLiteManager(SQLManager[SQLiteConfig, T], Generic[T]):
+class SQLiteManager(
+    SQLManager[SQLiteConfig, DeclarativeBaseT], Generic[DeclarativeBaseT]
+):
     pass
 
 
-class SQLServerManager(SQLManager[SQLServerConfig, T], Generic[T]):
+class SQLServerManager(
+    SQLManager[SQLServerConfig, DeclarativeBaseT], Generic[DeclarativeBaseT]
+):
     pass
 
 

{maleo_database-0.0.22 → maleo_database-0.0.24}/src/orm/queries.py

@@ -1,5 +1,5 @@
 from sqlalchemy import asc, cast, desc, or_, select
-from sqlalchemy.orm import DeclarativeBase, Session, aliased
+from sqlalchemy.orm import Session, aliased
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.sql import Select
 from sqlalchemy.types import DATE, String, TEXT, TIMESTAMP
@@ -11,9 +11,9 @@ from maleo.types.base.boolean import OptionalBoolean
 from maleo.types.base.integer import OptionalListOfIntegers
 from maleo.types.base.string import OptionalListOfStrings, OptionalString
 from maleo.types.enums.status import OptionalListOfDataStatuses
+from ..types import DeclarativeBaseT
 
 
-T = TypeVar("T", bound=DeclarativeBase)
 R = TypeVar(
     "R", bound=Tuple[Any, ...]
 )  # result shape inferred from Select (tuple[...])
@@ -21,7 +21,7 @@ R = TypeVar(
 
 def filter_column(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     column: str,
     value: OptionalAny = None,
     include_null: bool = False,
@@ -44,7 +44,7 @@ def filter_column(
 
 def filter_ids(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     column: str,
     ids: OptionalListOfIntegers = None,
     include_null: bool = False,
@@ -67,7 +67,7 @@ def filter_ids(
 
 def filter_timestamps(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     date_filters: Sequence[DateFilter],
 ) -> Select[R]:
     if date_filters:
@@ -94,7 +94,7 @@ def filter_timestamps(
 
 def filter_statuses(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     statuses: OptionalListOfDataStatuses,
 ) -> Select[R]:
     if statuses is not None:
@@ -105,7 +105,7 @@ def filter_statuses(
 
 def filter_is_root(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     parent_column: str = "parent_id",
     is_root: OptionalBoolean = None,
 ) -> Select[R]:
@@ -122,7 +122,7 @@ def filter_is_root(
 def filter_is_parent(
     session: Session,
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     id_column: str = "id",
     parent_column: str = "parent_id",
     is_parent: OptionalBoolean = None,
@@ -143,7 +143,7 @@ def filter_is_parent(
 
 def filter_is_child(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     parent_column: str = "parent_id",
     is_child: OptionalBoolean = None,
 ) -> Select[R]:
@@ -160,7 +160,7 @@ def filter_is_child(
 def filter_is_leaf(
     session: Session,
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     id_column: str = "id",
     parent_column: str = "parent_id",
     is_leaf: OptionalBoolean = None,
@@ -181,7 +181,7 @@ def filter_is_leaf(
 
 def search(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     search: OptionalString = None,
     columns: OptionalListOfStrings = None,
 ) -> Select[R]:
@@ -215,7 +215,7 @@ def search(
 
 def sort(
     stmt: Select[R],
-    table: Type[T],
+    table: Type[DeclarativeBaseT],
     sort_columns: Sequence[SortColumn],
 ) -> Select[R]:
     for sort_column in sort_columns:

maleo_database-0.0.24/src/types.py

@@ -0,0 +1,5 @@
+from sqlalchemy.orm import DeclarativeBase
+from typing import TypeVar
+
+
+DeclarativeBaseT = TypeVar("DeclarativeBaseT", bound=DeclarativeBase)