Run black on modified files

Author: prandla

cms/db/util.py

@@ -31,10 +31,29 @@
 from sqlalchemy.orm import Query
 
 from cms import ConfigError
-from . import SessionGen, Digest, Contest, Participation, Statement, \
-    Attachment, Task, Manager, Dataset, Testcase, Submission, File, \
-    SubmissionResult, Executable, UserTest, UserTestFile, UserTestManager, \
-    UserTestResult, UserTestExecutable, PrintJob, Session
+from . import (
+    SessionGen,
+    Digest,
+    Contest,
+    Participation,
+    Statement,
+    Attachment,
+    Task,
+    Manager,
+    Dataset,
+    Testcase,
+    Submission,
+    File,
+    SubmissionResult,
+    Executable,
+    UserTest,
+    UserTestFile,
+    UserTestManager,
+    UserTestResult,
+    UserTestExecutable,
+    PrintJob,
+    Session,
+)
 
 
 logger = logging.getLogger(__name__)
@@ -137,10 +156,13 @@ def ask_for_contest(skip: int | None = None) -> int:
     return contest_id
 
 
-def get_submissions(session: Session, contest_id: int | None = None,
-                    participation_id: int | None = None,
-                    task_id: int | None = None,
-                    submission_id: int | None = None) -> Query:
+def get_submissions(
+    session: Session,
+    contest_id: int | None = None,
+    participation_id: int | None = None,
+    task_id: int | None = None,
+    submission_id: int | None = None,
+) -> Query:
     """Search for submissions that match the given criteria
 
     The submissions will be returned as a list, and the last four
@@ -192,11 +214,14 @@ def get_submissions(session: Session, contest_id: int | None = None,
     return query
 
 
-def get_submission_results(session: Session, contest_id: int | None = None,
-                           participation_id: int | None = None,
-                           task_id: int | None = None,
-                           submission_id: int | None = None,
-                           dataset_id: int | None = None) -> Query:
+def get_submission_results(
+    session: Session,
+    contest_id: int | None = None,
+    participation_id: int | None = None,
+    task_id: int | None = None,
+    submission_id: int | None = None,
+    dataset_id: int | None = None,
+) -> Query:
     """Search for submission results that match the given criteria
 
     The submission results will be returned as a list, and the last
@@ -279,9 +304,14 @@ def get_datasets_to_judge(task: Task) -> list[Dataset]:
 
 
 def enumerate_files(
-    session: Session, contest: Contest | None = None,
-        skip_submissions=False, skip_user_tests=False, skip_users=False,
-        skip_print_jobs=False, skip_generated=False) -> set[str]:
+    session: Session,
+    contest: Contest | None = None,
+    skip_submissions=False,
+    skip_user_tests=False,
+    skip_users=False,
+    skip_print_jobs=False,
+    skip_generated=False,
+) -> set[str]:
     """Enumerate all the files (by digest) referenced by the
     contest.
 

cms/grading/Job.py

@@ -36,8 +36,19 @@
 import logging
 from typing import Self
 
-from cms.db import Dataset, Evaluation, Executable, File, Manager, Submission, \
-    UserTest, UserTestExecutable, Contest, SubmissionResult, UserTestResult
+from cms.db import (
+    Dataset,
+    Evaluation,
+    Executable,
+    File,
+    Manager,
+    Submission,
+    UserTest,
+    UserTestExecutable,
+    Contest,
+    SubmissionResult,
+    UserTestResult,
+)
 from cms.grading.languagemanager import get_language
 from cms.service.esoperations import ESOperation
 
@@ -67,15 +78,23 @@ class Job:
 
     """
 
-    def __init__(self, operation: ESOperation | None = None,
-                 task_type: str | None = None, task_type_parameters: object = None,
-                 language: str | None = None, multithreaded_sandbox: bool = False,
-                 shard: int | None = None, keep_sandbox: bool = False,
-                 sandboxes: list[str] | None = None, info: str | None = None,
-                 success: bool | None = None, text: list[str] | None = None,
-                 files: dict[str, File] | None = None,
-                 managers: dict[str, Manager] | None = None,
-                 executables: dict[str, Executable] | None = None):
+    def __init__(
+        self,
+        operation: ESOperation | None = None,
+        task_type: str | None = None,
+        task_type_parameters: object = None,
+        language: str | None = None,
+        multithreaded_sandbox: bool = False,
+        shard: int | None = None,
+        keep_sandbox: bool = False,
+        sandboxes: list[str] | None = None,
+        info: str | None = None,
+        success: bool | None = None,
+        text: list[str] | None = None,
+        files: dict[str, File] | None = None,
+        managers: dict[str, Manager] | None = None,
+        executables: dict[str, Executable] | None = None,
+    ):
         """Initialization.
 
         operation: the operation.
@@ -192,7 +211,9 @@ def import_from_dict(cls, data: dict) -> Self:
         return cls(**data)
 
     @staticmethod
-    def from_operation(operation: ESOperation, object_: Submission | UserTest, dataset: Dataset) -> "Job":
+    def from_operation(
+        operation: ESOperation, object_: Submission | UserTest, dataset: Dataset
+    ) -> "Job":
         """Produce the job for the operation in the argument.
 
         Return the Job object that has to be sent to Workers to have
@@ -245,22 +266,25 @@ class CompilationJob(Job):
 
     """
 
-    def __init__(self, operation: ESOperation | None = None,
-                 task_type: str | None = None,
-                 task_type_parameters: object = None,
-                 shard: int | None = None,
-                 keep_sandbox: bool = False,
-                 sandboxes: list[str] | None = None,
-                 info: str | None = None,
-                 language: str | None = None,
-                 multithreaded_sandbox: bool = False,
-                 files: dict[str, File] | None = None,
-                 managers: dict[str, Manager] | None = None,
-                 success: bool | None = None,
-                 compilation_success: bool | None = None,
-                 executables: dict[str, Executable] | None = None,
-                 text: list[str] | None = None,
-                 plus: dict | None = None):
+    def __init__(
+        self,
+        operation: ESOperation | None = None,
+        task_type: str | None = None,
+        task_type_parameters: object = None,
+        shard: int | None = None,
+        keep_sandbox: bool = False,
+        sandboxes: list[str] | None = None,
+        info: str | None = None,
+        language: str | None = None,
+        multithreaded_sandbox: bool = False,
+        files: dict[str, File] | None = None,
+        managers: dict[str, Manager] | None = None,
+        success: bool | None = None,
+        compilation_success: bool | None = None,
+        executables: dict[str, Executable] | None = None,
+        text: list[str] | None = None,
+        plus: dict | None = None,
+    ):
         """Initialization.
 
         See base class for the remaining arguments.
@@ -288,7 +312,9 @@ def export_to_dict(self) -> dict:
         return res
 
     @staticmethod
-    def from_submission(operation: ESOperation, submission: Submission, dataset: Dataset) -> "CompilationJob":
+    def from_submission(
+        operation: ESOperation, submission: Submission, dataset: Dataset
+    ) -> "CompilationJob":
         """Create a CompilationJob from a submission.
 
         operation: a COMPILATION operation.
@@ -346,7 +372,9 @@ def to_submission(self, sr: SubmissionResult):
             sr.executables.set(executable)
 
     @staticmethod
-    def from_user_test(operation: ESOperation, user_test: UserTest, dataset: Dataset) -> "CompilationJob":
+    def from_user_test(
+        operation: ESOperation, user_test: UserTest, dataset: Dataset
+    ) -> "CompilationJob":
         """Create a CompilationJob from a user test.
 
         operation: a USER_TEST_COMPILATION operation.
@@ -449,29 +477,32 @@ class EvaluationJob(Job):
     only_execution, get_output.
 
     """
-    def __init__(self, operation: ESOperation | None = None,
-                 task_type: str | None = None,
-                 task_type_parameters: object = None,
-                 shard: int | None = None,
-                 keep_sandbox: bool = False,
-                 sandboxes: list[str] | None = None,
-                 info: str | None = None,
-                 language: str | None = None,
-                 multithreaded_sandbox: bool = False,
-                 files: dict[str, File] | None = None,
-                 managers: dict[str, Manager] | None = None,
-                 executables: dict[str, Executable] | None = None,
-                 input: str | None = None,
-                 output: str | None = None,
-                 time_limit: float | None = None,
-                 memory_limit: int | None = None,
-                 success: bool | None = None,
-                 outcome: str | None = None,
-                 text: list[str] | None = None,
-                 user_output: str | None = None,
-                 plus: dict | None = None,
-                 only_execution: bool | None = False,
-                 get_output: bool | None = False):
+    def __init__(
+        self,
+        operation: ESOperation | None = None,
+        task_type: str | None = None,
+        task_type_parameters: object = None,
+        shard: int | None = None,
+        keep_sandbox: bool = False,
+        sandboxes: list[str] | None = None,
+        info: str | None = None,
+        language: str | None = None,
+        multithreaded_sandbox: bool = False,
+        files: dict[str, File] | None = None,
+        managers: dict[str, Manager] | None = None,
+        executables: dict[str, Executable] | None = None,
+        input: str | None = None,
+        output: str | None = None,
+        time_limit: float | None = None,
+        memory_limit: int | None = None,
+        success: bool | None = None,
+        outcome: str | None = None,
+        text: list[str] | None = None,
+        user_output: str | None = None,
+        plus: dict | None = None,
+        only_execution: bool | None = False,
+        get_output: bool | None = False,
+    ):
         """Initialization.
 
         See base class for the remaining arguments.
@@ -525,7 +556,9 @@ def export_to_dict(self) -> dict:
         return res
 
     @staticmethod
-    def from_submission(operation: ESOperation, submission: Submission, dataset: Dataset) -> "EvaluationJob":
+    def from_submission(
+        operation: ESOperation, submission: Submission, dataset: Dataset
+    ) -> "EvaluationJob":
         """Create an EvaluationJob from a submission.
 
         operation: an EVALUATION operation.
@@ -590,7 +623,9 @@ def to_submission(self, sr: SubmissionResult):
             testcase=sr.dataset.testcases[self.operation.testcase_codename])]
 
     @staticmethod
-    def from_user_test(operation: ESOperation, user_test: UserTest, dataset: Dataset) -> "EvaluationJob":
+    def from_user_test(
+        operation: ESOperation, user_test: UserTest, dataset: Dataset
+    ) -> "EvaluationJob":
         """Create an EvaluationJob from a user test.
 
         operation: an USER_TEST_EVALUATION operation.

cms/grading/ParameterTypes.py

@@ -31,6 +31,7 @@
 
 from jinja2 import Markup, Template
 import typing
+
 if typing.TYPE_CHECKING:
     from tornado.web import RequestHandler
 
@@ -203,7 +204,9 @@ class ParameterTypeCollection(ParameterType):
 </table>
 """)
 
-    def __init__(self, name, short_name, description, subparameters: list[ParameterType]):
+    def __init__(
+        self, name, short_name, description, subparameters: list[ParameterType]
+    ):
         """Initialization.
 
         subparameters: list of types of each sub-parameter.