xync-schema 0.6.77__py3-none-any.whl → 0.6.79__py3-none-any.whl

xync_schema/enums.py

@@ -144,10 +144,10 @@ class ExAction(IntEnum):
     set_pairs = 46  # обновление пар биржи в бд
     ad = 42  # Чужая объява по id
     """ Agent: Fiat """
-    my_fiats = 25  # Список реквизитов моих платежных методов
-    fiat_new = 26  # Создание реквизита моего платежного метода
-    fiat_upd = 27  # Редактирование реквизита моего платежного метода
-    fiat_del = 28  # Удаление реквизита моего платежного метода
+    my_creds = 25  # Список реквизитов моих платежных методов
+    cred_new = 26  # Создание реквизита моего платежного метода
+    cred_upd = 27  # Редактирование реквизита моего платежного метода
+    cred_del = 28  # Удаление реквизита моего платежного метода
     """ Agent: Ad """
     my_ads = 29  # Список моих объявлений
     my_ad = 43  # Моя объява по id

xync_schema/models.py

@@ -249,6 +249,26 @@ class Actor(Model):
     ads: fields.BackwardFKRelation["Ad"]
     taken_orders: fields.BackwardFKRelation["Order"]
 
+    def client(self):
+        module_name = f"xync_client.{self.ex.name}.agent"
+        __import__(module_name)
+        client = sys.modules[module_name].AgentClient
+        return client(self, headers=self.agent.auth.get("headers"), cookies=self.agent.auth.get("cookies"))
+
+    def in_client(self):
+        import sys
+
+        module_name = f"xync_client.{self.ex.name}.inAgent"
+        __import__(module_name)
+        client = sys.modules[module_name].InAgentClient
+        return client(self)
+
+    def asset_client(self):
+        module_name = f"xync_client.{self.ex.name}.asset"
+        __import__(module_name)
+        client = sys.modules[module_name].AssetClient
+        return client(self)
+
     class Meta:
         table_description = "Actors"
         unique_together = (("ex_id", "exid"), ("ex_id", "person_id"))
@@ -266,26 +286,6 @@ class Agent(Model, TsTrait):
     # def balance(self) -> int:
     #     return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
-    def client(self):
-        module_name = f"xync_client.{self.actor.ex.name}.agent"
-        __import__(module_name)
-        client = sys.modules[module_name].AgentClient
-        return client(self)
-
-    # def in_client(self) -> "BaseInAgentClient":
-    #     import sys
-    #
-    #     module_name = f"xync_client.{self.ex.name}.inAgent"
-    #     __import__(module_name)
-    #     client = sys.modules[module_name].InAgentClient
-    #     return client(self)
-
-    def asset_client(self):
-        module_name = f"xync_client.{self.actor.ex.name}.asset"
-        __import__(module_name)
-        client = sys.modules[module_name].AssetClient
-        return client(self)
-
     # class PydanticMeta(Model.PydanticMeta):
     # max_recursion = 3
     # include = "id", "actor__ex", "auth", "updated_at"
@@ -359,7 +359,6 @@ class Pm(Model):
     bank: bool | None = fields.BooleanField(null=True)
 
     typ: PmType | None = fields.IntEnumField(PmType, null=True)
-    logo: fields.ForeignKeyNullableRelation["File"] = fields.ForeignKeyField("models.File", "pm_logos", null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
@@ -406,17 +405,15 @@ class Pmex(BaseModel):  # existence pm in ex with no cur tie
     ex_id: int
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
     pm_id: int
+    logo: fields.ForeignKeyNullableRelation["File"] = fields.ForeignKeyField("models.File", "pmex_logos", null=True)
+    logo_id: int
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
-    name_: str = fields.CharField(63, null=True)
 
     banks: fields.BackwardFKRelation["PmexBank"]
 
     class Meta:
-        unique_together = (
-            ("ex_id", "exid"),
-            ("ex_id", "name_"),
-        )  # , ("ex", "pm"), ("ex", "name")  # todo: tmp removed for HTX duplicates
+        unique_together = (("ex_id", "exid"),)  # , ("ex", "pm"), ("ex", "name")  # todo: tmp removed for HTX duplicates
 
 
 class PmexBank(BaseModel):  # banks for SBP
@@ -668,10 +665,10 @@ class TestEx(Model):
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
     _icon = "test-pipe"
-    _name = {"ex__name", "action", "ok"}
+    _name = {"ex_id", "action", "ok"}
 
     def repr(self, *args):
-        return f"{self.ex.name} {self.action.name} {self.ok}"
+        return f"{self.ex_id} {self.action.name} {self.ok}"
 
     class Meta:
         table_description = "Test Exs"
@@ -706,6 +703,8 @@ class File(Model):
     size: bytes = fields.IntField()
     created_at: datetime | None = DatetimeSecField(auto_now_add=True)
 
+    pmex_logos: fields.BackwardFKRelation[Pmex]
+
     _icon = "file"
     _name = {"name"}
 

{xync_schema-0.6.77.dist-info → xync_schema-0.6.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.6.77
+Version: 0.6.79
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA

xync_schema-0.6.79.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=4ZNpPKY54SY34nz1APsg7wKzCIvpYWhG4sKsZ1uEmVU,12697
+xync_schema/models.py,sha256=tit1QTUYuVBKx23nIbrd3l3tcveT3px7qzozq7XQj08,27725
+xync_schema/types.py,sha256=jubMlsGkaLpv1QZrInP0sEKW8SgWa6TyHENDz8OEvDM,1737
+xync_schema-0.6.79.dist-info/METADATA,sha256=978t-smQ6S6ElHdVf6Pt4wHsH6Lh_A4AO4VVBlBLIBs,4055
+xync_schema-0.6.79.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xync_schema-0.6.79.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.79.dist-info/RECORD,,

xync_schema-0.6.77.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=tE3xRj3hWOSJvFkYMv4X5bGfAkjR7OzNmVnqj1X47Go,12697
-xync_schema/models.py,sha256=LO3PLB7DcRaMyKrIE0w7eY5Jhbt3AX-IRuUSBY3ApG0,27737
-xync_schema/types.py,sha256=jubMlsGkaLpv1QZrInP0sEKW8SgWa6TyHENDz8OEvDM,1737
-xync_schema-0.6.77.dist-info/METADATA,sha256=PME5UTQ_MjyhCB-JQBuDcnXRAJ3P-LJ2pS1fR-5XSTE,4055
-xync_schema-0.6.77.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-xync_schema-0.6.77.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.77.dist-info/RECORD,,