toil 9.1.1__py3-none-any.whl → 9.2.0__py3-none-any.whl

toil/provisioners/node.py

@@ -18,7 +18,7 @@ import subprocess
 import time
 from itertools import count
 from shlex import quote
-from typing import Any, Optional, Union
+from typing import Any
 
 from toil.lib.memoize import parse_iso_utc
 
@@ -35,11 +35,11 @@ class Node:
         publicIP: str,
         privateIP: str,
         name: str,
-        launchTime: Union[datetime.datetime, str],
-        nodeType: Optional[str],
+        launchTime: datetime.datetime | str,
+        nodeType: str | None,
         preemptible: bool,
-        tags: Optional[dict[str, str]] = None,
-        use_private_ip: Optional[bool] = None,
+        tags: dict[str, str] | None = None,
+        use_private_ip: bool | None = None,
     ) -> None:
         """
         Create a new node.
@@ -65,9 +65,9 @@ class Node:
         self.name = name
         # Typing should prevent an empty launch time, but just to make sure,
         # check it at runtime.
-        assert launchTime is not None, (
-            f"Attempted to create a Node {name} without a launch time"
-        )
+        assert (
+            launchTime is not None
+        ), f"Attempted to create a Node {name} without a launch time"
         if isinstance(launchTime, datetime.datetime):
             self.launchTime = launchTime
         else:
@@ -79,9 +79,7 @@ class Node:
                 self.launchTime = datetime.datetime.fromisoformat(launchTime)
         if self.launchTime.tzinfo is None:
             # Read naive datatimes as in UTC
-            self.launchTime = self.launchTime.replace(
-                tzinfo=datetime.timezone.utc
-            )
+            self.launchTime = self.launchTime.replace(tzinfo=datetime.timezone.utc)
         self.nodeType = nodeType
         self.preemptible = preemptible
         self.tags = tags
@@ -123,13 +121,13 @@ class Node:
         True
 
         >>> node = Node("127.0.0.1", "127.0.0.1", "localhost",
-        ...             datetime.datetime.now(datetime.timezone.utc) - 
+        ...             datetime.datetime.now(datetime.timezone.utc) -
         ...             datetime.timedelta(minutes=5), None, False)
         >>> node.remainingBillingInterval() < 0.99
         True
         >>> node.remainingBillingInterval() > 0.9
         True
-        
+
         """
         now = datetime.datetime.now(datetime.timezone.utc)
         delta = now - self.launchTime

toil/realtimeLogger.py

@@ -20,7 +20,7 @@ import os.path
 import socketserver as SocketServer
 import threading
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from toil.lib.misc import get_public_ip
 from toil.statsAndLogging import set_log_level
@@ -246,8 +246,8 @@ class RealtimeLogger(metaclass=RealtimeLoggerMetaclass):
     # noinspection PyUnusedLocal
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         RealtimeLogger._stopLeader()

toil/resource.py

@@ -20,12 +20,12 @@ import os
 import shutil
 import sys
 from collections import namedtuple
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from contextlib import closing
 from io import BytesIO
 from pydoc import locate
 from types import ModuleType
-from typing import IO, TYPE_CHECKING, BinaryIO, Callable, Optional
+from typing import IO, TYPE_CHECKING, BinaryIO, Optional
 from urllib.error import HTTPError
 from urllib.request import urlopen
 from zipfile import ZipFile
