prefect-client 3.1.15__py3-none-any.whl → 3.2.1__py3-none-any.whl

prefect/task_runners.py

@@ -84,8 +84,7 @@ class TaskRunner(abc.ABC, Generic[F]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> F:
-        ...
+    ) -> F: ...
 
     @overload
     @abc.abstractmethod
@@ -95,8 +94,7 @@ class TaskRunner(abc.ABC, Generic[F]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> F:
-        ...
+    ) -> F: ...
 
     @abc.abstractmethod
     def submit(
@@ -105,8 +103,7 @@ class TaskRunner(abc.ABC, Generic[F]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> F:
-        ...
+    ) -> F: ...
 
     def map(
         self,
@@ -251,8 +248,7 @@ class ThreadPoolTaskRunner(TaskRunner[PrefectConcurrentFuture[R]]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> PrefectConcurrentFuture[R]:
-        ...
+    ) -> PrefectConcurrentFuture[R]: ...
 
     @overload
     def submit(
@@ -261,8 +257,7 @@ class ThreadPoolTaskRunner(TaskRunner[PrefectConcurrentFuture[R]]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> PrefectConcurrentFuture[R]:
-        ...
+    ) -> PrefectConcurrentFuture[R]: ...
 
     def submit(
         self,
@@ -337,8 +332,7 @@ class ThreadPoolTaskRunner(TaskRunner[PrefectConcurrentFuture[R]]):
         task: "Task[P, Coroutine[Any, Any, R]]",
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
-    ) -> PrefectFutureList[PrefectConcurrentFuture[R]]:
-        ...
+    ) -> PrefectFutureList[PrefectConcurrentFuture[R]]: ...
 
     @overload
     def map(
@@ -346,8 +340,7 @@ class ThreadPoolTaskRunner(TaskRunner[PrefectConcurrentFuture[R]]):
         task: "Task[Any, R]",
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
-    ) -> PrefectFutureList[PrefectConcurrentFuture[R]]:
-        ...
+    ) -> PrefectFutureList[PrefectConcurrentFuture[R]]: ...
 
     def map(
         self,
@@ -402,8 +395,7 @@ class PrefectTaskRunner(TaskRunner[PrefectDistributedFuture[R]]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> PrefectDistributedFuture[R]:
-        ...
+    ) -> PrefectDistributedFuture[R]: ...
 
     @overload
     def submit(
@@ -412,8 +404,7 @@ class PrefectTaskRunner(TaskRunner[PrefectDistributedFuture[R]]):
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
         dependencies: dict[str, set[TaskRunInput]] | None = None,
-    ) -> PrefectDistributedFuture[R]:
-        ...
+    ) -> PrefectDistributedFuture[R]: ...
 
     def submit(
         self,
@@ -458,8 +449,7 @@ class PrefectTaskRunner(TaskRunner[PrefectDistributedFuture[R]]):
         task: "Task[P, Coroutine[Any, Any, R]]",
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
-    ) -> PrefectFutureList[PrefectDistributedFuture[R]]:
-        ...
+    ) -> PrefectFutureList[PrefectDistributedFuture[R]]: ...
 
     @overload
     def map(
@@ -467,8 +457,7 @@ class PrefectTaskRunner(TaskRunner[PrefectDistributedFuture[R]]):
         task: "Task[Any, R]",
         parameters: dict[str, Any],
         wait_for: Iterable[PrefectFuture[Any]] | None = None,
-    ) -> PrefectFutureList[PrefectDistributedFuture[R]]:
-        ...
+    ) -> PrefectFutureList[PrefectDistributedFuture[R]]: ...
 
     def map(
         self,

prefect/task_worker.py

@@ -14,7 +14,6 @@ from uuid import UUID
 
 import anyio
 import anyio.abc
-import pendulum
 import uvicorn
 from exceptiongroup import BaseExceptionGroup  # novermin
 from fastapi import FastAPI
@@ -35,6 +34,7 @@ from prefect.settings import (
 )
 from prefect.states import Pending
 from prefect.task_engine import run_task_async, run_task_sync
+from prefect.types._datetime import DateTime
 from prefect.utilities.annotations import NotSet
 from prefect.utilities.asyncutils import asyncnullcontext, sync_compatible
 from prefect.utilities.engine import emit_task_run_state_change_event
@@ -107,7 +107,7 @@ class TaskWorker:
 
         self.task_keys: set[str] = set(t.task_key for t in tasks if isinstance(t, Task))  # pyright: ignore[reportUnnecessaryIsInstance]
 
-        self._started_at: Optional[pendulum.DateTime] = None
+        self._started_at: Optional[DateTime] = None
         self.stopping: bool = False
 
         self._client = get_client()
@@ -124,7 +124,7 @@ class TaskWorker:
         self._executor = ThreadPoolExecutor(max_workers=limit if limit else None)
         self._limiter = anyio.CapacityLimiter(limit) if limit else None
 
-        self.in_flight_task_runs: dict[str, dict[UUID, pendulum.DateTime]] = {
+        self.in_flight_task_runs: dict[str, dict[UUID, DateTime]] = {
             task_key: {} for task_key in self.task_keys
         }
         self.finished_task_runs: dict[str, int] = {
@@ -136,7 +136,7 @@ class TaskWorker:
         return f"{socket.gethostname()}-{os.getpid()}"
 
     @property
-    def started_at(self) -> Optional[pendulum.DateTime]:
+    def started_at(self) -> Optional[DateTime]:
         return self._started_at
 
     @property
@@ -248,15 +248,15 @@ class TaskWorker:
 
             token_acquired = await self._acquire_token(task_run.id)
             if token_acquired:
-                assert (
-                    self._runs_task_group is not None
-                ), "Task group was not initialized"
+                assert self._runs_task_group is not None, (
+                    "Task group was not initialized"
+                )
                 self._runs_task_group.start_soon(
                     self._safe_submit_scheduled_task_run, task_run
                 )
 
     async def _safe_submit_scheduled_task_run(self, task_run: TaskRun):
-        self.in_flight_task_runs[task_run.task_key][task_run.id] = pendulum.now()
+        self.in_flight_task_runs[task_run.task_key][task_run.id] = DateTime.now()
         try:
             await self._submit_scheduled_task_run(task_run)
         except BaseException as exc:
@@ -379,7 +379,7 @@ class TaskWorker:
         await self._exit_stack.enter_async_context(self._runs_task_group)
         self._exit_stack.enter_context(self._executor)
 
-        self._started_at = pendulum.now()
+        self._started_at = DateTime.now()
         return self
 
     async def __aexit__(self, *exc_info: Any) -> None:

prefect/tasks.py

@@ -226,8 +226,7 @@ class TaskRunNameCallbackWithParameters(Protocol):
         sig = inspect.signature(callable)
         return "parameters" in sig.parameters
 
-    def __call__(self, parameters: dict[str, Any]) -> str:
-        ...
+    def __call__(self, parameters: dict[str, Any]) -> str: ...
 
 
 StateHookCallable: TypeAlias = Callable[
@@ -483,9 +482,9 @@ class Task(Generic[P, R]):
                 f"Invalid `retry_delay_seconds` provided; must be an int, float, list or callable. Received type {type(retry_delay_seconds)}"
             )
         else:
-            self.retry_delay_seconds: Union[
-                float, int, list[float], None
-            ] = retry_delay_seconds
+            self.retry_delay_seconds: Union[float, int, list[float], None] = (
+                retry_delay_seconds
+            )
 
         if isinstance(self.retry_delay_seconds, list) and (
             len(self.retry_delay_seconds) > 50
@@ -978,8 +977,7 @@ class Task(Generic[P, R]):
         self: "Task[P, R]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> R:
-        ...
+    ) -> R: ...
 
     # Keyword parameters `return_state` and `wait_for` aren't allowed after the
     # ParamSpec `*args` parameter, so we lose return type typing when either of
@@ -992,8 +990,7 @@ class Task(Generic[P, R]):
         return_state: Literal[True] = True,
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> State[R]:
-        ...
+    ) -> State[R]: ...
 
     @overload
     def __call__(
@@ -1002,8 +999,7 @@ class Task(Generic[P, R]):
         return_state: Literal[False] = False,
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> R:
-        ...
+    ) -> R: ...
 
     def __call__(
         self: "Union[Task[P, R], Task[P, NoReturn]]",
@@ -1046,8 +1042,7 @@ class Task(Generic[P, R]):
         self: "Task[P, R]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> PrefectFuture[R]:
-        ...
+    ) -> PrefectFuture[R]: ...
 
     @overload
     def submit(
@@ -1056,8 +1051,7 @@ class Task(Generic[P, R]):
         return_state: Literal[False],
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> PrefectFuture[R]:
-        ...
+    ) -> PrefectFuture[R]: ...
 
     @overload
     def submit(
@@ -1066,8 +1060,7 @@ class Task(Generic[P, R]):
         return_state: Literal[False],
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> PrefectFuture[R]:
-        ...
+    ) -> PrefectFuture[R]: ...
 
     @overload
     def submit(
@@ -1076,8 +1069,7 @@ class Task(Generic[P, R]):
         return_state: Literal[True],
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> State[R]:
-        ...
+    ) -> State[R]: ...
 
     @overload
     def submit(
@@ -1086,8 +1078,7 @@ class Task(Generic[P, R]):
         return_state: Literal[True],
         wait_for: Optional[OneOrManyFutureOrResult[Any]] = None,
         **kwargs: P.kwargs,
-    ) -> State[R]:
-        ...
+    ) -> State[R]: ...
 
     def submit(
         self: "Union[Task[P, R], Task[P, Coroutine[Any, Any, R]]]",
@@ -1221,8 +1212,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> list[State[R]]:
-        ...
+    ) -> list[State[R]]: ...
 
     @overload
     def map(
@@ -1231,8 +1221,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> PrefectFutureList[R]:
-        ...
+    ) -> PrefectFutureList[R]: ...
 
     @overload
     def map(
@@ -1242,8 +1231,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> list[State[R]]:
-        ...
+    ) -> list[State[R]]: ...
 
     @overload
     def map(
@@ -1252,8 +1240,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> PrefectFutureList[R]:
-        ...
+    ) -> PrefectFutureList[R]: ...
 
     @overload
     def map(
@@ -1263,8 +1250,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> list[State[R]]:
-        ...
+    ) -> list[State[R]]: ...
 
     @overload
     def map(
@@ -1274,8 +1260,7 @@ class Task(Generic[P, R]):
         wait_for: Optional[Iterable[Union[PrefectFuture[R], R]]] = ...,
         deferred: bool = ...,
         **kwargs: Any,
-    ) -> PrefectFutureList[R]:
-        ...
+    ) -> PrefectFutureList[R]: ...
 
     def map(
         self,
@@ -1610,8 +1595,7 @@ class Task(Generic[P, R]):
 
 
 @overload
-def task(__fn: Callable[P, R]) -> Task[P, R]:
-    ...
+def task(__fn: Callable[P, R]) -> Task[P, R]: ...
 
 
 # see https://github.com/PrefectHQ/prefect/issues/16380
@@ -1646,8 +1630,7 @@ def task(
     on_failure: Optional[list[StateHookCallable]] = None,
     retry_condition_fn: Literal[None] = None,
     viz_return_value: Any = None,
-) -> Callable[[Callable[P, R]], Task[P, R]]:
-    ...
+) -> Callable[[Callable[P, R]], Task[P, R]]: ...
 
 
 # see https://github.com/PrefectHQ/prefect/issues/16380
