xync-schema 0.6.25__tar.gz → 0.6.27__tar.gz

{xync_schema-0.6.25 → xync_schema-0.6.27}/.gitignore

@@ -4,3 +4,4 @@
 /.env
 /venv
 __pycache__
+/build

{xync_schema-0.6.25 → xync_schema-0.6.27}/.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
   - id: build
     name: build
     ### build & upload package only for "main" branch push
-    entry: bash -c 'echo $PRE_COMMIT_LOCAL_BRANCH | grep /master && make build || echo 0'
+    entry: bash -c 'echo $PRE_COMMIT_LOCAL_BRANCH | grep /master && make twine || echo 0'
     language: system
     pass_filenames: false
     verbose: true

{xync_schema-0.6.25/xync_schema.egg-info → xync_schema-0.6.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.25
+Version: 0.6.27
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -8,8 +8,7 @@ Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: tortoise-api-model
-Requires-Dist: aiogram
+Requires-Dist: xtg-auth
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: build; extra == "dev"

{xync_schema-0.6.25 → xync_schema-0.6.27}/makefile

@@ -1,6 +1,6 @@
+include .env
 PACKAGE := xync_schema
-VENV := venv
-VPYTHON := . $(VENV)/bin/activate && python
+VPYTHON := $(VENV)/bin/python
 
 .PHONY: all install pre-commit test clean build twine patch
 
@@ -19,8 +19,8 @@ clean: .pytest_cache dist $(PACKAGE).egg-info
 	rm -rf .pytest_cache dist/* $(PACKAGE).egg-info $(PACKAGE)/__pycache__ dist/__pycache__
 
 build:
-	$(VPYTHON) -m build; make twine
-twine: dist
+	$(VPYTHON) -m build
+twine: build dist
 	$(VPYTHON) -m twine upload dist/* --skip-existing
 
 patch:

{xync_schema-0.6.25 → xync_schema-0.6.27}/pyproject.toml

@@ -5,8 +5,7 @@ authors = [
     {name = "Mike Artemiev", email = "mixartemev@gmail.com"},
 ]
 dependencies = [
-    "tortoise-api-model",
-    "aiogram"
+    "xtg-auth"
 ]
 description = "XyncNet project database model schema"
 readme = "README.md"
@@ -32,5 +31,9 @@ dev = [
     "setuptools_scm",
 ]
 
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+
 [tool.ruff]
 line-length = 120

xync_schema-0.6.27/tests/test_db.py

@@ -0,0 +1,29 @@
+from os import getenv as env
+
+import pytest
+from dotenv import load_dotenv
+from tortoise import connections
+from tortoise.backends.asyncpg import AsyncpgDBClient
+from x_model import init_db
+
+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"), models, True)
+    cn: AsyncpgDBClient = connections.get("default")
+    yield cn
+    await cn.close()
+
+
+async def test_init_db(dbc):
+    assert isinstance(dbc, AsyncpgDBClient), "DB corrupt"
+
+
+async def test_models(dbc):
+    c = await Cur.all()
+    assert isinstance(c, list), "No currencies"

{xync_schema-0.6.25 → xync_schema-0.6.27}/xync_schema/models.py

@@ -1,7 +1,8 @@
 from datetime import datetime
 from enum import IntEnum
 from tortoise import fields
-from tortoise_api_model import Model, TsModel, DatetimeSecField, User as BaseUser
+from x_model.model import Model, TsTrait, DatetimeSecField
+from tg_auth.models import UserRefTrait, UserInfoTrait, User as BaseUser, UserStatus
 
 
 class AdvStatus(IntEnum):
@@ -63,20 +64,6 @@ class TaskType(IntEnum):
     invite_approve = 1
 
 
-class UserStatus(IntEnum):
-    CREATOR = 5
-    ADMINISTRATOR = 4
-    MEMBER = 3
-    RESTRICTED = 2
-    LEFT = 1
-    KICKED = 0
-
-
-class Lang(IntEnum):
-    ru = 1
-    en = 2
-
-
 class ExAction(IntEnum):
     """Public"""
 
@@ -119,7 +106,7 @@ class ExAction(IntEnum):
 
 
 class Country(Model):
-    id = fields.SmallIntField(pk=True)
+    id = fields.SmallIntField(True)
     code: int | None = fields.IntField(null=True)
     short: str | None = fields.CharField(3, unique=True, null=True)
     name: str | None = fields.CharField(63, unique=True, null=True)
@@ -131,7 +118,7 @@ class Country(Model):
 
 
 class Cur(Model):
-    id = fields.SmallIntField(pk=True)
+    id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
     rate: float | None = fields.FloatField(null=True)
     country: str | None = fields.CharField(63, null=True)
@@ -149,7 +136,7 @@ class Cur(Model):
 
 
 class Coin(Model):
-    id: int = fields.SmallIntField(pk=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)
@@ -172,7 +159,7 @@ class Coin(Model):
 
 
 class Ex(Model):
-    id: int = fields.SmallIntField(pk=True)
+    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)
@@ -208,8 +195,8 @@ class Curex(Model):
     _name = {"cur__ticker", "ex__name"}
 
 
-class Pair(TsModel):
-    id = fields.SmallIntField(pk=True)
+class Pair(Model, TsTrait):
+    id = fields.SmallIntField(True)
     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="pairs")
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur", related_name="pairs")
     fee: float = fields.FloatField()
@@ -228,7 +215,7 @@ class Pair(TsModel):
 
 
 class Direction(Model):
-    id = fields.SmallIntField(pk=True)
+    id = fields.SmallIntField(True)
     pair: fields.ForeignKeyRelation[Pair] = fields.ForeignKeyField("models.Pair", related_name="directions")
     sell: bool = fields.BooleanField()
     total: int = fields.IntField()
@@ -245,20 +232,9 @@ class Direction(Model):
         return f"{self.pair.coin.ticker}/{self.pair.cur.ticker} {'SELL' if self.sell else 'BUY'}"
 
 
-class User(BaseUser):  # tg user
-    id: int = fields.BigIntField(True)
-    status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
-    username: str | None = fields.CharField(95, unique=True, null=True)
+class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
     chat_status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.LEFT)
     in_channel: bool | None = fields.BooleanField(default=False, null=True)
-    first_name: str | None = fields.CharField(95, null=True)
-    last_name: str | None = fields.CharField(95, null=True)
-    pic: str | None = fields.CharField(95, null=True)
-    lang: Lang | None = fields.IntEnumField(Lang, default=Lang.ru, null=True)
-    ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
-        "models.User", related_name="proteges", null=True
-    )
-    ref_id: int | None
 
     agents: fields.BackwardFKRelation["Agent"]
     fiats: fields.BackwardFKRelation["Fiat"]
@@ -271,13 +247,8 @@ class User(BaseUser):  # tg user
     borrows: fields.BackwardFKRelation["Credit"]
     investments: fields.BackwardFKRelation["Investment"]
 
-    _icon = "user"
 
-    class Meta:
-        table_description = "Users"
-
-
-class Agent(TsModel):
+class Agent(Model, TsTrait):
     id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
     # ex_id: int
@@ -322,8 +293,8 @@ class Adpm(Model):
         table_description = "P2P Advertisements - Payment methods"
 
 
-class Ad(TsModel):
-    id: int = fields.BigIntField(pk=True)
+class Ad(Model, TsTrait):
+    id: int = fields.BigIntField(True)
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")
     price: float = fields.FloatField()
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
@@ -526,8 +497,8 @@ class Asset(Model):
         exclude_raw_fields: bool = False
 
 
-class Order(TsModel):
-    id: int = fields.BigIntField(pk=True)
+class Order(Model, TsTrait):
+    id: int = fields.BigIntField(True)
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
     amount: float = fields.FloatField()
@@ -551,7 +522,7 @@ class Order(TsModel):
         table_description = "P2P Orders"
 
 
-class Dep(TsModel):
+class Dep(Model, TsTrait):
     pid: str = fields.CharField(31)  # product_id
     apr: float = fields.FloatField()
     fee: float | None = fields.FloatField(null=True)
@@ -589,7 +560,7 @@ class Dep(TsModel):
         unique_together = (("pid", "type", "ex"),)
 
 
-class Investment(TsModel):
+class Investment(Model, TsTrait):
     dep: fields.ForeignKeyRelation[Dep] = fields.ForeignKeyField("models.Dep", related_name="investments")
     dep_id: int
     amount: float = fields.FloatField()
@@ -641,7 +612,7 @@ class Vpn(Model):
         table_description = "VPNs"
 
 
-class Invite(TsModel):
+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")
@@ -658,7 +629,7 @@ class Invite(TsModel):
         table_description = "Invites"
 
 
-class Credit(TsModel):
+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")

{xync_schema-0.6.25 → xync_schema-0.6.27/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.25
+Version: 0.6.27
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -8,8 +8,7 @@ Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: tortoise-api-model
-Requires-Dist: aiogram
+Requires-Dist: xtg-auth
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: build; extra == "dev"

{xync_schema-0.6.25 → xync_schema-0.6.27}/xync_schema.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@
 README.md
 makefile
 pyproject.toml
-requirements.dev.txt
 tests/__init__.py
 tests/test_db.py
 xync_schema/__init__.py

{xync_schema-0.6.25 → xync_schema-0.6.27}/xync_schema.egg-info/requires.txt

@@ -1,5 +1,4 @@
-tortoise-api-model
-aiogram
+xtg-auth
 
 [dev]
 pytest

xync_schema-0.6.25/requirements.dev.txt

@@ -1,6 +0,0 @@
-aiogram
-pytest
-python-dotenv
-git+ssh://git@github.com/mixartemev/tortoise-api-model.git
-git+ssh://git@github.com/mixartemev/pydantic.git
-git+ssh://git@github.com/mixartemev/tortoise-orm.git

xync_schema-0.6.25/tests/test_db.py

@@ -1,21 +0,0 @@
-from asyncio import run
-from os import getenv as env
-from dotenv import load_dotenv
-from tortoise_api_model import init_db
-from tortoise.backends.asyncpg import AsyncpgDBClient
-
-from xync_schema import models
-from xync_schema.models import Cur
-
-load_dotenv()
-
-
-def test_init_db():
-    res = run(init_db(env('DB_URL'), models))
-    assert isinstance(res, AsyncpgDBClient), "DB corrupt"
-
-
-# def test_models():
-#     test_init_db()
-#     c = Cur.all()
-#     assert c.model, "DB corrupt"