@@ -157,7 +157,7 @@ class Resource(namedtuple("Resource", ("name", "pathHash", "url", "contentHash")
 
             return self
 
-    def download(self, callback: Optional[Callable[[str], None]] = None) -> None:
+    def download(self, callback: Callable[[str], None] | None = None) -> None:
         """
         Download this resource from its URL to a file on the local system.
 
@@ -625,7 +625,7 @@ class ModuleDescriptor(
             return self.dirPath
 
     @classmethod
-    def _initModuleName(cls, dirPath: str) -> Optional[str]:
+    def _initModuleName(cls, dirPath: str) -> str | None:
         for name in ("__init__.py", "__init__.pyc", "__init__.pyo"):
             if os.path.exists(os.path.join(dirPath, name)):
                 return name
@@ -656,7 +656,7 @@ class ModuleDescriptor(
             sys.path.append(module.dirPath)
         return module
 
-    def load(self) -> Optional[ModuleType]:
+    def load(self) -> ModuleType | None:
         module = self.makeLoadable()
         try:
             return importlib.import_module(module.name)

toil/server/app.py

@@ -16,8 +16,8 @@ import logging
 import os
 
 import connexion  # type: ignore
-from connexion.options import SwaggerUIOptions  # type: ignore[import-untyped]
 from configargparse import ArgumentParser
+from connexion.options import SwaggerUIOptions  # type: ignore[import-untyped]
 
 from toil.lib.aws import get_current_aws_region, running_on_ec2, running_on_ecs
 from toil.server.wes.toil_backend import ToilBackend
@@ -210,6 +210,6 @@ def start_server(args: argparse.Namespace) -> None:
                 "workers": args.workers,
                 # The uvicorn worker class must be specified for gunicorn to work on connexion 3
                 # https://github.com/spec-first/connexion/issues/1755#issuecomment-1778522142
-                "worker_class": "uvicorn.workers.UvicornWorker"
+                "worker_class": "uvicorn.workers.UvicornWorker",
             },
         )

toil/server/cli/wes_cwl_runner.py

@@ -7,7 +7,7 @@ import time
 from base64 import b64encode
 from collections.abc import Iterable
 from io import BytesIO
-from typing import Any, Optional, cast
+from typing import Any, cast
 from urllib.parse import urldefrag, urljoin, urlparse
 
 import ruamel.yaml
@@ -107,7 +107,7 @@ class WESClientWithWorkflowEngineParameters(WESClient):  # type: ignore
     TODO: Propose a PR in wes-service to include workflow_engine_params.
     """
 
-    def __init__(self, endpoint: str, auth: Optional[tuple[str, str]] = None) -> None:
+    def __init__(self, endpoint: str, auth: tuple[str, str] | None = None) -> None:
         """
         :param endpoint: The http(s) URL of the WES server. Must include the
                          protocol.
@@ -212,9 +212,9 @@ class WESClientWithWorkflowEngineParameters(WESClient):  # type: ignore
     def build_wes_request(
         self,
         workflow_file: str,
-        workflow_params_file: Optional[str],
-        attachments: Optional[list[str]],
-        workflow_engine_parameters: Optional[list[str]] = None,
+        workflow_params_file: str | None,
+        attachments: list[str] | None,
+        workflow_engine_parameters: list[str] | None = None,
     ) -> tuple[dict[str, str], Iterable[tuple[str, tuple[str, BytesIO]]]]:
         """
         Build the workflow run request to submit to WES.
@@ -295,9 +295,9 @@ class WESClientWithWorkflowEngineParameters(WESClient):  # type: ignore
     def run_with_engine_options(
         self,
         workflow_file: str,
-        workflow_params_file: Optional[str],
-        attachments: Optional[list[str]],
-        workflow_engine_parameters: Optional[list[str]],
+        workflow_params_file: str | None,
+        attachments: list[str] | None,
+        workflow_engine_parameters: list[str] | None,
     ) -> dict[str, Any]:
         """
         Composes and sends a post request that signals the WES server to run a
@@ -325,7 +325,7 @@ class WESClientWithWorkflowEngineParameters(WESClient):  # type: ignore
         return cast(dict[str, Any], wes_response(post_result))
 
 
-def get_deps_from_cwltool(cwl_file: str, input_file: Optional[str] = None) -> list[str]:
+def get_deps_from_cwltool(cwl_file: str, input_file: str | None = None) -> list[str]:
     """
     Return a list of dependencies of the given workflow from cwltool.
 
@@ -387,8 +387,8 @@ def get_deps_from_cwltool(cwl_file: str, input_file: Optional[str] = None) -> li
 def submit_run(
     client: WESClientWithWorkflowEngineParameters,
     cwl_file: str,
-    input_file: Optional[str] = None,
-    engine_options: Optional[list[str]] = None,
+    input_file: str | None = None,
+    engine_options: list[str] | None = None,
 ) -> str:
     """
     Given a CWL file, its input files, and an optional list of engine options,

toil/server/utils.py

@@ -16,7 +16,6 @@ import logging
 import os
 from abc import abstractmethod
 from datetime import datetime
-from typing import Optional
 from urllib.parse import urlparse
 
 from toil.lib.io import AtomicFileCreate
@@ -57,7 +56,7 @@ def link_file(src: str, dest: str) -> None:
 
 
 def download_file_from_internet(
-    src: str, dest: str, content_type: Optional[str] = None
+    src: str, dest: str, content_type: str | None = None
 ) -> None:
     """
     Download a file from the Internet and write it to dest.
@@ -77,9 +76,7 @@ def download_file_from_internet(
         f.write(response.content)
 
 
-def download_file_from_s3(
-    src: str, dest: str, content_type: Optional[str] = None
-) -> None:
+def download_file_from_s3(src: str, dest: str, content_type: str | None = None) -> None:
     """
     Download a file from Amazon S3 and write it to dest.
     """
@@ -108,7 +105,7 @@ def get_file_class(path: str) -> str:
 
 
 @retry(errors=[OSError, BlockingIOError])
-def safe_read_file(file: str) -> Optional[str]:
+def safe_read_file(file: str) -> str | None:
     """
     Safely read a file by acquiring a shared lock to prevent other processes
     from writing to it while reading.
@@ -175,15 +172,15 @@ class MemoryStateCache:
         """
 
         super().__init__()
-        self._data: dict[tuple[str, str], Optional[str]] = {}
+        self._data: dict[tuple[str, str], str | None] = {}
 
-    def get(self, workflow_id: str, key: str) -> Optional[str]:
+    def get(self, workflow_id: str, key: str) -> str | None:
         """
         Get a key value from memory.
         """
         return self._data.get((workflow_id, key))
 
-    def set(self, workflow_id: str, key: str, value: Optional[str]) -> None:
+    def set(self, workflow_id: str, key: str, value: str | None) -> None:
         """
         Set or clear a key value in memory.
         """
@@ -234,7 +231,7 @@ class AbstractStateStore:
         self._cache = MemoryStateCache()
 
     @abstractmethod
-    def get(self, workflow_id: str, key: str) -> Optional[str]:
+    def get(self, workflow_id: str, key: str) -> str | None:
         """
         Get the value of the given key for the given workflow, or None if the
         key is not set for the workflow.
@@ -242,21 +239,21 @@ class AbstractStateStore:
         raise NotImplementedError
 
     @abstractmethod
-    def set(self, workflow_id: str, key: str, value: Optional[str]) -> None:
+    def set(self, workflow_id: str, key: str, value: str | None) -> None:
         """
         Set the value of the given key for the given workflow. If the value is
         None, clear the key.
         """
         raise NotImplementedError
 
-    def read_cache(self, workflow_id: str, key: str) -> Optional[str]:
+    def read_cache(self, workflow_id: str, key: str) -> str | None:
         """
         Read a value from a local cache, without checking the actual backend.
         """
 
         return self._cache.get(workflow_id, key)
 
-    def write_cache(self, workflow_id: str, key: str, value: Optional[str]) -> None:
+    def write_cache(self, workflow_id: str, key: str, value: str | None) -> None:
         """
         Write a value to a local cache, without modifying the actual backend.
         """
@@ -298,13 +295,13 @@ class FileStateStore(AbstractStateStore):
         logger.debug("Connected to FileStateStore at %s", url)
         self._base_dir = parse.path
 
-    def get(self, workflow_id: str, key: str) -> Optional[str]:
+    def get(self, workflow_id: str, key: str) -> str | None:
         """
         Get a key value from the filesystem.
         """
         return safe_read_file(os.path.join(self._base_dir, workflow_id, key))
 
-    def set(self, workflow_id: str, key: str, value: Optional[str]) -> None:
+    def set(self, workflow_id: str, key: str, value: str | None) -> None:
         """
         Set or clear a key value on the filesystem.
         """
@@ -365,7 +362,7 @@ if HAVE_S3:
             path = os.path.join(self._base_path, workflow_id, key)
             return self._bucket, path
 
-        def get(self, workflow_id: str, key: str) -> Optional[str]:
+        def get(self, workflow_id: str, key: str) -> str | None:
             """
             Get a key value from S3.
             """
@@ -378,7 +375,7 @@ if HAVE_S3:
                 except self._client.exceptions.NoSuchKey:
                     return None
 
-        def set(self, workflow_id: str, key: str, value: Optional[str]) -> None:
+        def set(self, workflow_id: str, key: str, value: str | None) -> None:
             """
             Set or clear a key value on S3.
             """
@@ -451,26 +448,26 @@ class WorkflowStateStore:
         self._state_store = state_store
         self._workflow_id = workflow_id
 
-    def get(self, key: str) -> Optional[str]:
+    def get(self, key: str) -> str | None:
         """
         Get the given item of workflow state.
         """
         return self._state_store.get(self._workflow_id, key)
 
-    def set(self, key: str, value: Optional[str]) -> None:
+    def set(self, key: str, value: str | None) -> None:
         """
         Set the given item of workflow state.
         """
         self._state_store.set(self._workflow_id, key, value)
 
-    def read_cache(self, key: str) -> Optional[str]:
+    def read_cache(self, key: str) -> str | None:
         """
         Read a value from a local cache, without checking the actual backend.
         """
 
         return self._state_store.read_cache(self._workflow_id, key)
 
-    def write_cache(self, key: str, value: Optional[str]) -> None:
+    def write_cache(self, key: str, value: str | None) -> None:
         """
         Write a value to a local cache, without modifying the actual backend.
         """

toil/server/wes/abstract_backend.py

@@ -4,7 +4,8 @@ import json
 import logging
 import os
 from abc import abstractmethod
-from typing import Any, Callable, Optional, Union
+from collections.abc import Callable
+from typing import Any, Union
 from urllib.parse import urldefrag
 
 import connexion  # type: ignore
@@ -27,8 +28,8 @@ class VersionNotImplementedException(Exception):
     def __init__(
         self,
         wf_type: str,
-        version: Optional[str] = None,
-        supported_versions: Optional[list[str]] = None,
+        version: str | None = None,
+        supported_versions: list[str] | None = None,
     ) -> None:
         if version:
             message = (
@@ -159,7 +160,7 @@ class WESBackend:
 
     @abstractmethod
     def list_runs(
-        self, page_size: Optional[int] = None, page_token: Optional[str] = None
+        self, page_size: int | None = None, page_token: str | None = None
     ) -> dict[str, Any]:
         """
         List the workflow runs.
@@ -207,7 +208,7 @@ class WESBackend:
         raise NotImplementedError
 
     @staticmethod
-    def log_for_run(run_id: Optional[str], message: str) -> None:
+    def log_for_run(run_id: str | None, message: str) -> None:
         if run_id:
             logging.info("Workflow %s: %s", run_id, message)
         else:
@@ -224,7 +225,7 @@ class WESBackend:
         )
 
     def collect_attachments(
-        self, args: dict[str, Any], run_id: Optional[str], temp_dir: Optional[str]
+        self, args: dict[str, Any], run_id: str | None, temp_dir: str | None
     ) -> tuple[str, dict[str, Any]]:
         """
         Collect attachments from the current request by staging uploaded files
@@ -240,7 +241,7 @@ class WESBackend:
         has_attachments = False
         for k, v in args.items():
             if k == "workflow_attachment":
-                for file in (v or []):
+                for file in v or []:
                     dest = os.path.join(temp_dir, self.secure_path(file.filename))
                     if not os.path.isdir(os.path.dirname(dest)):
                         os.makedirs(os.path.dirname(dest))
@@ -251,7 +252,7 @@ class WESBackend:
                     file.save(dest)
                     has_attachments = True
                     body["workflow_attachment"] = (
-                            "file://%s" % temp_dir
+                        "file://%s" % temp_dir
                     )  # Reference to temp working dir.
             elif k in ("workflow_params", "tags", "workflow_engine_parameters"):
                 if v is not None:

toil/server/wes/amazon_wes_utils.py

@@ -22,7 +22,7 @@ import json
 import logging
 import zipfile
 from os import path
-from typing import IO, Optional, TypedDict, cast
+from typing import IO, TypedDict, cast
 from urllib.parse import ParseResult, urlparse
 
 from toil.bus import JobStatus
@@ -237,7 +237,7 @@ def parse_workflow_manifest_file(manifest_file: str) -> WorkflowPlan:
 
 
 def workflow_manifest_url_to_path(
-    url: ParseResult, parent_dir: Optional[str] = None
+    url: ParseResult, parent_dir: str | None = None
 ) -> str:
     """
     Interpret a possibly-relative parsed URL, relative to the given parent directory.
@@ -249,7 +249,7 @@ def workflow_manifest_url_to_path(
 
 
 # This one is all UCSC code
-def task_filter(task: TaskLog, job_status: JobStatus) -> Optional[TaskLog]:
+def task_filter(task: TaskLog, job_status: JobStatus) -> TaskLog | None:
     """
     AGC requires task names to be annotated with an AWS Batch job ID that they
     were run under. If it encounters an un-annotated task name, it will crash.

toil/server/wes/tasks.py

@@ -20,7 +20,7 @@ import subprocess
 import sys
 import tempfile
 import zipfile
-from typing import Any, Optional, Union
+from typing import Any
 from urllib.parse import urldefrag
 
 from celery.exceptions import SoftTimeLimitExceeded  # type: ignore
@@ -143,7 +143,7 @@ class ToilWorkflowRunner:
         return dest
 
     def sort_options(
-        self, workflow_engine_parameters: Optional[dict[str, Optional[str]]] = None
+        self, workflow_engine_parameters: dict[str, str | None] | None = None
     ) -> list[str]:
         """
         Sort the command line arguments in the order that can be recognized by
@@ -316,9 +316,7 @@ class ToilWorkflowRunner:
 
         return command_args
 
-    def call_cmd(
-        self, cmd: Union[list[str], str], cwd: str
-    ) -> "subprocess.Popen[bytes]":
+    def call_cmd(self, cmd: list[str] | str, cwd: str) -> "subprocess.Popen[bytes]":
         """
         Calls a command with Popen. Writes stdout, stderr, and the command to
         separate files.

toil/server/wes/toil_backend.py

@@ -17,9 +17,9 @@ import os
 import shutil
 import uuid
 from collections import Counter
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
-from typing import Any, Callable, Optional, TextIO, Union, overload
+from typing import Any, TextIO, overload
 
 from flask import send_from_directory
 from werkzeug.utils import redirect
@@ -83,9 +83,9 @@ class ToilWorkflow:
     @overload
     def fetch_state(self, key: str, default: str) -> str: ...
     @overload
-    def fetch_state(self, key: str, default: None = None) -> Optional[str]: ...
+    def fetch_state(self, key: str, default: None = None) -> str | None: ...
 
-    def fetch_state(self, key: str, default: Optional[str] = None) -> Optional[str]:
+    def fetch_state(self, key: str, default: str | None = None) -> str | None:
         """
         Return the contents of the given key in the workflow's state
         store. If the key does not exist, the default value is returned.
@@ -96,7 +96,7 @@ class ToilWorkflow:
         return value
 
     @contextmanager
-    def fetch_scratch(self, filename: str) -> Generator[Optional[TextIO], None, None]:
+    def fetch_scratch(self, filename: str) -> Generator[TextIO | None, None, None]:
         """
         Get a context manager for either a stream for the given file from the
         workflow's scratch directory, or None if it isn't there.
@@ -181,7 +181,7 @@ class ToilWorkflow:
                 # Stream in the file
                 return json.load(f)
 
-    def _get_scratch_file_path(self, path: str) -> Optional[str]:
+    def _get_scratch_file_path(self, path: str) -> str | None:
         """
         Return the given relative path from self.scratch_dir, if it is a file,
         and None otherwise.
@@ -190,21 +190,21 @@ class ToilWorkflow:
             return None
         return path
 
-    def get_stdout_path(self) -> Optional[str]:
+    def get_stdout_path(self) -> str | None:
         """
         Return the path to the standard output log, relative to the run's
         scratch_dir, or None if it doesn't exist.
         """
         return self._get_scratch_file_path("stdout")
 
-    def get_stderr_path(self) -> Optional[str]:
+    def get_stderr_path(self) -> str | None:
         """
         Return the path to the standard output log, relative to the run's
         scratch_dir, or None if it doesn't exist.
         """
         return self._get_scratch_file_path("stderr")
 
-    def get_messages_path(self) -> Optional[str]:
+    def get_messages_path(self) -> str | None:
         """
         Return the path to the bus message log, relative to the run's
         scratch_dir, or None if it doesn't exist.
@@ -213,10 +213,8 @@ class ToilWorkflow:
 
     def get_task_logs(
         self,
-        filter_function: Optional[
-            Callable[[TaskLog, JobStatus], Optional[TaskLog]]
-        ] = None,
-    ) -> list[dict[str, Union[str, int, None]]]:
+        filter_function: None | (Callable[[TaskLog, JobStatus], TaskLog | None]) = None,
+    ) -> list[dict[str, str | int | None]]:
         """
         Return all the task log objects for the individual tasks in the workflow.
 
@@ -243,7 +241,7 @@ class ToilWorkflow:
             # Compose log objects from recovered job info.
             logs: list[TaskLog] = []
             for job_status in job_statuses.values():
-                task: Optional[TaskLog] = {
+                task: TaskLog | None = {
                     "name": job_status.name,
                     "exit_code": job_status.exit_code,
                 }
@@ -268,9 +266,9 @@ class ToilBackend(WESBackend):
     def __init__(
         self,
         work_dir: str,
-        state_store: Optional[str],
+        state_store: str | None,
         options: list[str],
-        dest_bucket_base: Optional[str],
+        dest_bucket_base: str | None,
         bypass_celery: bool = False,
         wes_dialect: str = "standard",
     ) -> None:
@@ -384,14 +382,12 @@ class ToilBackend(WESBackend):
         logger.info("Using server ID: %s", self.server_id)
 
         self.supported_versions = {
-            "py": ["3.7", "3.8", "3.9"],
+            "py": ["3.10", "3.11", "3.12", "3.13", "3.14"],
             "cwl": ["v1.0", "v1.1", "v1.2"],
             "wdl": ["draft-2", "1.0"],
         }
 
-    def _get_run(
-        self, run_id: str, should_exists: Optional[bool] = None
-    ) -> ToilWorkflow:
+    def _get_run(self, run_id: str, should_exists: bool | None = None) -> ToilWorkflow:
         """
         Helper method to instantiate a ToilWorkflow object.
 
@@ -490,7 +486,7 @@ class ToilBackend(WESBackend):
 
     @handle_errors
     def list_runs(
-        self, page_size: Optional[int] = None, page_token: Optional[str] = None
+        self, page_size: int | None = None, page_token: str | None = None
     ) -> dict[str, Any]:
         """List the workflow runs."""
         # TODO: implement pagination

toil/server/wsgi_app.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Any, Optional
+from typing import Any
 
 from gunicorn.app.base import BaseApplication  # type: ignore
 
@@ -30,7 +30,7 @@ class GunicornApplication(BaseApplication):  # type: ignore
     For more details, see: https://docs.gunicorn.org/en/latest/custom.html
     """
 
-    def __init__(self, app: object, options: Optional[dict[str, Any]] = None):
+    def __init__(self, app: object, options: dict[str, Any] | None = None):
         self.options = options or {}
         self.application = app
         super().__init__()
@@ -52,7 +52,7 @@ class GunicornApplication(BaseApplication):  # type: ignore
         return self.application
 
 
-def run_app(app: object, options: Optional[dict[str, Any]] = None) -> None:
+def run_app(app: object, options: dict[str, Any] | None = None) -> None:
     """
     Run a Gunicorn WSGI server.
     """

toil/serviceManager.py

@@ -18,7 +18,6 @@ import time
 from collections.abc import Iterable
 from queue import Empty, Queue
 from threading import Event, Thread
-from typing import Optional
 
 from toil.job import ServiceJobDescription
 from toil.jobStores.abstractJobStore import AbstractJobStore
@@ -112,7 +111,7 @@ class ServiceManager:
         # Asynchronously schedule the services
         self.__clients_in.put(client_id)
 
-    def get_ready_client(self, maxWait: float) -> Optional[str]:
+    def get_ready_client(self, maxWait: float) -> str | None:
         """
         Fetch a ready client, waiting as needed.
 
@@ -132,7 +131,7 @@ class ServiceManager:
         except Empty:
             return None
 
-    def get_unservable_client(self, maxWait: float) -> Optional[str]:
+    def get_unservable_client(self, maxWait: float) -> str | None:
         """
         Fetch a client whos services failed to start.
 
@@ -152,7 +151,7 @@ class ServiceManager:
         except Empty:
             return None
 
-    def get_startable_service(self, maxWait: float) -> Optional[str]:
+    def get_startable_service(self, maxWait: float) -> str | None:
         """
         Fetch a service job that is ready to start.