@@ -1682,8 +1665,7 @@ def task(
     on_failure: Optional[list[StateHookCallable]] = None,
     retry_condition_fn: Optional[Callable[[Task[P, R], TaskRun, State], bool]] = None,
     viz_return_value: Any = None,
-) -> Callable[[Callable[P, R]], Task[P, R]]:
-    ...
+) -> Callable[[Callable[P, R]], Task[P, R]]: ...
 
 
 @overload  # TODO: do we need this overload?
@@ -1719,8 +1701,7 @@ def task(
     on_failure: Optional[list[StateHookCallable]] = None,
     retry_condition_fn: Optional[Callable[[Task[P, Any], TaskRun, State], bool]] = None,
     viz_return_value: Any = None,
-) -> Callable[[Callable[P, R]], Task[P, R]]:
-    ...
+) -> Callable[[Callable[P, R]], Task[P, R]]: ...
 
 
 def task(

prefect/telemetry/bootstrap.py

@@ -15,12 +15,10 @@ if TYPE_CHECKING:
     from opentelemetry.sdk.trace import TracerProvider
 
 
-def setup_telemetry() -> (
-    Union[
-        tuple["TracerProvider", "MeterProvider", "LoggerProvider"],
-        tuple[None, None, None],
-    ]
-):
+def setup_telemetry() -> Union[
+    tuple["TracerProvider", "MeterProvider", "LoggerProvider"],
+    tuple[None, None, None],
+]:
     settings = prefect.settings.get_current_settings()
 
     server_type = determine_server_type()

prefect/telemetry/services.py

@@ -15,11 +15,9 @@ T_contra = TypeVar("T_contra", contravariant=True)
 
 
 class OTLPExporter(Protocol[T_contra]):
-    def export(self, __items: Sequence[T_contra]) -> Any:
-        ...
+    def export(self, __items: Sequence[T_contra]) -> Any: ...
 
-    def shutdown(self) -> Any:
-        ...
+    def shutdown(self) -> Any: ...
 
 
 class BaseQueueingExporter(BatchedQueueService[BatchItem]):

prefect/types/__init__.py

@@ -106,7 +106,8 @@ KeyValueLabels = Annotated[
 
 
 ListOfNonEmptyStrings = Annotated[
-    List[str], BeforeValidator(lambda x: [s for s in x if s.strip()])
+    List[str],
+    BeforeValidator(lambda x: [str(s) for s in x if str(s).strip()]),
 ]
 
 

prefect/types/_datetime.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
 
+from typing import Any
+
 import pendulum
+import pendulum.tz
 from pendulum.date import Date as PendulumDate
 from pendulum.datetime import DateTime as PendulumDateTime
 from pendulum.duration import Duration as PendulumDuration
 from pendulum.time import Time as PendulumTime
+from pendulum.tz.timezone import FixedTimezone, Timezone
 from pydantic_extra_types.pendulum_dt import Date as PydanticDate
 from pydantic_extra_types.pendulum_dt import DateTime as PydanticDateTime
 from typing_extensions import TypeAlias
@@ -15,5 +19,28 @@ Date: TypeAlias = PydanticDate
 
 def parse_datetime(
     value: str,
+    **options: Any,
 ) -> PendulumDateTime | PendulumDate | PendulumTime | PendulumDuration:
-    return pendulum.parse(value)
+    return pendulum.parse(value, **options)
+
+
+def format_diff(
+    diff: PendulumDuration,
+    is_now: bool = True,
+    absolute: bool = False,
+    locale: str | None = None,
+) -> str:
+    return pendulum.format_diff(diff, is_now, absolute, locale)
+
+
+def local_timezone() -> Timezone | FixedTimezone:
+    return pendulum.tz.local_timezone()
+
+
+def from_format(
+    value: str,
+    fmt: str,
+    tz: str | Timezone = pendulum.tz.UTC,
+    locale: str | None = None,
+) -> DateTime:
+    return DateTime.instance(pendulum.from_format(value, fmt, tz, locale))

prefect/utilities/_engine.py

@@ -1,6 +1,5 @@
 """Internal engine utilities"""
 
-
 from collections.abc import Callable
 from functools import partial
 from typing import TYPE_CHECKING, Any, Union

prefect/utilities/asyncutils.py

@@ -129,8 +129,7 @@ def run_coro_as_sync(
     *,
     force_new_thread: bool = ...,
     wait_for_result: Literal[True] = ...,
-) -> R:
-    ...
+) -> R: ...
 
 
 @overload
@@ -139,8 +138,7 @@ def run_coro_as_sync(
     *,
     force_new_thread: bool = ...,
     wait_for_result: Literal[False] = False,
-) -> R:
-    ...
+) -> R: ...
 
 
 def run_coro_as_sync(
@@ -366,15 +364,13 @@ def sync_compatible(
 @overload
 def asyncnullcontext(
     value: None = None, *args: Any, **kwargs: Any
-) -> AbstractAsyncContextManager[None, None]:
-    ...
+) -> AbstractAsyncContextManager[None, None]: ...
 
 
 @overload
 def asyncnullcontext(
     value: R, *args: Any, **kwargs: Any
-) -> AbstractAsyncContextManager[R, None]:
-    ...
+) -> AbstractAsyncContextManager[R, None]: ...
 
 
 @asynccontextmanager

