blacked

alembic/env.py

@@ -45,7 +45,7 @@ def run_migrations_offline():
         target_metadata=target_metadata,
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
-        include_schemas=True
+        include_schemas=True,
     )
 
     with context.begin_transaction():
@@ -66,9 +66,7 @@ def run_migrations_online():
     )
 
     with connectable.connect() as connection:
-        context.configure(
-            connection=connection, target_metadata=target_metadata
-        )
+        context.configure(connection=connection, target_metadata=target_metadata)
 
         with context.begin_transaction():
             context.run_migrations()

setup.py

@@ -1,4 +1,4 @@
 # Exports the module to the python environment
 from setuptools import setup, find_packages
 
-setup(name="src", version = '1.0', packages=find_packages())
+setup(name="src", version="1.0", packages=find_packages())

src/api/accounts.py

@@ -61,6 +61,7 @@ def verifyAdmin(
 
     utils.raiseError(401, "Unauthorized admin credentials", structs.ErrorType.AUTH)
 
+
 def verifyRefreshToken(creds: str = Security(credsHeader)) -> str:
     cid = validateRefreshToken(creds)
     return cid

src/api/v1/routers/badges.py

@@ -23,6 +23,8 @@ def getAbsences(db: Session = Depends(accounts.getDBSession)) -> schemas.Absence
 
 
 @router.get("/classes/count/", response_model=schemas.ClassCountBadge)
-def getNumberOfClasses(db: Session = Depends(accounts.getDBSession)) -> schemas.ClassCountBadge:
+def getNumberOfClasses(
+    db: Session = Depends(accounts.getDBSession),
+) -> schemas.ClassCountBadge:
     classes = crud.getClassesCount(db)
-    return schemas.ClassCountBadge(message=str(classes))
+    return schemas.ClassCountBadge(message=str(classes))

src/api/v1/routers/teachers.py

@@ -83,7 +83,9 @@ def getAbsenceList(
     list: List[models.Absence] = crud.getAbsenceList(db, date, school)
     returnAbsences: List[schemas.AbsenceReturn] = [
         schemas.AbsenceReturn(
-            length=absence.length, teacher=prettifyTeacher(absence.teacher), note=absence.note
+            length=absence.length,
+            teacher=prettifyTeacher(absence.teacher),
+            note=absence.note,
         )
         for absence in list
     ]

src/api/v2/routers/admin.py

@@ -153,6 +153,7 @@ def removeSpecialDay(
     result = crud.removeSpecialDay(db, date, school)
     return schemas.Bool(success=True)
 
+
 @router.get("/teacher/", response_model=schemas.TeacherReturn, status_code=201)
 def getTeacher(
     first: Optional[str] = None,
@@ -161,7 +162,10 @@ def getTeacher(
     db: Session = Depends(accounts.getDBSession),
     creds: schemas.SessionReturn = Depends(accounts.verifyAdmin),
 ):
-    return crud.getTeacher(db, schemas.TeacherReturn(first=first, last=last, school=school))
+    return crud.getTeacher(
+        db, schemas.TeacherReturn(first=first, last=last, school=school)
+    )
+
 
 @router.post("/teacher/alias", response_model=schemas.Bool, status_code=201)
 def addTeacherAlias(

src/api/v2/routers/badges.py

@@ -23,6 +23,8 @@ def getAbsences(db: Session = Depends(accounts.getDBSession)) -> schemas.Absence
 
 
 @router.get("/classes/count/", response_model=schemas.ClassCountBadge)
-def getNumberOfClasses(db: Session = Depends(accounts.getDBSession)) -> schemas.ClassCountBadge:
+def getNumberOfClasses(
+    db: Session = Depends(accounts.getDBSession),
+) -> schemas.ClassCountBadge:
     classes = crud.getClassesCount(db)
-    return schemas.ClassCountBadge(message=str(classes))
+    return schemas.ClassCountBadge(message=str(classes))

src/api/v2/routers/info.py

@@ -23,21 +23,21 @@ def getSchedule(
 ):
     if date is None:
         date = datetime.date.today()
-    
+
     specialDayInDB = crud.getSpecialDay(db, date, school)
     if specialDayInDB is not None:
         return schemas.SpecialDay(
             date=date,
             name=specialDayInDB.name,
             schedule=specialDayInDB.schedule,
             note=specialDayInDB.note,
-            school=school
+            school=school,
         )
 
     return schemas.NormalDay(
-        date=date, 
+        date=date,
         schedule=structs.SchoolBlocksOnDayWithTimes()[date.weekday()],
-        school=school
+        school=school,
     )
 
 

src/api/v2/routers/teachers.py

@@ -83,7 +83,9 @@ def getAbsenceList(
     list: List[models.Absence] = crud.getAbsenceList(db, date, school)
     returnAbsences: List[schemas.AbsenceReturn] = [
         schemas.AbsenceReturn(
-            length=absence.length, teacher=prettifyTeacher(absence.teacher), note=absence.note
+            length=absence.length,
+            teacher=prettifyTeacher(absence.teacher),
+            note=absence.note,
         )
         for absence in list
     ]

src/dataTypes/models.py

@@ -9,10 +9,10 @@
     Boolean,
     Enum,
     PickleType,
-    Text, 
+    Text,
     DateTime,
     Integer,
-    PrimaryKeyConstraint
+    PrimaryKeyConstraint,
 )
 from sqlalchemy.orm import relationship, validates
 
@@ -40,6 +40,7 @@ class User(Base):
     def __str__(self) -> str:
         return f"{self.first} {self.last} ({self.school} {self.grade})"
 
+
 class Teacher(Base):
     __tablename__ = "teachers"
     tid = Column(String(8), primary_key=True)
@@ -53,6 +54,7 @@ class Teacher(Base):
     def __str__(self) -> str:
         return f"{self.first} {self.last} ({self.school})"
 
+
 class UserSession(Base):
     __tablename__ = "sessions"
     sid = Column(String(16), primary_key=True)
@@ -78,7 +80,8 @@ class Class(Base):
 
     def __str__(self) -> str:
         return f"{self.block} {self.teacher} {self.user}"
-
+
+
 class Absence(Base):
     __tablename__ = "absences"
     tid = Column(
@@ -115,7 +118,7 @@ def validate_schedule_type(self, key, value):
         if type(value) != structs.ScheduleWithTimes:
             raise ValueError("Schedule must be of type ScheduleWithTimes")
         return value
-    
+
     def __str__(self) -> str:
         return f"{self.name} ({self.date}):\n\t{self.schedule}\n\tNote: {self.note}"
 
@@ -126,21 +129,23 @@ class Aliases(Base):
     first = Column(String(255), primary_key=True)
     last = Column(String(255), primary_key=True)
     tid = Column(String(36), ForeignKey(Teacher.tid, ondelete="CASCADE"))
-    
+
     def __str__(self) -> str:
         return f"{self.first} {self.last} ({self.tid})"
+
     # teacher = relationship("Teacher", back_populates="aliases")
 
+
 class Announcements(Base):
     __tablename__ = "announcements"
     anid = Column(String(8), primary_key=True)
     title = Column(String(255))
-    content = Column(Text) # Markdown variably sized string
+    content = Column(Text)  # Markdown variably sized string
     date = Column(Date)
     school = Column(Enum(structs.SchoolName), nullable=True)
     lastUpdate = Column(DateTime, nullable=True)
 
     def __str__(self) -> str:
-        lines="---------------------\n"
+        lines = "---------------------\n"
         header = f"Announcement:\n\tID: {self.anid}\n\tTitle: {self.title}\n\tDate: {self.date}\n\tSchool: {self.school}\n\tLast Update: {self.lastUpdate}\n\tContent:"
-        return lines + header + "\n\t" + self.content + "\n" + lines
+        return lines + header + "\n\t" + self.content + "\n" + lines

src/dataTypes/schemas.py

@@ -43,7 +43,7 @@ class TeacherBase(BaseModel):
 
     def __repr__(self) -> str:
         return f"{self.first} {self.last}"
-    
+
     def __str__(self) -> str:
         return self.__repr__()
 
@@ -82,6 +82,7 @@ class Config:
     def __str__(self) -> str:
         return f"A: {self.A}\nADV: {self.ADVISORY}\nB: {self.B}\nC: {self.C}\nD: {self.D}\nE: {self.E}\nF: {self.F}\nG: {self.G}\nEXTRA: {self.EXTRA}"
 
+
 class ScheduleReturn(BaseModel):
     A: Optional[List[TeacherReturn]] = None
     ADVISORY: Optional[List[TeacherReturn]] = None
@@ -202,7 +203,7 @@ class UserInfoReturn(UserInfoBase):
     schedule: Optional[ScheduleReturn] = None
     profile: Optional[UserProfile] = None
     onboarded: Optional[bool] = None
-        
+
 
 class SessionCredentials(BaseModel):
     token: Optional[str] = None
@@ -274,6 +275,7 @@ class Analytics(BaseModel):
 class Bool(BaseModel):
     success: bool
 
+
 class Badges(BaseModel):
     schemaVersion: int = 1
     label: str
@@ -351,16 +353,16 @@ class Config:
                 ],
                 "note": "Happy New Years!",
                 "special": True,
-                "school": "NSHS"
+                "school": "NSHS",
             }
         }
-    
+
     @validator("date")
     def checkDate(cls, v):
         if not isinstance(v, date):
             raise ValueError("Invalid date.")
         return v
-    
+
 
 class SpecialDay(SchoolDay):
     special = True
@@ -371,6 +373,7 @@ class NormalDay(SchoolDay):
     note = "No special schedule"
     special = False
 
+
 class AnnouncementBase(BaseModel):
     title: str
     content: str
@@ -380,36 +383,43 @@ class AnnouncementBase(BaseModel):
     class Config:
         orm_mode = True
 
+
 class AnnouncementCreate(AnnouncementBase):
     anid: str
+
     class Config:
         orm_mode = True
 
-class AnnouncementReturn(AnnouncementCreate):
 
+class AnnouncementReturn(AnnouncementCreate):
     class Config:
         orm_mode = True
 
+
 class AnnouncementUpdate(AnnouncementCreate):
     updateTime: datetime
 
     class Config:
         orm_mode = True
 
+
 class TeacherAliasBase(BaseModel):
     first: str
     last: str
 
     class Config:
         orm_mode = True
 
+
 class TeacherAliasCreate(TeacherAliasBase):
     tid: str
 
     class Config:
         orm_mode = True
 
+
 class TeacherAliasReturn(TeacherAliasCreate):
     alid: str
+
     class Config:
-        orm_mode = True
+        orm_mode = True

src/dataTypes/structs.py

@@ -364,7 +364,7 @@ def __modify_schema__(cls, field_schema, field: Optional[ModelField]):  # type:
             field_schema["items"] = schema_of(BlockWithTimes)
             # field_schema['examples'] = [BlockWithTimes.schema_json()['properties']['examples']]
             # field_schema['examples'] = schema_of(BlockWithTimes)['examples']
-        
+
     # @staticmethod
     # def parse_json(json_data: ) -> "ScheduleWithTimes":
     #     if json_data is None: