New AWS jobstore.

contrib/admin/mypy-with-ignore.py

@@ -22,7 +22,8 @@ def main():
 
     # TODO: Remove these paths as typing is added and mypy conflicts are addressed.
     # These are handled as path prefixes.
-    ignore_paths = [os.path.abspath(f) for f in [
+
+    ignore_paths = [os.path.join(pkg_root, f) for f in [
         'docs/_build',
         'docker/Dockerfile.py',
         'docs/conf.py',
@@ -82,9 +83,7 @@ def main():
         'src/toil/lib/aws/__init__.py',
         'src/toil/server/utils.py',
         'src/toil/test',
-        'src/toil/utils/toilStats.py',
-        'src/toil/server/utils.py',
-        'src/toil/jobStores/aws/jobStore.py'
+        'src/toil/utils/toilStats.py'
     ]]
 
     def ignore(file_path):
@@ -100,19 +99,9 @@ def ignore(file_path):
     for file_path in all_files_to_check:
         if not ignore(file_path):
             filtered_files_to_check.append(file_path)
-    # print(f'Checking: {filtered_files_to_check}')
-    # args = ['mypy', '--color-output', '--show-traceback'] + filtered_files_to_check
-    # p = subprocess.run(args=args)
-    # exit(p.returncode)
-    filtered_files_to_check = [
-        'src/toil/jobStores/aws/jobStore.py'
-    ]
-    for file in filtered_files_to_check:
-        print(f'Checking: {file}')
-        args = ['mypy', '--color-output', '--show-traceback', file]
-        p = subprocess.run(args=args)
-        if p.returncode != 0:
-            raise RuntimeError(f'BROKEN: {file}')
+    args = ['mypy', '--color-output', '--show-traceback'] + filtered_files_to_check
+    p = subprocess.run(args=args)
+    exit(p.returncode)
 
 
 if __name__ == '__main__':

src/toil/job.py

@@ -813,7 +813,6 @@ class JobDescription(Requirer):
     Subclassed into variants for checkpoint jobs and service jobs that have
     their specific parameters.
     """
-
     def __init__(
         self,
         requirements: Mapping[str, Union[int, str, bool]],

src/toil/jobStores/abstractJobStore.py

@@ -31,7 +31,7 @@
     Optional,
     Union,
     cast,
-    overload,
+    overload
 )
 from urllib.error import HTTPError
 from urllib.parse import ParseResult, urlparse
@@ -88,7 +88,7 @@ def __init__(self, url: ParseResult) -> None:
 class NoSuchJobException(Exception):
     """Indicates that the specified job does not exist."""
 
-    def __init__(self, jobStoreID: FileID):
+    def __init__(self, jobStoreID: Union[FileID, str]):
         """
         :param str jobStoreID: the jobStoreID that was mistakenly assumed to exist
         """
@@ -98,7 +98,7 @@ def __init__(self, jobStoreID: FileID):
 class ConcurrentFileModificationException(Exception):
     """Indicates that the file was attempted to be modified by multiple processes at once."""
 
-    def __init__(self, jobStoreFileID: FileID):
+    def __init__(self, jobStoreFileID: Union[FileID, str]):
         """
         :param jobStoreFileID: the ID of the file that was modified by multiple workers
                or processes concurrently
@@ -110,7 +110,7 @@ class NoSuchFileException(Exception):
     """Indicates that the specified file does not exist."""
 
     def __init__(
-        self, jobStoreFileID: FileID, customName: Optional[str] = None, *extra: Any
+        self, jobStoreFileID: Union[FileID, str], customName: Optional[str] = None, *extra: Any
     ):
         """
         :param jobStoreFileID: the ID of the file that was mistakenly assumed to exist
@@ -138,11 +138,12 @@ class NoSuchJobStoreException(LocatorException):
     def __init__(self, locator: str, prefix: str):
         """
         :param str locator: The location of the job store
+        :param str prefix: The type of job store
         """
         super().__init__(
             "The job store '%s' does not exist, so there is nothing to restart.",
             locator,
-            prefix,
+            prefix
         )
 
 
@@ -157,7 +158,7 @@ def __init__(self, locator: str, prefix: str):
             "The job store '%s' already exists. Use --restart to resume the workflow, or remove "
             "the job store with 'toil clean' to start the workflow from scratch.",
             locator,
-            prefix,
+            prefix
         )
 
 
@@ -224,7 +225,7 @@ def write_config(self) -> None:
         ) as fileHandle:
             pickle.dump(self.__config, fileHandle, pickle.HIGHEST_PROTOCOL)
 
-    def resume(self) -> None:
+    def resume(self, sse_key_path: Optional[str] = None) -> None:
         """
         Connect this instance to the physical storage it represents and load the Toil configuration
         into the :attr:`AbstractJobStore.config` attribute.
@@ -748,7 +749,6 @@ def _open_url(cls, url: ParseResult) -> IO[bytes]:
         """
         raise NotImplementedError(f"No implementation for {url}")
 
-    @classmethod
     @abstractmethod
     def _write_to_url(
         cls,
@@ -1155,15 +1155,6 @@ def assign_job_id(self, job_description: JobDescription) -> None:
         """
         raise NotImplementedError()
 
-    @contextmanager
-    def batch(self) -> Iterator[None]:
-        """
-        If supported by the batch system, calls to create() with this context
-        manager active will be performed in a batch after the context manager
-        is released.
-        """
-        yield
-
     @deprecated(new_function_name="create_job")
     def create(self, jobDescription: JobDescription) -> JobDescription:
         return self.create_job(jobDescription)
@@ -1261,6 +1252,15 @@ def load_job(self, job_id: str) -> JobDescription:
     def update(self, jobDescription: JobDescription) -> None:
         return self.update_job(jobDescription)
 
+    @contextmanager
+    def batch(self) -> Iterator[None]:
+        """
+        If supported by the batch system, calls to create() with this context
+        manager active will be performed in a batch after the context manager
+        is released.
+        """
+        yield
+
     @abstractmethod
     def update_job(self, job_description: JobDescription) -> None:
         """
@@ -1502,6 +1502,7 @@ def read_file_stream(
     ) -> ContextManager[IO[str]]: ...
 
     @abstractmethod
+    @contextmanager  # type: ignore
     def read_file_stream(
         self,
         file_id: Union[FileID, str],