prefect/utilities/collections.py

@@ -253,8 +253,7 @@ def visit_collection(
     context: dict[str, VT] = ...,
     remove_annotations: bool = ...,
     _seen: Optional[set[int]] = ...,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 @overload
@@ -267,8 +266,7 @@ def visit_collection(
     context: None = None,
     remove_annotations: bool = ...,
     _seen: Optional[set[int]] = ...,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 @overload
@@ -281,8 +279,7 @@ def visit_collection(
     context: dict[str, VT] = ...,
     remove_annotations: bool = ...,
     _seen: Optional[set[int]] = ...,
-) -> Optional[Any]:
-    ...
+) -> Optional[Any]: ...
 
 
 @overload
@@ -295,8 +292,7 @@ def visit_collection(
     context: None = None,
     remove_annotations: bool = ...,
     _seen: Optional[set[int]] = ...,
-) -> Optional[Any]:
-    ...
+) -> Optional[Any]: ...
 
 
 @overload
@@ -309,8 +305,7 @@ def visit_collection(
     context: dict[str, VT] = ...,
     remove_annotations: bool = ...,
     _seen: Optional[set[int]] = ...,
-) -> None:
-    ...
+) -> None: ...
 
 
 def visit_collection(
@@ -545,13 +540,11 @@ def visit_collection(
 @overload
 def remove_nested_keys(
     keys_to_remove: list[HashableT], obj: NestedDict[HashableT, VT]
-) -> NestedDict[HashableT, VT]:
-    ...
+) -> NestedDict[HashableT, VT]: ...
 
 
 @overload
-def remove_nested_keys(keys_to_remove: list[HashableT], obj: Any) -> Any:
-    ...
+def remove_nested_keys(keys_to_remove: list[HashableT], obj: Any) -> Any: ...
 
 
 def remove_nested_keys(
@@ -579,13 +572,13 @@ def remove_nested_keys(
 
 
 @overload
-def distinct(iterable: Iterable[HashableT], key: None = None) -> Iterator[HashableT]:
-    ...
+def distinct(
+    iterable: Iterable[HashableT], key: None = None
+) -> Iterator[HashableT]: ...
 
 
 @overload
-def distinct(iterable: Iterable[T], key: Callable[[T], Hashable]) -> Iterator[T]:
-    ...
+def distinct(iterable: Iterable[T], key: Callable[[T], Hashable]) -> Iterator[T]: ...
 
 
 def distinct(
@@ -609,15 +602,13 @@ def distinct(
 @overload
 def get_from_dict(
     dct: NestedDict[str, VT], keys: Union[str, list[str]], default: None = None
-) -> Optional[VT]:
-    ...
+) -> Optional[VT]: ...
 
 
 @overload
 def get_from_dict(
     dct: NestedDict[str, VT], keys: Union[str, list[str]], default: R
-) -> Union[VT, R]:
-    ...
+) -> Union[VT, R]: ...
 
 
 def get_from_dict(

prefect/utilities/dispatch.py

@@ -45,15 +45,13 @@ def get_registry_for_type(cls: T) -> Optional[dict[str, T]]:
 @overload
 def get_dispatch_key(
     cls_or_instance: Any, allow_missing: Literal[False] = False
-) -> str:
-    ...
+) -> str: ...
 
 
 @overload
 def get_dispatch_key(
     cls_or_instance: Any, allow_missing: Literal[True] = ...
-) -> Optional[str]:
-    ...
+) -> Optional[str]: ...
 
 
 def get_dispatch_key(

prefect/utilities/dockerutils.py

@@ -331,7 +331,7 @@ class ImageBuilder:
     def assert_has_line(self, line: str) -> None:
         """Asserts that the given line is in the Dockerfile"""
         all_lines = "\n".join(
-            [f"  {i+1:>3}: {line}" for i, line in enumerate(self.dockerfile_lines)]
+            [f"  {i + 1:>3}: {line}" for i, line in enumerate(self.dockerfile_lines)]
         )
         message = (
             f"Expected {line!r} not found in Dockerfile.  Dockerfile:\n{all_lines}"
@@ -347,12 +347,12 @@ class ImageBuilder:
 
         surrounding_lines = "\n".join(
             [
-                f"  {i+1:>3}: {line}"
+                f"  {i + 1:>3}: {line}"
                 for i, line in enumerate(self.dockerfile_lines[i - 2 : i + 2])
             ]
         )
         message = (
-            f"Unexpected {line!r} found in Dockerfile at line {i+1}.  "
+            f"Unexpected {line!r} found in Dockerfile at line {i + 1}.  "
             f"Surrounding lines:\n{surrounding_lines}"
         )
 
@@ -368,7 +368,7 @@ class ImageBuilder:
 
         surrounding_lines = "\n".join(
             [
-                f"  {i+1:>3}: {line}"
+                f"  {i + 1:>3}: {line}"
                 for i, line in enumerate(
                     self.dockerfile_lines[second_index - 2 : first_index + 2]
                 )
@@ -377,8 +377,8 @@ class ImageBuilder:
 
         message = (
             f"Expected {first!r} to appear before {second!r} in the Dockerfile, but "
-            f"{first!r} was at line {first_index+1} and {second!r} as at line "
-            f"{second_index+1}.  Surrounding lines:\n{surrounding_lines}"
+            f"{first!r} was at line {first_index + 1} and {second!r} as at line "
+            f"{second_index + 1}.  Surrounding lines:\n{surrounding_lines}"
         )
 
         assert first_index < second_index, message