xn-model 1.0.15__tar.gz → 1.0.17__tar.gz

{xn_model-1.0.15/xn_model.egg-info → xn_model-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-model
-Version: 1.0.15
+Version: 1.0.17
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT

{xn_model-1.0.15 → xn_model-1.0.17}/tests/test_db.py

@@ -9,6 +9,13 @@ load_dotenv()
 
 PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'xyncdbs')}:{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
 
+TORM = {
+    "connections": {"default": PG_DSN},
+    "apps": {"models": {"models": [models]}},
+    "use_tz": False,
+    "timezone": "UTC",
+}
+
 
 def test_init_db():
-    assert isinstance(run(init_db(PG_DSN, models)), AsyncpgDBClient), "DB corrupt"
+    assert isinstance(run(init_db(TORM)), AsyncpgDBClient), "DB corrupt"

{xn_model-1.0.15 → xn_model-1.0.17}/x_model/__init__.py

@@ -1,11 +1,9 @@
-from types import ModuleType
-
 from tortoise import Tortoise, connections
 from tortoise.backends.asyncpg import AsyncpgDBClient
 
 
-async def init_db(dsn: str, models: ModuleType, create_tables: bool = True) -> AsyncpgDBClient | str:
-    await Tortoise.init(db_url=dsn, modules={"models": [models]})
+async def init_db(conf: dict, create_tables: bool = True) -> AsyncpgDBClient | str:
+    await Tortoise.init(conf)
     if create_tables:
         await Tortoise.generate_schemas()
     cn: AsyncpgDBClient = connections.get("default")

{xn_model-1.0.15 → xn_model-1.0.17}/x_model/func.py

@@ -1,10 +1,10 @@
-from pypika.terms import AggregateFunction
+from pypika_tortoise.terms import AggregateFunction, Field
 from tortoise.expressions import Function
 
 
 class ArrayAgg(AggregateFunction):
     def __init__(self, term, alias=None):
-        super(ArrayAgg, self).__init__("array_agg", term, alias=alias)
+        super(ArrayAgg, self).__init__("array_agg", Field(term), alias=alias)
 
 
 class Array(Function):

{xn_model-1.0.15 → xn_model-1.0.17/xn_model.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-model
-Version: 1.0.15
+Version: 1.0.17
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT