Apply code formatting and sort imports

Author: BigFlagBurito

grader_service/auth/auth.py

@@ -9,8 +9,8 @@
 
 from grader_service.utils import maybe_future, url_path_join
 
-from .login import LoginHandler
 from ..handlers.base_handler import BaseHandler
+from .login import LoginHandler
 
 
 class Authenticator(LoggingConfigurable):
@@ -512,7 +512,7 @@ async def get_authenticated_user(self, handler, data):
             self.log.warning("User %r not allowed.", username)
             return
 
-    async def refresh_user(self, user, handler:BaseHandler=None):
+    async def refresh_user(self, user, handler: BaseHandler = None):
         """Refresh auth data for a given user
 
         Allows refreshing or invalidating auth data.
@@ -538,7 +538,9 @@ async def refresh_user(self, user, handler:BaseHandler=None):
                 Any fields not present will be left unchanged.
                 This can include updating `.admin` or `.auth_state` fields.
         """
-        user.is_admin = handler.authenticator.is_admin(handler=self, authentication={'name': user.name})
+        user.is_admin = handler.authenticator.is_admin(
+            handler=self, authentication={"name": user.name}
+        )
         return True
 
     def is_admin(self, handler, authentication):

grader_service/handlers/__init__.py

@@ -14,9 +14,9 @@
     health,
     lectures,
     permission,
-    submissions,
     roles,
-    users
+    submissions,
+    users,
 )
 from grader_service.handlers.handler_utils import GitRepoType
 

grader_service/handlers/assignment.py

@@ -97,14 +97,18 @@ async def get(self, lecture_id: int):
                     .all()
                 )
             else:
-                assignments = [a for a in role.lecture.assignments if (a.deleted == DeleteState.active)]
+                assignments = [
+                    a for a in role.lecture.assignments if (a.deleted == DeleteState.active)
+                ]
 
         # Handle the case that the user wants to include submissions
         include_submissions = self.get_argument("include-submissions", "true") == "true"
         if include_submissions:
             assignids = [a.id for a in assignments]
             if self.user.is_admin:
-                results = self.session.query(Submission).filter(Submission.assignid.in_(assignids)).all()
+                results = (
+                    self.session.query(Submission).filter(Submission.assignid.in_(assignids)).all()
+                )
             else:
                 results = (
                     self.session.query(Submission)
@@ -275,7 +279,6 @@ async def get(self, lecture_id: int, assignment_id: int):
                     raise HTTPError(HTTPStatus.NOT_FOUND, reason="Assignment not found")
             self.write_json(assignment)
 
-
     @authorize([Scope.instructor, Scope.admin])
     async def delete(self, lecture_id: int, assignment_id: int):
         """Soft or Hard-Deletes a specific assignment.
@@ -297,7 +300,9 @@ async def delete(self, lecture_id: int, assignment_id: int):
 
             if hard_delete:
                 if not self.user.is_admin:
-                    raise HTTPError(HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete assignment.")
+                    raise HTTPError(
+                        HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete assignment."
+                    )
 
                 self.delete_assignment_files(assignment)
                 self.session.delete(assignment)

grader_service/handlers/base_handler.py

@@ -70,10 +70,13 @@ def check_authorization(
             raise HTTPError(403)
     elif lecture_id is None and "/lectures" in self.request.path and self.request.method == "GET":
         return True
-    if re.match(r"/api/users/(?P<username>[^/]+)/submissions/?", self.request.path) and self.request.method == "GET":
+    if (
+        re.match(r"/api/users/(?P<username>[^/]+)/submissions/?", self.request.path)
+        and self.request.method == "GET"
+    ):
         return True
 
-    is_admin = self.authenticator.is_admin(handler=self, authentication={'name': self.user.name})
+    is_admin = self.authenticator.is_admin(handler=self, authentication={"name": self.user.name})
 
     role = self.session.get(Role, (self.user.id, lecture_id))
 
@@ -835,7 +838,7 @@ def get_latest_submissions(
                 subquery,
                 (Submission.user_id == subquery.c.user_id)
                 & (Submission.date == subquery.c.max_date)
-                & (Submission.assignid == assignment_id)
+                & (Submission.assignid == assignment_id),
             )
             .order_by(Submission.id)
         )
@@ -885,7 +888,7 @@ def get_best_submissions(
                 subquery,
                 (Submission.user_id == subquery.c.user_id)
                 & (Submission.score == subquery.c.max_score)
-                & (Submission.assignid == assignment_id)
+                & (Submission.assignid == assignment_id),
             )
             .order_by(Submission.id)
         )
@@ -916,10 +919,14 @@ def delete_assignment_files(self, assignment: Assignment):
     def delete_submission_files(self, submission: Submission):
         # delete all associated directories of the submission
         assignment_path = os.path.abspath(
-            os.path.join(self.gitbase, submission.assignment.lecture.code, str(submission.assignment.id))
+            os.path.join(
+                self.gitbase, submission.assignment.lecture.code, str(submission.assignment.id)
+            )
         )
         tmp_assignment_path = os.path.abspath(
-            os.path.join(self.tmpbase, submission.assignment.lecture.code, str(submission.assignment.id))
+            os.path.join(
+                self.tmpbase, submission.assignment.lecture.code, str(submission.assignment.id)
+            )
         )
         target_names = {submission.user.name, str(submission.id)}
         matching_dirs = []
@@ -968,7 +975,9 @@ def construct_git_dir(
         elif repo_type in {GitRepoType.AUTOGRADE, GitRepoType.FEEDBACK}:
             type_path = os.path.join(assignment_path, repo_type, "user")
             if repo_type == GitRepoType.AUTOGRADE:
-                if (submission is None) or (not self.user.is_admin and self.get_role(lecture.id).role < Scope.tutor):
+                if (submission is None) or (
+                    not self.user.is_admin and self.get_role(lecture.id).role < Scope.tutor
+                ):
                     raise HTTPError(403)
                 path = os.path.join(type_path, submission.user.name)
             else:

grader_service/handlers/lectures.py

@@ -144,7 +144,9 @@ async def delete(self, lecture_id: int):
 
             if hard_delete:
                 if not self.user.is_admin:
-                    raise HTTPError(HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete lecture.")
+                    raise HTTPError(
+                        HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete lecture."
+                    )
 
                 self.delete_lecture_files(lecture)
                 self.session.delete(lecture)
@@ -164,8 +166,7 @@ async def delete(self, lecture_id: int):
                     if a.status in ["released", "complete"]:
                         self.session.rollback()
                         raise HTTPError(
-                            HTTPStatus.CONFLICT,
-                            "Cannot delete released or completed assignments!",
+                            HTTPStatus.CONFLICT, "Cannot delete released or completed assignments!"
                         )
                     a.deleted = DeleteState.deleted
                 self.session.commit()

grader_service/handlers/roles.py

@@ -86,16 +86,19 @@ async def post(self, lecture_id: int):
 
         roles = []
         for user_req in body["users"]:
-
             user = self.session.query(User).filter(User.name == user_req["username"]).one_or_none()
             if user is None:
                 self.session.rollback()
-                raise HTTPError(HTTPStatus.NOT_FOUND, reason=f"User {user_req['username']} not found")
-
-            role = self.session.query(Role) \
-                .filter(Role.user_id == user.id) \
-                .filter(Role.lectid == lecture_id) \
+                raise HTTPError(
+                    HTTPStatus.NOT_FOUND, reason=f"User {user_req['username']} not found"
+                )
+
+            role = (
+                self.session.query(Role)
+                .filter(Role.user_id == user.id)
+                .filter(Role.lectid == lecture_id)
                 .one_or_none()
+            )
             if role is None:
                 role = Role()
                 role.user_id = user.id
@@ -144,10 +147,12 @@ async def delete(self, lecture_id: int):
                     self.session.rollback()
                     raise HTTPError(HTTPStatus.NOT_FOUND, reason=f"User {username} was not found")
 
-                role = self.session.query(Role) \
-                    .filter(Role.user_id == user.id) \
-                    .filter(Role.lectid == lecture_id) \
+                role = (
+                    self.session.query(Role)
+                    .filter(Role.user_id == user.id)
+                    .filter(Role.lectid == lecture_id)
                     .one_or_none()
+                )
                 if role is not None:
                     self.session.delete(role)
             self.session.commit()

grader_service/handlers/submissions.py

@@ -188,7 +188,9 @@ async def get(self, username: str):
         self.validate_parameters("format")
         response_format = self.get_argument("format", "json")
         if response_format not in ["json", "csv"]:
-            raise HTTPError(HTTPStatus.BAD_REQUEST, reason="Response format can either be 'json' or 'csv'")
+            raise HTTPError(
+                HTTPStatus.BAD_REQUEST, reason="Response format can either be 'json' or 'csv'"
+            )
 
         if not self.user.is_admin:
             if username != self.user.name:
@@ -533,7 +535,11 @@ async def get(self, lecture_id: int, assignment_id: int, submission_id: int):
             lecture_id, assignment_id, submission_id
         )
         submission = self.get_submission(lecture_id, assignment_id, submission_id)
-        if not self.user.is_admin and self.get_role(lecture_id).role == Scope.student and submission.user_id != self.user.id:
+        if (
+            not self.user.is_admin
+            and self.get_role(lecture_id).role == Scope.student
+            and submission.user_id != self.user.id
+        ):
             raise HTTPError(HTTPStatus.NOT_FOUND)
         self.write_json(submission)
 
@@ -601,19 +607,26 @@ async def delete(self, lecture_id: int, assignment_id: int, submission_id: int):
 
             if hard_delete:
                 if not self.user.is_admin:
-                    raise HTTPError(HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete submission.")
+                    raise HTTPError(
+                        HTTPStatus.FORBIDDEN, reason="Only Admins can hard-delete submission."
+                    )
 
                 self.delete_submission_files(submission)
                 self.session.delete(submission)
                 self.session.commit()
             else:
                 # Do not allow students to delete other users' submissions
-                if not self.user.is_admin and self.get_role(lecture_id).role < Scope.instructor and submission.user_id != self.user.id:
+                if (
+                    not self.user.is_admin
+                    and self.get_role(lecture_id).role < Scope.instructor
+                    and submission.user_id != self.user.id
+                ):
                     raise HTTPError(HTTPStatus.NOT_FOUND, reason="Submission to delete not found.")
 
                 if submission.feedback_status != FeedbackStatus.NOT_GENERATED:
                     raise HTTPError(
-                        HTTPStatus.FORBIDDEN, reason="Only submissions without feedback can be deleted."
+                        HTTPStatus.FORBIDDEN,
+                        reason="Only submissions without feedback can be deleted.",
                     )
 
                 # if assignment has deadline and it has already passed

grader_service/handlers/users.py

@@ -16,6 +16,7 @@ class UserBaseHandler(GraderBaseHandler):
     """
     Tornado Handler class for http requests to /users.
     """
+
     @authorize([Scope.admin])
     async def get(self):
         """
@@ -27,6 +28,7 @@ async def get(self):
         self.set_status(HTTPStatus.OK)
         self.write_json(user)
 
+
 @register_handler(r"\/api\/users\/(?P<username>[^\/]+)\/?", VersionSpecifier.ALL)
 class UserObjectBaseHandler(GraderBaseHandler):
     """

grader_service/main.py

@@ -18,7 +18,7 @@
 import tornado
 import uvloop as uvloop
 from jupyterhub.log import log_request
-from sqlalchemy import create_engine, Engine, event
+from sqlalchemy import Engine, create_engine, event
 from sqlalchemy.orm import scoped_session, sessionmaker
 from tornado.httpserver import HTTPServer
 from traitlets import (
@@ -41,6 +41,7 @@
 
 from grader_service import __version__
 from grader_service.auth.auth import Authenticator
+
 # run __init__.py to register handlers
 from grader_service.auth.dummy import DummyAuthenticator
 from grader_service.autograding.celery.app import CeleryApp
@@ -406,7 +407,9 @@ def init_roles(self):
 
                         user = db.query(User).filter(User.name == username).one_or_none()
                         if user is None:
-                            self.log.info(f"Adding new user with username {username} and display name {display_name}")
+                            self.log.info(
+                                f"Adding new user with username {username} and display name {display_name}"
+                            )
                             user = User()
                             user.name = username
                             user.display_name = display_name