xync-schema 0.6.29__tar.gz → 0.6.31__tar.gz

{xync_schema-0.6.29/xync_schema.egg-info → xync_schema-0.6.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.29
+Version: 0.6.31
 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.29 → xync_schema-0.6.31}/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.29 → xync_schema-0.6.31}/xync_schema/models.py

@@ -146,9 +146,9 @@ class Coin(Model):
 
     assets: fields.ReverseRelation["Asset"]
     pairs: fields.ReverseRelation["Pair"]
-    deps: fields.ReverseRelation["Dep"]
-    deps_reward: fields.ReverseRelation["Dep"]
-    deps_bonus: fields.ReverseRelation["Dep"]
+    # deps: fields.ReverseRelation["Dep"]
+    # deps_reward: fields.ReverseRelation["Dep"]
+    # deps_bonus: fields.ReverseRelation["Dep"]
 
     _name = {"ticker"}
     _icon = "coin"
@@ -166,7 +166,7 @@ class Ex(Model):
     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)
+    type_: ExType = fields.IntEnumField(ExType)
     logo: str = fields.CharField(511, default="")
 
     pms: fields.ManyToManyRelation["Pm"]
@@ -178,14 +178,14 @@ class Ex(Model):
     pmcurexs: fields.ReverseRelation["Pmcurex"]
     pmexs: fields.ReverseRelation["Pmex"]
     pairs: fields.ReverseRelation["Pair"]
-    deps: fields.ReverseRelation["Dep"]
+    # deps: fields.ReverseRelation["Dep"]
     tests: fields.ReverseRelation["TestEx"]
 
     _icon = "exchange"
 
     class Meta:
         table_description = "Exchanges"
-        unique_together = (("name", "type"),)
+        unique_together = (("name", "type_"),)
 
 
 class Curex(Model):
@@ -240,19 +240,19 @@ class Direction(Model):
 
 
 class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
-    chat_status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.LEFT)
+    chat_status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
     in_channel: bool | None = fields.BooleanField(default=False, null=True)
 
     agents: fields.BackwardFKRelation["Agent"]
     fiats: fields.BackwardFKRelation["Fiat"]
     limits: fields.BackwardFKRelation["Limit"]
     proteges: fields.BackwardFKRelation["User"]
-    vpn: fields.BackwardOneToOneRelation["Vpn"]
-    invite_requests: fields.BackwardFKRelation["Invite"]
-    invite_approvals: fields.BackwardFKRelation["Invite"]
-    lends: fields.BackwardFKRelation["Credit"]
-    borrows: fields.BackwardFKRelation["Credit"]
-    investments: fields.BackwardFKRelation["Investment"]
+    # vpn: fields.BackwardOneToOneRelation["Vpn"]
+    # invite_requests: fields.BackwardFKRelation["Invite"]
+    # invite_approvals: fields.BackwardFKRelation["Invite"]
+    # lends: fields.BackwardFKRelation["Credit"]
+    # borrows: fields.BackwardFKRelation["Credit"]
+    # investments: fields.BackwardFKRelation["Investment"]
 
 
 class Agent(Model, TsTrait):
@@ -337,7 +337,7 @@ class Pm(Model):
     name: str = fields.CharField(63, unique=True)
     identifier: str | None = fields.CharField(63, unique=True, null=True)
     rank: int | None = fields.SmallIntField(default=0)
-    type: PmType | None = fields.IntEnumField(PmType, null=True)
+    type_: PmType | None = fields.IntEnumField(PmType, null=True)
     template: int | None = fields.SmallIntField(null=True)
     logo: str | None = fields.CharField(127, null=True)
     color: str | None = fields.CharField(7, null=True)
@@ -429,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:
@@ -511,7 +511,7 @@ class Asset(Model):
     coin_id: int
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "assets")
     agent_id: int
