maleo-database 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

maleo/database/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/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/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/types.py

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

{maleo_database-0.0.22.dist-info → maleo_database-0.0.24.dist-info}/METADATA

@@ -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.dist-info → maleo_database-0.0.24.dist-info}/RECORD

@@ -1,21 +1,22 @@
 maleo/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/database/dtos.py,sha256=DArPtSXzPJd896i-t4OmoqBP1mW-it8NVxvfWq7wq8Y,220
 maleo/database/enums.py,sha256=tHJugOgGWEarwyHbUXmqK-AFXO-D-pmhIdXHkE81ik8,1691
-maleo/database/handlers.py,sha256=pPN2cxXZaok1yttj9O8L83rFcbW19FGLUoFeUlMDNIM,3937
+maleo/database/handlers.py,sha256=A8cY9yyqNhFO0L6kC1P3XdWO4xC9JXZQhK1JQs6AU2Q,4040
+maleo/database/types.py,sha256=FFosx0E46pq7423Fc85P1uA8CRPaJsY0m88KG86oLjY,142
 maleo/database/config/__init__.py,sha256=ygBWG1iq9tPCKo_mtcWgd5jcJ6gKhHmxXuZOmLuL2Hc,11102
 maleo/database/config/additional.py,sha256=8uTEQDoKjAlXif-1njKuicIT07H_slTWr9pE0OENAU0,1098
 maleo/database/config/connection.py,sha256=0Cg0XUxf20Q_RVqFmzOtBUXl9m7I-x9BEyEhZVoWEh4,22869
 maleo/database/config/identifier.py,sha256=b1MjhoKl3h7xJe1eVIj1wjvYH9BrjHzKnjzdjaEaTeQ,626
 maleo/database/config/pooling.py,sha256=4Q0rkM4FAt6xAbBG1PItHmMSzS7aCZNBgFPeaEjKwTo,11552
-maleo/database/managers/__init__.py,sha256=lRcOl_ouqs2yQqqCH5-vj1WQXxV2U1tf-X3Ih2Q2Hxs,13207
+maleo/database/managers/__init__.py,sha256=9fITbrn9qjmzWp2oe5KmYVa2KZZxf-7INbiXd9ctxic,13333
 maleo/database/managers/client.py,sha256=hdfPn8Ae8G78yZYDxI1FylcM-rPMIL8Ty4XmsASDrt0,3065
 maleo/database/managers/engine.py,sha256=aF7JCjSYujodbn2QQrT_OeLX-WjUdIv5cBgWtvLgHI0,1725
 maleo/database/managers/session.py,sha256=aKyuiHiA171Vptr92AA5U-mRwzwbKXb9RAZ9Wq5Wo4s,19557
 maleo/database/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/database/orm/mixins.py,sha256=rW-FVOrRm_R8yJyrcwGoVIPPV1oAOhSVFmANHR7bowU,2372
-maleo/database/orm/queries.py,sha256=SQEgNzv7f-Twbi2X5P73bBnZRgYfwA9P2KYqSB4SaNc,7326
-maleo_database-0.0.22.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_database-0.0.22.dist-info/METADATA,sha256=qLzPWG-fn5LsHRkRjebaI4JmOQxdHH8AuNauJ6-CKbI,3837
-maleo_database-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_database-0.0.22.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_database-0.0.22.dist-info/RECORD,,
+maleo/database/orm/queries.py,sha256=GGt9Ca92IQwQ6YTjmx03xULQ7UPKkFckbHwZCzjdZDY,7456
+maleo_database-0.0.24.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_database-0.0.24.dist-info/METADATA,sha256=tqqD2BBgJgJSWMuQhREnMtIa4kSyxBiDyDaGwwKiBJQ,3837
+maleo_database-0.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_database-0.0.24.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_database-0.0.24.dist-info/RECORD,,