xn-model 1.0.16__py3-none-any.whl → 1.0.18__py3-none-any.whl

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")

x_model/models.py

@@ -52,7 +52,8 @@ class Model(TortModel):
             #     fields.append(fld)
 
             dcl = make_dataclass(cls.__name__ + cn, fields, bases=(BaseUpd,), kw_only=True)
-            dcl._unq = set((cls._meta.unique_together or ((),))[0])
+            dcl._unq = {o + "_id" for o in cls._meta.o2o_fields}
+            dcl._unq |= set((cls._meta.unique_together or ((),))[0])
             if with_pk:
                 dcl._unq |= {"id"}
             setattr(cls, cn, dcl)

{xn_model-1.0.16.dist-info → xn_model-1.0.18.dist-info}/METADATA

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

xn_model-1.0.18.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=1Lgvr-SZwkM4R7L0ceVLyArzzMJiFLgaid-RUOk_ypM,344
+x_model/field.py,sha256=zVszcPZFVEwsurqbFQF-_caiSLruh3TRSZdgQqwWJV8,2776
+x_model/func.py,sha256=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
+x_model/models.py,sha256=8k1GqdYSQ1h1VLcLqQVa4kVoz6XHrZR5xxOIwCgyisQ,3668
+x_model/types.py,sha256=iES9Oxj45hEBB1tvZlNAOM4eS7w3Y8iC37X7FmcEwe4,318
+xn_model-1.0.18.dist-info/METADATA,sha256=3ZoZZdb4BxOpbQuk93f6toQcq81jK3sGO6jddVJbPqA,986
+xn_model-1.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xn_model-1.0.18.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.18.dist-info/RECORD,,

xn_model-1.0.16.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=JRsYD3P-8pHpEkCUgy6GuodkT7ZaY1AEeEK1CbpgZw4,428
-x_model/field.py,sha256=zVszcPZFVEwsurqbFQF-_caiSLruh3TRSZdgQqwWJV8,2776
-x_model/func.py,sha256=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
-x_model/models.py,sha256=IMql5xfU1dw7n1uYba5pXQnsK7_1pzLTScGRWYUW2NA,3602
-x_model/types.py,sha256=iES9Oxj45hEBB1tvZlNAOM4eS7w3Y8iC37X7FmcEwe4,318
-xn_model-1.0.16.dist-info/METADATA,sha256=XD9qURCotfDXy2ry3iAFNYaqLSjQwiG28wzlrlj1v7U,986
-xn_model-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xn_model-1.0.16.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.16.dist-info/RECORD,,