-    type: AssetType = fields.IntEnumField(AssetType)
+    type_: AssetType = fields.IntEnumField(AssetType)
     free: float = fields.FloatField()
     freeze: float | None = fields.FloatField(default=0)
     lock: float | None = fields.FloatField(default=0)
@@ -525,7 +525,7 @@ class Asset(Model):
 
     class Meta:
         table_description = "Coin balance"
-        unique_together = (("coin", "agent", "type"),)
+        unique_together = (("coin", "agent", "type_"),)
 
     class PydanticMeta:
         exclude_raw_fields: bool = False
@@ -556,59 +556,59 @@ class Order(Model, TsTrait):
         table_description = "P2P Orders"
 
 
-class Dep(Model, TsTrait):
-    pid: str = fields.CharField(31)  # product_id
-    apr: float = fields.FloatField()
-    fee: float | None = fields.FloatField(null=True)
-    apr_is_fixed: bool = fields.BooleanField(default=False)
-    duration: int | None = fields.SmallIntField(null=True)
-    early_redeem: bool | None = fields.BooleanField(null=True)
-    type: DepType = fields.IntEnumField(DepType)
-    # mb: renewable?
-    min_limit: float = fields.FloatField()
-    max_limit: float | None = fields.FloatField(null=True)
-    is_active: bool = fields.BooleanField(default=True)
-
-    coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="deps")
-    coin_id: int
-    reward_coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField(
-        "models.Coin", related_name="deps_reward", null=True
-    )
-    reward_coin_id: int | None = None
-    bonus_coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField(
-        "models.Coin", related_name="deps_bonus", null=True
-    )
-    bonus_coin_id: int | None = None
-    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="deps")
-    ex_id: int
-    investments: fields.ReverseRelation["Investment"]
-
-    _icon = "seeding"
-    _name = {"pid"}
-
-    def repr(self, caller: Model.__class__ = None):
-        return f'{self.coin.ticker}:{self.apr * 100:.3g}% {f"{self.duration}d" if self.duration and self.duration > 0 else "flex"}'
-
-    class Meta:
-        table_description = "Investment products"
-        unique_together = (("pid", "type", "ex"),)
-
-
-class Investment(Model, TsTrait):
-    dep: fields.ForeignKeyRelation[Dep] = fields.ForeignKeyField("models.Dep", related_name="investments")
-    dep_id: int
-    amount: float = fields.FloatField()
-    is_active: bool = fields.BooleanField(default=True)
-    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="investments")
-
-    _icon = "trending-up"
-    _name = {"dep__pid", "amount"}
-
-    def repr(self, *args):
-        return f"{self.amount:.3g} {self.dep.repr()}"
-
-    class Meta:
-        table_description = "Investments"
+# class Dep(Model, TsTrait):
+#     pid: str = fields.CharField(31)  # product_id
+#     apr: float = fields.FloatField()
+#     fee: float | None = fields.FloatField(null=True)
+#     apr_is_fixed: bool = fields.BooleanField(default=False)
+#     duration: int | None = fields.SmallIntField(null=True)
+#     early_redeem: bool | None = fields.BooleanField(null=True)
+#     type_: DepType = fields.IntEnumField(DepType)
+#     # mb: renewable?
+#     min_limit: float = fields.FloatField()
+#     max_limit: float | None = fields.FloatField(null=True)
+#     is_active: bool = fields.BooleanField(default=True)
+#
+#     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="deps")
+#     coin_id: int
+#     reward_coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField(
+#         "models.Coin", related_name="deps_reward", null=True
+#     )
+#     reward_coin_id: int | None = None
+#     bonus_coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField(
+#         "models.Coin", related_name="deps_bonus", null=True
+#     )
+#     bonus_coin_id: int | None = None
+#     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="deps")
+#     ex_id: int
+#     investments: fields.ReverseRelation["Investment"]
+#
+#     _icon = "seeding"
+#     _name = {"pid"}
+#
+#     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:
+#         table_description = "Investment products"
+#         unique_together = (("pid", "type_", "ex"),)
+
+
+# class Investment(Model, TsTrait):
+#     dep: fields.ForeignKeyRelation[Dep] = fields.ForeignKeyField("models.Dep", related_name="investments")
+#     # dep_id: int
+#     amount: float = fields.FloatField()
+#     is_active: bool = fields.BooleanField(default=True)
+#     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="investments")
+#
+#     _icon = "trending-up"
+#     _name = {"dep__pid", "amount"}
+#
+#     def repr(self, *args):
+#         return f"{self.amount:.3g} {self.dep.repr()}"
+#
+#     class Meta:
+#         table_description = "Investments"
 
 
 class TestEx(Model):
