xync-schema 0.6.91__tar.gz → 0.6.92.dev2__tar.gz

{xync_schema-0.6.91/xync_schema.egg-info → xync_schema-0.6.92.dev2}/PKG-INFO

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

{xync_schema-0.6.91 → xync_schema-0.6.92.dev2}/tests/test_db.py

@@ -7,23 +7,22 @@ from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 
 from xync_schema import models
-from xync_schema.models import Ex
 
 load_dotenv()
 
 
 @pytest.fixture
-async def dbc() -> AsyncpgDBClient:
+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_init_db(_dbc):
+    assert isinstance(_dbc, AsyncpgDBClient), "DB corrupt"
 
 
-async def test_models(dbc):
-    c = await Ex.first()
-    assert isinstance(c, Ex), "No exs"
+# async def test_models(_dbc):
+#     c = await models.Ex.first()
+#     assert isinstance(c, models.Ex), "No exs"

xync_schema-0.6.92.dev2/xync_schema/__init__.py

@@ -0,0 +1,17 @@
+async def main():
+    from os import getenv as env
+    from dotenv import load_dotenv
+    import logging
+    from x_model import init_db
+    from xync_schema import models
+    from logging import DEBUG
+
+    load_dotenv()
+    logging.basicConfig(level=DEBUG)
+    await init_db(env("DB_URL"), models, True)
+
+
+if __name__ == "__main__":
+    from asyncio import run
+
+    run(main())

{xync_schema-0.6.91 → xync_schema-0.6.92.dev2}/xync_schema/models.py

@@ -4,7 +4,20 @@ from datetime import datetime
 from tortoise import fields
 from tortoise.queryset import QuerySet
 from tortoise import Model as BaseModel
-from x_auth.models import Model, UserTg
+from x_auth.models import (
+    Model,
+    Username as Username,
+    User as TgUser,
+    Proxy as Proxy,
+    Dc as Dc,
+    Fcm as Fcm,
+    App as App,
+    Session as Session,
+    Peer as Peer,
+    UpdateState as UpdateState,
+    Version as Version,
+    Country as BaseCountry,
+)
 from x_model.models import TsTrait, DatetimeSecField
 
 from xync_schema.enums import (
@@ -21,11 +34,7 @@ from xync_schema.enums import (
 )
 
 
-class Country(Model):
-    id = fields.SmallIntField(True)
-    code: int | None = fields.IntField(null=True)
-    short: str | None = fields.CharField(3, null=True)
-    name: str | None = fields.CharField(63, unique=True, null=True)
+class Country(BaseCountry):
     cur: fields.ForeignKeyRelation["Cur"] = fields.ForeignKeyField("models.Cur", related_name="countries")
     curexs: fields.ManyToManyRelation["Curex"]
     fiats: fields.BackwardFKRelation["Fiat"]
@@ -117,6 +126,7 @@ class Curex(BaseModel):
 
 class Coinex(BaseModel):
     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin")
+    coin_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     minimum: float = fields.FloatField(null=True)
 
@@ -180,10 +190,8 @@ class Person(Model, TsTrait):
     pm_agents: fields.BackwardFKRelation["PmAgent"]
 
 
-class User(UserTg, TsTrait):
+class User(TgUser, TsTrait):
     status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.SLEEP)
-    gmail_auth: dict = fields.JSONField(default={})
-
     person: fields.OneToOneRelation[Person] = fields.OneToOneField("models.Person", related_name="user")
     person_id: int
     ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
@@ -195,15 +203,17 @@ class User(UserTg, TsTrait):
     )  # who can texts this user
     contacted_with_id: int | None
 
-    forum: fields.BackwardOneToOneRelation["Forum"]
+    actors: fields.BackwardFKRelation["Actor"]
+    contacts: fields.BackwardFKRelation["User"]
     created_forums: fields.BackwardFKRelation["Forum"]
-    proteges: fields.BackwardFKRelation["User"]
     creds: fields.BackwardFKRelation["Cred"]
-    actors: fields.BackwardFKRelation["Actor"]
     # fiats: fields.BackwardFKRelation["Fiat"]
+    gmail: fields.BackwardOneToOneRelation["Gmail"]
+    forum: fields.BackwardOneToOneRelation["Forum"]
     limits: fields.BackwardFKRelation["Limit"]
     msgs: fields.BackwardFKRelation["Msg"]
-    contacts: fields.BackwardFKRelation["User"]
+    proteges: fields.BackwardFKRelation["User"]
+
     # vpn: fields.BackwardOneToOneRelation["Vpn"]
     # invite_requests: fields.BackwardFKRelation["Invite"]
     # invite_approvals: fields.BackwardFKRelation["Invite"]
@@ -231,6 +241,15 @@ class User(UserTg, TsTrait):
         # computed = ["balance"]
 
 
+class Gmail(Model):
+    login: str = fields.CharField(127)
+    password: str = fields.CharField(127)
+    auth: dict = fields.JSONField(default={})
+    updated_at: datetime | None = DatetimeSecField(auto_now=True)
+
+    user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", "gmail")
+
+
 class Forum(Model, TsTrait):
     id: int = fields.BigIntField(True)
     joined: bool = fields.BooleanField(default=False)
@@ -258,9 +277,7 @@ class Actor(Model):
         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"
+        module_name = f"xync_client.{self.ex.name}.InAgent"
         __import__(module_name)
         client = sys.modules[module_name].InAgentClient
         return client(self)
@@ -729,7 +746,7 @@ class Msg(Model):
 
 class TestEx(Model):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="tests")
-    # ex_id: int
+    ex_id: int
     action: ExAction = fields.IntEnumField(ExAction)
     ok: bool | None = fields.BooleanField(default=False, null=True)
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
@@ -737,7 +754,7 @@ class TestEx(Model):
     _icon = "test-pipe"
     _name = {"ex_id", "action", "ok"}
 
-    def repr(self, *args):
+    def repr(self):
         return f"{self.ex_id} {self.action.name} {self.ok}"
 
     class Meta:
@@ -758,7 +775,7 @@ class Vpn(Model):
     _icon = "vpn"
     _name = {"pub"}
 
-    def repr(self, *args):
+    def repr(self):
         return self.user.username
 
     class Meta:

{xync_schema-0.6.91 → xync_schema-0.6.92.dev2/xync_schema.egg-info}/PKG-INFO

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