xync-schema 0.6.28__tar.gz → 0.6.30__tar.gz

{xync_schema-0.6.28/xync_schema.egg-info → xync_schema-0.6.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.28
+Version: 0.6.30
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -10,8 +10,8 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: xtg-auth
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 ## INSTALL

{xync_schema-0.6.28 → xync_schema-0.6.30}/pyproject.toml

@@ -4,14 +4,19 @@ requires-python = ">=3.12"
 authors = [
     {name = "Mike Artemiev", email = "mixartemev@gmail.com"},
 ]
-dependencies = [
-    "xtg-auth"
-]
 description = "XyncNet project database model schema"
 readme = "README.md"
 license = {text = "EULA"}
 dynamic = ["version"]
 
+dependencies = ["xtg-auth"]
+
+[project.optional-dependencies]
+dev = [
+    "build",
+    "pytest-asyncio",
+    "twine",
+]
 [project.urls]
 Homepage = "https://gitlab.com/xync/back/schema"
 Repository = "https://gitlab.com/xync/back/schema"
@@ -23,12 +28,8 @@ build-backend = "setuptools.build_meta"
 version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMVER_MINOR++ else SEMVER_PATCH++
 local_scheme = "no-local-version"
 
-[project.optional-dependencies]
-dev = [
-    "pytest",
-    "build",
-    "twine",
-]
+[tool.setuptools]
+packages = ["xync_schema"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

{xync_schema-0.6.28 → xync_schema-0.6.30}/tests/test_db.py

@@ -6,15 +6,15 @@ from tortoise import connections
 from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 
-from xync_schema import model
-from xync_schema.model import Cur
+from xync_schema import models
+from xync_schema.models import Cur
 
 load_dotenv()
 
 
 @pytest.fixture
 async def dbc() -> AsyncpgDBClient:
-    await init_db(env("DB_URL"), model, True)
+    await init_db(env("DB_URL"), models, True)
     cn: AsyncpgDBClient = connections.get("default")
     yield cn
     await cn.close()

xync_schema-0.6.28/xync_schema/model.py → xync_schema-0.6.30/xync_schema/models.py

@@ -1,12 +1,12 @@
 from datetime import datetime
 from enum import IntEnum
 from tortoise import fields
-from x_auth.model import Model
-from x_model.model import TsTrait, DatetimeSecField
+from x_auth.models import Model
+from x_model.models import TsTrait, DatetimeSecField
 from tg_auth.models import UserRefTrait, UserInfoTrait, User as BaseUser, UserStatus
 
 
-class AdvStatus(IntEnum):
+class AdStatus(IntEnum):
     defActive = 0
     active = 1
     two = 2
@@ -17,7 +17,7 @@ class AdvStatus(IntEnum):
 
 class OrderStatus(IntEnum):
     zero = 0
-    one = 1
+    active = 1
     two = 2
     three = 3
     done = 4
@@ -125,6 +125,7 @@ class Cur(Model):
     country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
+    curexs: fields.ReverseRelation["Curex"]
     pmcurs: fields.ReverseRelation["Pmcur"]  # no need. use pms
     pairs: fields.ReverseRelation["Pair"]
     countries: fields.ReverseRelation[Country]
@@ -137,7 +138,7 @@ class Cur(Model):
 
 
 class Coin(Model):
-    id: int = fields.SmallIntField(True)
+    # id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
     rate: float | None = fields.FloatField(null=True)
     is_fiat: bool = fields.BooleanField(default=False)
@@ -152,7 +153,7 @@ class Coin(Model):
     _name = {"ticker"}
     _icon = "coin"
 
-    def repr(self):
+    def repr(self, *args):
         return super().repr() + (self.is_fiat and " (fiat)" or "")
 
     class Meta:
@@ -162,8 +163,9 @@ class Coin(Model):
 class Ex(Model):
     id: int = fields.SmallIntField(True)
     name: str = fields.CharField(31)
-    host: str | None = fields.CharField(31, null=True)
-    url: str | None = fields.CharField(63, null=True)
+    host: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
+    host_p2p: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
+    url_login: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
     type: ExType = fields.IntEnumField(ExType)
     logo: str = fields.CharField(511, default="")
 
@@ -195,6 +197,10 @@ class Curex(Model):
 
     _name = {"cur__ticker", "ex__name"}
 
+    class Meta:
+        table_description = "Currency in Exchange"
+        unique_together = (("cur_id", "ex_id"),)
+
 
 class Pair(Model, TsTrait):
     id = fields.SmallIntField(True)
@@ -211,7 +217,7 @@ class Pair(Model, TsTrait):
         table_description = "Coin/Currency pairs"
         unique_together = (("coin", "cur", "ex"),)
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.coin.ticker}/{self.cur.ticker}"
 
 
@@ -229,7 +235,7 @@ class Direction(Model):
         table_description = "Trade directions"
         unique_together = (("pair", "sell"),)
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.pair.coin.ticker}/{self.pair.cur.ticker} {'SELL' if self.sell else 'BUY'}"
 
 
@@ -251,8 +257,8 @@ class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
 
 class Agent(Model, TsTrait):
     id: int