@@ -629,53 +629,53 @@ class TestEx(Model):
         unique_together = (("action", "ex"),)
 
 
-class Vpn(Model):
-    user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", related_name="vpn")
-    user_id: int
-    priv: str = fields.CharField(63, unique=True)
-    pub: str = fields.CharField(63, unique=True)
-    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
-
-    _icon = "vpn"
-    _name = {"pub"}
-
-    def repr(self, *args):
-        return self.user.username
-
-    class Meta:
-        table_description = "VPNs"
-
-
-class Invite(Model, TsTrait):
-    ref: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_approvals")
-    ref_id: int
-    protege: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_requests")
-    protege_id: int
-    approved: str = fields.BooleanField(default=False)  # status
-
-    _icon = "invite"
-    _name = {"ref__username", "protege__username", "approved"}
-
-    def repr(self, *args):
-        return self.protege.name
-
-    class Meta:
-        table_description = "Invites"
-
-
-class Credit(Model, TsTrait):
-    lender: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="lends")
-    lender_id: int
-    borrower: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="borrows")
-    borrower_id: int
-    borrower_priority: bool = fields.BooleanField(default=True)
-    amount: int = fields.IntField(default=None)  # 0 - is all remain borrower balance
-
-    _icon = "credit"
-    _name = {"lender__username", "borrower__username", "amount"}
-
-    def repr(self, *args):
-        return self.borrower.name
-
-    class Meta:
-        table_description = "Credits"
+# class Vpn(Model):
+#     user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", related_name="vpn")
+#     user_id: int
+#     priv: str = fields.CharField(63, unique=True)
+#     pub: str = fields.CharField(63, unique=True)
+#     created_at: datetime | None = DatetimeSecField(auto_now_add=True)
+#
+#     _icon = "vpn"
+#     _name = {"pub"}
+#
+#     def repr(self, *args):
+#         return self.user.username
+#
+#     class Meta:
+#         table_description = "VPNs"
+
+
+# class Invite(Model, TsTrait):
+#     ref: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_approvals")
+#     ref_id: int
+#     protege: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_requests")
+#     protege_id: int
+#     approved: str = fields.BooleanField(default=False)  # status
+#
+#     _icon = "invite"
+#     _name = {"ref__username", "protege__username", "approved"}
+#
+#     def repr(self, *args):
+#         return self.protege.name
+#
+#     class Meta:
+#         table_description = "Invites"
+
+
+# class Credit(Model, TsTrait):
+#     lender: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="lends")
+#     lender_id: int
+#     borrower: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="borrows")
+#     borrower_id: int
+#     borrower_priority: bool = fields.BooleanField(default=True)
+#     amount: int = fields.IntField(default=None)  # 0 - is all remain borrower balance
+#
+#     _icon = "credit"
+#     _name = {"lender__username", "borrower__username", "amount"}
+#
+#     def repr(self, *args):
+#         return self.borrower.name
+#
+#     class Meta:
+#         table_description = "Credits"

{xync_schema-0.6.29 → xync_schema-0.6.31/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.29
+Version: 0.6.31
 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.29 → xync_schema-0.6.31}/xync_schema.egg-info/requires.txt

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