skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up some model typing

Browse source
This commit is contained in:
justcool393 2023-08-09 04:42:11 -05:00
parent 7051beefca
commit 2e80d54ca1
6 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
files/classes/alts.py
View file

@ -1,6 +1,7 @@
from sqlalchemy import *
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.orm.decl_api import DeclarativeBase, declared_attr
from sqlalchemy.sql import text
from files.classes.base import Base
@ -12,6 +13,11 @@ class Alt(Base):
is_manual: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
Index('alts_user2_idx', user2)
Index('alts_unique_combination',
text('GREATEST(user1, user2)'),
text('LEAST(user1, user2)'),
unique=True
)
def __repr__(self):
return f"<{self.__class__.__name__}(user1={self.user1}, user2={self.user2})>"

8
files/classes/clients.py
View file

@ -20,7 +20,7 @@ class OauthApp(Base):
id: Mapped[int] = mapped_column(Integer, primary_key=True)
client_id: Mapped[str | None] = mapped_column(String(length=64))
app_name: Mapped[str] = mapped_column(String(length=50), nullable=False)
redirect_uri: Mapped[str] = mapped_column(String(length=50), nullable=False)
redirect_uri: Mapped[str] = mapped_column(String(length=4096), nullable=False)
description: Mapped[str] = mapped_column(String(length=256), nullable=False)
author_id: Mapped[str] = mapped_column(Integer, ForeignKey("users.id"), nullable=False)
@ -54,9 +54,9 @@ class ClientAuth(Base):
UniqueConstraint('access_token', name='unique_access'),
)
user_id = mapped_column(Integer, ForeignKey("users.id"), primary_key=True)
oauth_client = mapped_column(Integer, ForeignKey("oauth_apps.id"), primary_key=True)
access_token = mapped_column(String(128), nullable=False)
user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id"), primary_key=True)
oauth_client: Mapped[int] = mapped_column(Integer, ForeignKey("oauth_apps.id"), primary_key=True)
access_token: Mapped[str] = mapped_column(String(128), nullable=False)
user = relationship("User", viewonly=True)
application = relationship("OauthApp", viewonly=True)

2
files/classes/comment.py
View file

@ -29,7 +29,7 @@ class Comment(CreatedBase):
parent_submission = mapped_column(Integer, ForeignKey("submissions.id"))
edited_utc: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
ghost: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
bannedfor = mapped_column(Boolean)
bannedfor: Mapped[bool | None] = mapped_column(Boolean)
distinguish_level = mapped_column(Integer, default=0, nullable=False)
level = mapped_column(Integer, default=1, nullable=False)
parent_comment_id = mapped_column(Integer, ForeignKey("comments.id"))

12
files/classes/cron/tasks.py
View file

@ -242,7 +242,7 @@ class RepeatableTask(CreatedBase):
type_id: Mapped[int] = mapped_column(SmallInteger, nullable=False)
enabled: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
run_state: Mapped[int] = mapped_column(SmallInteger, default=int(ScheduledTaskState.WAITING), nullable=False)
run_time_last: Mapped[datetime] = mapped_column(DateTime, default=None)
run_time_last: Mapped[datetime | None] = mapped_column(DateTime, default=None)
frequency_day: Mapped[int] = mapped_column(SmallInteger, nullable=False)
time_of_day_utc = mapped_column(Time, nullable=False)
@ -351,12 +351,12 @@ class RepeatableTask(CreatedBase):
class RepeatableTaskRun(CreatedBase):
__tablename__ = "tasks_repeatable_runs"
id = mapped_column(Integer, primary_key=True)
task_id = mapped_column(Integer, ForeignKey(RepeatableTask.id), nullable=False)
manual = mapped_column(Boolean, default=False, nullable=False)
traceback_str = mapped_column(Text, nullable=True)
id: Mapped[int] = mapped_column(Integer, primary_key=True)
task_id: Mapped[int] = mapped_column(Integer, ForeignKey(RepeatableTask.id), nullable=False)
manual: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
traceback_str: Mapped[str | None] = mapped_column(Text, nullable=True)
completed_utc = mapped_column(DateTime)
completed_utc: Mapped[datetime | None] = mapped_column(DateTime)
task = relationship(RepeatableTask, back_populates="runs")

6
files/classes/submission.py
View file

@ -25,8 +25,8 @@ class Submission(CreatedBase):
id: Mapped[int] = mapped_column(Integer, primary_key=True)
author_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id"), nullable=False)
edited_utc: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
thumburl = mapped_column(String)
bannedfor: Mapped[bool] = mapped_column(Boolean)
thumburl: Mapped[str | None] = mapped_column(String)
bannedfor: Mapped[bool | None] = mapped_column(Boolean)
ghost: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
views: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
distinguish_level: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
@ -39,7 +39,7 @@ class Submission(CreatedBase):
is_bot: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
upvotes: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
downvotes: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
realupvotes: Mapped[int] = mapped_column(Integer, default=1)
realupvotes: Mapped[int | None] = mapped_column(Integer, default=1) # XXX: inconsistent with comments
app_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("oauth_apps.id"))
title: Mapped[str] = mapped_column(String, nullable=False)
title_html: Mapped[str] = mapped_column(String, nullable=False)

2
files/tests/test_migrations_up_to_date.py
View file

@ -49,7 +49,7 @@ def test_migrations_up_to_date():
check=True
)
except subprocess.CalledProcessError as e:
print("Failed to run migrations...")
print("Failed to run migration test...")
print(e.stderr)
raise