+    exid: int = fields.IntField()
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
-    # ex_id: int
     auth: dict = fields.JSONField(null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
     user_id: int
@@ -263,11 +269,12 @@ class Agent(Model, TsTrait):
     _icon = "spy"
     _name = {"ex__name", "user__username"}
 
-    def repr(self):
-        return f"{self.ex.name}-{self.user.username}"
+    # def repr(self, *args):
+    #     return f"{self.ex.name}-{self.user.username}"
 
-    def balance(self) -> float:
-        return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
+    def balance(self) -> int:
+        return self.exid * 2
+        # return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
     class Meta:
         table_description = "Agents"
@@ -276,11 +283,19 @@ class Agent(Model, TsTrait):
     class PydanticMeta:
         computed = ["balance"]
 
-    class PydanticMetaListItem:
-        max_recursion = 1
-        backward_relations: bool = True
-        exclude = ("user",)
-        computed = ["balance"]
+    # class PydanticMetaListItem:
+    #     max_recursion = 1
+    #     backward_relations: bool = True
+    #     exclude = ("user",)
+    #     computed = ["balance"]
+
+    # async def client(self):
+    #     import sys
+    #     if isinstance(self.ex, QuerySet):
+    #         # noinspection PyTypeChecker
+    #         self.ex: Ex = await self.ex
+    #     client = sys.modules[f'xync_client.{self.ex.name}.p2p'].AgentClient
+    #     return client(self)
 
 
 class Adpm(Model):
@@ -304,14 +319,14 @@ class Ad(Model, TsTrait):
     detail: str = fields.CharField(4095, null=True)
     autoMsg: str = fields.CharField(255, null=True)
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "ads")
-    status: AdvStatus = fields.IntEnumField(AdvStatus)
+    status: AdStatus = fields.IntEnumField(AdStatus)
 
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
     _name = {"direction__pair__coin__ticker", "direction__pair__cur__ticker", "direction__sell", "price"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{TradeType(int(self.direction.sell.name)).name}: {self.price:.3g}"
 
     class Meta:
@@ -358,7 +373,7 @@ class Pmcur(Model):  # for fiat with no exs tie
 
     # _sorts = ['-limits_count']
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.pm.name}-{self.cur.ticker}"
 
     # @classmethod
@@ -392,17 +407,17 @@ class Pmex(Model):  # existence pm in ex with no cur tie
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
     pm_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "pmexs")
-    ex_id: int | None
-    exid: int | None = fields.SmallIntField(null=True)
+    ex_id: int
+    exid: int = fields.SmallIntField()
 
     _name = {"pm__name", "ex__name"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.pm.name}-{self.ex.name}"
 
     class Meta:
         table_description = "Payment methods - Currencies"
-        unique_together = (("ex", "exid"),)
+        unique_together = (("pm_id", "ex_id"), ("ex_id", "exid"))
 
 
 class Pmcurex(Model):  # existence pm in ex for exact cur, with "blocked" flag
@@ -414,7 +429,7 @@ class Pmcurex(Model):  # existence pm in ex for exact cur, with "blocked" flag
 
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "ex__name"}
 
-    def repr(self, caller: type[Model] = None):
+    def repr(self, *args):
         return ("[X] " if self.blocked else "") + super().repr()
 
     class Meta:
@@ -433,12 +448,13 @@ class Fiat(Model):
     amount: float | None = fields.FloatField(default=0)
     target: float | None = fields.FloatField(default=None, null=True)
 
+    exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", through="fiatex", related_name="fiats")
     orders: fields.ReverseRelation["Order"]
 
     _icon = "cash"
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "amount"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.id}: {self.pmcur.repr()} ({self.user.username})"
 
     class Meta:
@@ -451,6 +467,23 @@ class Fiat(Model):
         # exclude_raw_fields = True
 
 
