fmt2

orm/author.py

@@ -1,46 +1,45 @@
 import time
 
-from sqlalchemy import JSON as JSONType
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
+from sqlalchemy import JSON, Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
 
 from services.db import Base
 
 
 class AuthorRating(Base):
-    __tablename__ = "author_rating"
+    __tablename__ = 'author_rating'
 
     id = None  # type: ignore
-    rater = Column(ForeignKey("author.id"), primary_key=True, index=True)
-    author = Column(ForeignKey("author.id"), primary_key=True, index=True)
+    rater = Column(ForeignKey('author.id'), primary_key=True, index=True)
+    author = Column(ForeignKey('author.id'), primary_key=True, index=True)
     plus = Column(Boolean)
 
 
 class AuthorFollower(Base):
-    __tablename__ = "author_follower"
+    __tablename__ = 'author_follower'
 
     id = None  # type: ignore
-    follower = Column(ForeignKey("author.id"), primary_key=True, index=True)
-    author = Column(ForeignKey("author.id"), primary_key=True, index=True)
+    follower = Column(ForeignKey('author.id'), primary_key=True, index=True)
+    author = Column(ForeignKey('author.id'), primary_key=True, index=True)
     created_at = Column(Integer, nullable=False, default=lambda: int(time.time()))
     auto = Column(Boolean, nullable=False, default=False)
 
 
 class Author(Base):
-    __tablename__ = "author"
+    __tablename__ = 'author'
 
     user = Column(String, unique=True)  # unbounded link with authorizer's User type
 
-    name = Column(String, nullable=True, comment="Display name")
+    name = Column(String, nullable=True, comment='Display name')
     slug = Column(String, unique=True, comment="Author's slug")
-    bio = Column(String, nullable=True, comment="Bio")  # status description
-    about = Column(String, nullable=True, comment="About")  # long and formatted
-    pic = Column(String, nullable=True, comment="Picture")
-    links = Column(JSONType, nullable=True, comment="Links")
+    bio = Column(String, nullable=True, comment='Bio')  # status description
+    about = Column(String, nullable=True, comment='About')  # long and formatted
+    pic = Column(String, nullable=True, comment='Picture')
+    links = Column(JSON, nullable=True, comment='Links')
 
     ratings = relationship(AuthorRating, foreign_keys=AuthorRating.author)
 
     created_at = Column(Integer, nullable=False, default=lambda: int(time.time()))
     last_seen = Column(Integer, nullable=False, default=lambda: int(time.time()))
     updated_at = Column(Integer, nullable=False, default=lambda: int(time.time()))
-    deleted_at = Column(Integer, nullable=True, comment="Deleted at")
+    deleted_at = Column(Integer, nullable=True, comment='Deleted at')

orm/notification.py

@@ -1,42 +1,41 @@
+import time
 from enum import Enum as Enumeration
 
-from sqlalchemy import JSON as JSONType, func, cast
-from sqlalchemy import Column, Enum, ForeignKey, Integer, String
+from sqlalchemy import JSON, Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
-from sqlalchemy.orm.session import engine
 
 from orm.author import Author
 from services.db import Base
-import time
+
 
 class NotificationEntity(Enumeration):
-    REACTION = "reaction"
-    SHOUT = "shout"
-    FOLLOWER = "follower"
+    REACTION = 'reaction'
+    SHOUT = 'shout'
+    FOLLOWER = 'follower'
 
 
 class NotificationAction(Enumeration):
-    CREATE = "create"
-    UPDATE = "update"
-    DELETE = "delete"
-    SEEN = "seen"
-    FOLLOW = "follow"
-    UNFOLLOW = "unfollow"
+    CREATE = 'create'
+    UPDATE = 'update'
+    DELETE = 'delete'
+    SEEN = 'seen'
+    FOLLOW = 'follow'
+    UNFOLLOW = 'unfollow'
 
 
 class NotificationSeen(Base):
-    __tablename__ = "notification_seen"
+    __tablename__ = 'notification_seen'
 
-    viewer = Column(ForeignKey("author.id"))
-    notification = Column(ForeignKey("notification.id"))
+    viewer = Column(ForeignKey('author.id'))
+    notification = Column(ForeignKey('notification.id'))
 
 
 class Notification(Base):
-    __tablename__ = "notification"
+    __tablename__ = 'notification'
 
     created_at = Column(Integer, server_default=str(int(time.time())))
     entity = Column(String, nullable=False)
     action = Column(String, nullable=False)
-    payload = Column(JSONType, nullable=True)
+    payload = Column(JSON, nullable=True)
 
-    seen = relationship(lambda: Author, secondary="notification_seen")
+    seen = relationship(lambda: Author, secondary='notification_seen')