xn-model 0.10.4__tar.gz → 0.11.1__tar.gz

{xn_model-0.10.4/xn_model.egg-info → xn_model-0.11.1}/PKG-INFO

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

{xn_model-0.10.4 → xn_model-0.11.1}/x_model/model.py

@@ -15,13 +15,11 @@ class BaseModel(TortoiseModel):
     # todo: refact: clean old garbage
     id: int = fields.IntField(True)
 
-    _name: tuple[str] = {"name"}
-    _sorts: tuple[str] = ["-id"]
+    _name: tuple[str] = ("name",)
+    _sorts: tuple[str] = ("-id",)
 
     def repr(self, sep: str = " ") -> str:
-        if self._name in self._meta.db_fields:
-            return sep.join(getattr(self, name_fragment) for name_fragment in self._name)
-        return self.__repr__()
+        return sep.join(getattr(self, name_fragment) for name_fragment in self._name)
 
     @classmethod
     async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> TortoiseModel:
@@ -42,7 +40,7 @@ class BaseModel(TortoiseModel):
     async def upsert(cls, data: dict, oid=None):
         meta: MetaInfo = cls._meta
 
-        # pop fields for relations from general data dict
+        # pop fields for relations from general data dict # todo: add backwards fields for save
         m2ms = {k: data.pop(k) for k in meta.m2m_fields if k in data}
         # bfks = {k: data.pop(k) for k in meta.backward_fk_fields if k in data}
         # bo2os = {k: data.pop(k) for k in meta.backward_o2o_fields if k in data}
@@ -54,7 +52,7 @@ class BaseModel(TortoiseModel):
         #     unq = {key: data.pop(key) for key, ft in meta.fields_map.items() if ft.unique and key in data.keys()}
         # # unq = meta.unique_together
         # obj, is_created = await cls.update_or_create(data, **unq)
-        obj = (await cls.update_or_create(data, **{meta.pk_attr: oid}))[0] if oid else await cls.create(**data)
+        obj = (await cls.update_or_create(data, id=oid))[0] if oid else await cls.create(**data)
 
         # save relations
         for k, ids in m2ms.items():

{xn_model-0.10.4 → xn_model-0.11.1/xn_model.egg-info}/PKG-INFO

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