+class Fiatex(Model):  # existence pm in ex with no cur tie
+    fiat: fields.ForeignKeyRelation[Fiat] = fields.ForeignKeyField("models.Fiat", "fiatexs")
+    fiat_id: int
+    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "fiatexs")
+    ex_id: int
+    exid: int = fields.SmallIntField()
+
+    _name = {"fiat__detail", "ex__name"}
+
+    def repr(self, *args):
+        return f"{self.fiat.detail}-{self.ex.name}"
+
+    class Meta:
+        table_description = "Fiat on Ex"
+        unique_together = (("fiat_id", "ex_id"), ("ex_id", "exid"))
+
+
 class Limit(Model):
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
@@ -466,7 +499,7 @@ class Limit(Model):
     _icon = "frame"
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "unit", "income", "amount"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.pmcur.repr()}[{'<-' if self.income else '->'}]"
 
     class Meta:
@@ -487,7 +520,7 @@ class Asset(Model):
     _icon = "currency-bitcoin"
     _name = {"coin__ticker", "free"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.coin.ticker} {self.free:.3g}/{self.freeze:.3g} user:{self.agent.repr()}"
 
     class Meta:
@@ -516,7 +549,7 @@ class Order(Model, TsTrait):
     _icon = "file-check"
     _name = {"fiat__pmcur__pm__name", "ad__direction__sell"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.taker.repr()}: {self.amount:.3g} pm:{self.fiat.pmcur.pm.name}/{self.fiat_id} {self.status.name}"
 
     class Meta:
@@ -553,7 +586,7 @@ class Dep(Model, TsTrait):
     _icon = "seeding"
     _name = {"pid"}
 
-    def repr(self, caller: Model.__class__ = None):
+    def repr(self, *args):
         return f'{self.coin.ticker}:{self.apr * 100:.3g}% {f"{self.duration}d" if self.duration and self.duration > 0 else "flex"}'
 
     class Meta:
@@ -571,7 +604,7 @@ class Investment(Model, TsTrait):
     _icon = "trending-up"
     _name = {"dep__pid", "amount"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.amount:.3g} {self.dep.repr()}"
 
     class Meta:
@@ -588,7 +621,7 @@ class TestEx(Model):
     _icon = "test-pipe"
     _name = {"ex__name", "action", "ok"}
 
-    def repr(self):
+    def repr(self, *args):
         return f"{self.ex.name} {self.action.name} {self.ok}"
 
     class Meta:
@@ -606,7 +639,7 @@ class Vpn(Model):
     _icon = "vpn"
     _name = {"pub"}
 
-    def repr(self):
+    def repr(self, *args):
         return self.user.username
 
     class Meta:
@@ -623,7 +656,7 @@ class Invite(Model, TsTrait):
     _icon = "invite"
     _name = {"ref__username", "protege__username", "approved"}
 
-    def repr(self):
+    def repr(self, *args):
         return self.protege.name
 
     class Meta:
@@ -641,7 +674,7 @@ class Credit(Model, TsTrait):
     _icon = "credit"
     _name = {"lender__username", "borrower__username", "amount"}
 
-    def repr(self):
+    def repr(self, *args):
         return self.borrower.name
 
     class Meta:

xync_schema-0.6.30/xync_schema/pydantic.py

@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+
+
+class FiatForm(BaseModel):
+    cur_id: int
+    pm_id: int
+    user_id: int
+    detail: str
+    name: str | None = None
+    amount: float
+    target: int | None = None

{xync_schema-0.6.28 → xync_schema-0.6.30/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.28
+Version: 0.6.30
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -10,8 +10,8 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: xtg-auth
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 ## INSTALL

{xync_schema-0.6.28 → xync_schema-0.6.30}/xync_schema.egg-info/SOURCES.txt

@@ -7,7 +7,8 @@ pyproject.toml
 tests/__init__.py
 tests/test_db.py
 xync_schema/__init__.py
-xync_schema/model.py
+xync_schema/models.py
+xync_schema/pydantic.py
 xync_schema.egg-info/PKG-INFO
 xync_schema.egg-info/SOURCES.txt
 xync_schema.egg-info/dependency_links.txt

{xync_schema-0.6.28 → xync_schema-0.6.30}/xync_schema.egg-info/requires.txt

@@ -1,6 +1,6 @@
 xtg-auth
 
 [dev]
-pytest
 build
+pytest-asyncio
 twine