configured isort, black, flake8

2023-10-30 22:00:55 +01:00
parent 17c29c7f4f
commit 441bcc1e90
75 changed files with 2420 additions and 1730 deletions
--- a/orm/init.py
+++ b/orm/init.py
@@ -1,7 +1,7 @@
 from base.orm import Base, engine
 from orm.community import Community
 from orm.notification import Notification
-from orm.rbac import Operation, Resource, Permission, Role
+from orm.rbac import Operation, Permission, Resource, Role
 from orm.reaction import Reaction
 from orm.shout import Shout
 from orm.topic import Topic, TopicFollower
@@ -32,5 +32,5 @@ __all__ = [
    "Notification",
    "Reaction",
    "UserRating",
-    "init_tables"
+    "init_tables",
 ]
--- a/orm/collection.py
+++ b/orm/collection.py
@@ -8,7 +8,7 @@ from base.orm import Base
 class ShoutCollection(Base):
    __tablename__ = "shout_collection"

-    id = None  # type: ignore
+    id = None
    shout = Column(ForeignKey("shout.id"), primary_key=True)
    collection = Column(ForeignKey("collection.id"), primary_key=True)

--- a/orm/community.py
+++ b/orm/community.py
@@ -1,18 +1,17 @@
 from datetime import datetime

-from sqlalchemy import Column, String, ForeignKey, DateTime
+from sqlalchemy import Column, DateTime, ForeignKey, String
+
 from base.orm import Base, local_session


 class CommunityFollower(Base):
    __tablename__ = "community_followers"

-    id = None  # type: ignore
-    follower = Column(ForeignKey("user.id"), primary_key=True)
-    community = Column(ForeignKey("community.id"), primary_key=True)
-    joinedAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
+    id = None
+    follower: Column = Column(ForeignKey("user.id"), primary_key=True)
+    community: Column = Column(ForeignKey("community.id"), primary_key=True)
+    joinedAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
    # role = Column(ForeignKey(Role.id), nullable=False, comment="Role for member")


@@ -23,19 +22,15 @@ class Community(Base):
    slug = Column(String, nullable=False, unique=True, comment="Slug")
    desc = Column(String, nullable=False, default="")
    pic = Column(String, nullable=False, default="")
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")

    @staticmethod
    def init_table():
        with local_session() as session:
-            d = (
-                session.query(Community).filter(Community.slug == "discours").first()
-            )
+            d = session.query(Community).filter(Community.slug == "discours").first()
            if not d:
                d = Community.create(name="Дискурс", slug="discours")
                session.add(d)
                session.commit()
            Community.default_community = d
-            print('[orm] default community id: %s' % d.id)
+            print("[orm] default community id: %s" % d.id)
--- a/orm/notification.py
+++ b/orm/notification.py
@@ -1,9 +1,10 @@
 from datetime import datetime
-from sqlalchemy import Column, Enum, ForeignKey, DateTime, Boolean, Integer
+from enum import Enum as Enumeration
+
+from sqlalchemy import Boolean, Column, DateTime, Enum, ForeignKey, Integer
 from sqlalchemy.dialects.postgresql import JSONB

 from base.orm import Base
-from enum import Enum as Enumeration


 class NotificationType(Enumeration):
@@ -14,9 +15,9 @@ class NotificationType(Enumeration):
 class Notification(Base):
    __tablename__ = "notification"

-    shout = Column(ForeignKey("shout.id"), index=True)
-    reaction = Column(ForeignKey("reaction.id"), index=True)
-    user = Column(ForeignKey("user.id"), index=True)
+    shout: Column = Column(ForeignKey("shout.id"), index=True)
+    reaction: Column = Column(ForeignKey("reaction.id"), index=True)
+    user: Column = Column(ForeignKey("user.id"), index=True)
    createdAt = Column(DateTime, nullable=False, default=datetime.now, index=True)
    seen = Column(Boolean, nullable=False, default=False, index=True)
    type = Column(Enum(NotificationType), nullable=False)
--- a/orm/rbac.py
+++ b/orm/rbac.py
@@ -1,9 +1,9 @@
 import warnings

-from sqlalchemy import String, Column, ForeignKey, UniqueConstraint, TypeDecorator
+from sqlalchemy import Column, ForeignKey, String, TypeDecorator, UniqueConstraint
 from sqlalchemy.orm import relationship

-from base.orm import Base, REGISTRY, engine, local_session
+from base.orm import REGISTRY, Base, local_session

 # Role Based Access Control #

@@ -121,16 +121,23 @@ class Operation(Base):

 class Resource(Base):
    __tablename__ = "resource"
-    resourceClass = Column(
-        String, nullable=False, unique=True, comment="Resource class"
-    )
+    resourceClass = Column(String, nullable=False, unique=True, comment="Resource class")
    name = Column(String, nullable=False, unique=True, comment="Resource name")
    # TODO: community = Column(ForeignKey())

    @staticmethod
    def init_table():
        with local_session() as session:
-            for res in ["shout", "topic", "reaction", "chat", "message", "invite", "community", "user"]:
+            for res in [
+                "shout",
+                "topic",
+                "reaction",
+                "chat",
+                "message",
+                "invite",
+                "community",
+                "user",
+            ]:
                r = session.query(Resource).filter(Resource.name == res).first()
                if not r:
                    r = Resource.create(name=res, resourceClass=res)
@@ -145,29 +152,27 @@ class Permission(Base):
        {"extend_existing": True},
    )

-    role = Column(
-        ForeignKey("role.id", ondelete="CASCADE"), nullable=False, comment="Role"
-    )
-    operation = Column(
+    role: Column = Column(ForeignKey("role.id", ondelete="CASCADE"), nullable=False, comment="Role")
+    operation: Column = Column(
        ForeignKey("operation.id", ondelete="CASCADE"),
        nullable=False,
        comment="Operation",
    )
-    resource = Column(
+    resource: Column = Column(
        ForeignKey("resource.id", ondelete="CASCADE"),
        nullable=False,
        comment="Resource",
    )


-if __name__ == "__main__":
-    Base.metadata.create_all(engine)
-    ops = [
-        Permission(role=1, operation=1, resource=1),
-        Permission(role=1, operation=2, resource=1),
-        Permission(role=1, operation=3, resource=1),
-        Permission(role=1, operation=4, resource=1),
-        Permission(role=2, operation=4, resource=1),
-    ]
-    global_session.add_all(ops)
-    global_session.commit()
+# if __name__ == "__main__":
+#     Base.metadata.create_all(engine)
+#     ops = [
+#         Permission(role=1, operation=1, resource=1),
+#         Permission(role=1, operation=2, resource=1),
+#         Permission(role=1, operation=3, resource=1),
+#         Permission(role=1, operation=4, resource=1),
+#         Permission(role=2, operation=4, resource=1),
+#     ]
+#     global_session.add_all(ops)
+#     global_session.commit()
--- a/orm/reaction.py
+++ b/orm/reaction.py
@@ -27,16 +27,18 @@ class ReactionKind(Enumeration):
 class Reaction(Base):
    __tablename__ = "reaction"
    body = Column(String, nullable=True, comment="Reaction Body")
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
-    createdBy = Column(ForeignKey("user.id"), nullable=False, index=True, comment="Sender")
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
+    createdBy: Column = Column(ForeignKey("user.id"), nullable=False, index=True, comment="Sender")
    updatedAt = Column(DateTime, nullable=True, comment="Updated at")
-    updatedBy = Column(ForeignKey("user.id"), nullable=True, index=True, comment="Last Editor")
+    updatedBy: Column = Column(
+        ForeignKey("user.id"), nullable=True, index=True, comment="Last Editor"
+    )
    deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
-    deletedBy = Column(ForeignKey("user.id"), nullable=True, index=True, comment="Deleted by")
-    shout = Column(ForeignKey("shout.id"), nullable=False, index=True)
-    replyTo = Column(
+    deletedBy: Column = Column(
+        ForeignKey("user.id"), nullable=True, index=True, comment="Deleted by"
+    )
+    shout: Column = Column(ForeignKey("shout.id"), nullable=False, index=True)
+    replyTo: Column = Column(
        ForeignKey("reaction.id"), nullable=True, comment="Reply to reaction ID"
    )
    range = Column(String, nullable=True, comment="Range in format <start index>:<end>")
--- a/orm/shout.py
+++ b/orm/shout.py
@@ -1,6 +1,6 @@
 from datetime import datetime

-from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, JSON
+from sqlalchemy import JSON, Boolean, Column, DateTime, ForeignKey, Integer, String
 from sqlalchemy.orm import column_property, relationship

 from base.orm import Base, local_session
@@ -12,31 +12,29 @@ from orm.user import User
 class ShoutTopic(Base):
    __tablename__ = "shout_topic"

-    id = None  # type: ignore
-    shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
-    topic = Column(ForeignKey("topic.id"), primary_key=True, index=True)
+    id = None
+    shout: Column = Column(ForeignKey("shout.id"), primary_key=True, index=True)
+    topic: Column = Column(ForeignKey("topic.id"), primary_key=True, index=True)


 class ShoutReactionsFollower(Base):
    __tablename__ = "shout_reactions_followers"

-    id = None  # type: ignore
-    follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
+    id = None
+    follower: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    shout: Column = Column(ForeignKey("shout.id"), primary_key=True, index=True)
    auto = Column(Boolean, nullable=False, default=False)
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
    deletedAt = Column(DateTime, nullable=True)


 class ShoutAuthor(Base):
    __tablename__ = "shout_author"

-    id = None  # type: ignore
-    shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
-    user = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    caption = Column(String, nullable=True, default="")
+    id = None
+    shout: Column = Column(ForeignKey("shout.id"), primary_key=True, index=True)
+    user: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    caption: Column = Column(String, nullable=True, default="")


 class Shout(Base):
@@ -48,8 +46,8 @@ class Shout(Base):
    publishedAt = Column(DateTime, nullable=True)
    deletedAt = Column(DateTime, nullable=True)

-    createdBy = Column(ForeignKey("user.id"), comment="Created By")
-    deletedBy = Column(ForeignKey("user.id"), nullable=True)
+    createdBy: Column = Column(ForeignKey("user.id"), comment="Created By")
+    deletedBy: Column = Column(ForeignKey("user.id"), nullable=True)

    slug = Column(String, unique=True)
    cover = Column(String, nullable=True, comment="Cover image url")
@@ -71,11 +69,11 @@ class Shout(Base):
    reactions = relationship(lambda: Reaction)

    # TODO: these field should be used or modified
-    community = Column(ForeignKey("community.id"), default=1)
-    lang = Column(String, nullable=False, default='ru', comment="Language")
-    mainTopic = Column(ForeignKey("topic.slug"), nullable=True)
+    community: Column = Column(ForeignKey("community.id"), default=1)
+    lang = Column(String, nullable=False, default="ru", comment="Language")
+    mainTopic: Column = Column(ForeignKey("topic.slug"), nullable=True)
    visibility = Column(String, nullable=True)  # owner authors community public
-    versionOf = Column(ForeignKey("shout.id"), nullable=True)
+    versionOf: Column = Column(ForeignKey("shout.id"), nullable=True)
    oid = Column(String, nullable=True)

    @staticmethod
@@ -83,12 +81,7 @@ class Shout(Base):
        with local_session() as session:
            s = session.query(Shout).first()
            if not s:
-                entry = {
-                    "slug": "genesis-block",
-                    "body": "",
-                    "title": "Ничего",
-                    "lang": "ru"
-                }
+                entry = {"slug": "genesis-block", "body": "", "title": "Ничего", "lang": "ru"}
                s = Shout.create(**entry)
                session.add(s)
                session.commit()
--- a/orm/topic.py
+++ b/orm/topic.py
@@ -8,12 +8,10 @@ from base.orm import Base
 class TopicFollower(Base):
    __tablename__ = "topic_followers"

-    id = None  # type: ignore
-    follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    topic = Column(ForeignKey("topic.id"), primary_key=True, index=True)
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
+    id = None
+    follower: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    topic: Column = Column(ForeignKey("topic.id"), primary_key=True, index=True)
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
    auto = Column(Boolean, nullable=False, default=False)


@@ -24,7 +22,5 @@ class Topic(Base):
    title = Column(String, nullable=False, comment="Title")
    body = Column(String, nullable=True, comment="Body")
    pic = Column(String, nullable=True, comment="Picture")
-    community = Column(
-        ForeignKey("community.id"), default=1, comment="Community"
-    )
+    community: Column = Column(ForeignKey("community.id"), default=1, comment="Community")
    oid = Column(String, nullable=True, comment="Old ID")
--- a/orm/user.py
+++ b/orm/user.py
@@ -3,6 +3,7 @@ from datetime import datetime
 from sqlalchemy import JSON as JSONType
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
+
 from base.orm import Base, local_session
 from orm.rbac import Role

@@ -10,10 +11,10 @@ from orm.rbac import Role
 class UserRating(Base):
    __tablename__ = "user_rating"

-    id = None  # type: ignore
-    rater = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    user = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    value = Column(Integer)
+    id = None
+    rater: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    user: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    value: Column = Column(Integer)

    @staticmethod
    def init_table():
@@ -23,7 +24,7 @@ class UserRating(Base):
 class UserRole(Base):
    __tablename__ = "user_role"

-    id = None  # type: ignore
+    id = None
    user = Column(ForeignKey("user.id"), primary_key=True, index=True)
    role = Column(ForeignKey("role.id"), primary_key=True, index=True)

@@ -31,12 +32,10 @@ class UserRole(Base):
 class AuthorFollower(Base):
    __tablename__ = "author_follower"

-    id = None  # type: ignore
-    follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    author = Column(ForeignKey("user.id"), primary_key=True, index=True)
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
+    id = None
+    follower: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    author: Column = Column(ForeignKey("user.id"), primary_key=True, index=True)
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
    auto = Column(Boolean, nullable=False, default=False)


@@ -54,12 +53,8 @@ class User(Base):
    slug = Column(String, unique=True, comment="User's slug")
    muted = Column(Boolean, default=False)
    emailConfirmed = Column(Boolean, default=False)
-    createdAt = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Created at"
-    )
-    lastSeen = Column(
-        DateTime, nullable=False, default=datetime.now, comment="Was online at"
-    )
+    createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
+    lastSeen = Column(DateTime, nullable=False, default=datetime.now, comment="Was online at")
    deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
    links = Column(JSONType, nullable=True, comment="Links")
    oauth = Column(String, nullable=True)
@@ -103,4 +98,4 @@ class User(Base):


 # if __name__ == "__main__":
-#   print(User.get_permission(user_id=1))  # type: ignore
+#   print(User.get_permission(user_id=1))