prefect-client 3.7.6.dev3__tar.gz → 3.7.7__tar.gz

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.7.6.dev3
+Version: 3.7.7
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

prefect_client-3.7.7/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.7.7"
+__build_date__ = "2026-07-02 21:14:24.518022+00:00"
+__git_commit__ = "743957b8f3b28ab0fb1522581e77e32f2f8310bc"
+__dirty__ = False

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/deployments/steps/core.py

@@ -52,6 +52,11 @@ _STEP_COMPLETION_OBSERVER: ContextVar[_StepCompletionObserver | None] = ContextV
     default=None,
 )
 
+_PULL_STEP_SOURCE_CWD: ContextVar[Path | None] = ContextVar(
+    "pull_step_source_cwd",
+    default=None,
+)
+
 
 class StepExecutionError(Exception):
     """

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/deployments/steps/pull.py

@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Any, Optional
 
 from prefect._internal.compatibility.async_dispatch import async_dispatch
 from prefect._internal.retries import retry_async_fn
+from prefect.deployments.steps.core import _PULL_STEP_SOURCE_CWD
 from prefect.logging.loggers import get_logger
 from prefect.runner.storage import BlockStorageAdapter, GitRepository, RemoteStorage
 from prefect.utilities.asyncutils import run_coro_as_sync
@@ -32,6 +33,10 @@ def set_working_directory(directory: str) -> dict[str, str]:
         dict: a dictionary containing a `directory` key of the
             absolute path of the directory that was set
     """
+    source_cwd = _PULL_STEP_SOURCE_CWD.get()
+    if source_cwd is not None and not Path(directory).expanduser().is_absolute():
+        directory = str((source_cwd / directory).resolve())
+
     os.chdir(directory)
     return dict(directory=os.getcwd())
 

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/deployments/steps/utility.py

@@ -15,7 +15,7 @@ Example:
         - prefect_docker.deployments.steps.build_docker_image:
             requires: prefect-docker
             image_name: my-image
-            image_tag: "{{ get-commit-hash.stdout }}"
+            tag: "{{ get-commit-hash.stdout }}"
             dockerfile: auto
     ```
 """
@@ -153,7 +153,7 @@ async def run_shell_script(
             - prefect_docker.deployments.steps.build_docker_image:
                 requires: prefect-docker
                 image_name: my-image
-                image_tag: "{{ get-commit-hash.stdout }}"
+                tag: "{{ get-commit-hash.stdout }}"
                 dockerfile: auto
         ```
 

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/flows.py

@@ -3212,19 +3212,11 @@ async def load_flow_from_flow_run(
         "PREFECT__STORAGE_BASE_PATH"
     )
 
-    # If there's no colon, assume it's a module path
-    if ":" not in deployment.entrypoint:
-        run_logger.debug(
-            f"Importing flow code from module path {deployment.entrypoint}"
-        )
-        flow = await run_sync_in_worker_thread(
-            load_flow_from_entrypoint,
-            deployment.entrypoint,
-            use_placeholder_flow=use_placeholder_flow,
-        )
-        return flow
+    # Module-path entrypoints (no colon) rely on pull steps to place the code on
+    # sys.path, so the import must run *after* pull steps — not before.
+    is_module_path = ":" not in deployment.entrypoint
 
-    if not ignore_storage and not deployment.pull_steps:
+    if not is_module_path and not ignore_storage and not deployment.pull_steps:
         sys.path.insert(0, ".")
         if deployment.storage_document_id:
             storage_document = await client.read_block_document(
@@ -3249,7 +3241,7 @@ async def load_flow_from_flow_run(
         run_logger.info(f"Downloading flow code from storage at {from_path!r}")
         await storage_block.get_directory(from_path=from_path, local_path=".")
 
-    if deployment.pull_steps:
+    if not ignore_storage and deployment.pull_steps:
         run_logger.info(f"Running {len(deployment.pull_steps)} deployment pull step(s)")
 
         from prefect.deployments.steps.core import StepExecutionError, run_steps
@@ -3271,6 +3263,17 @@ async def load_flow_from_flow_run(
             run_logger.debug(f"Changing working directory to {output['directory']!r}")
             os.chdir(output["directory"])
 
+    if is_module_path:
+        run_logger.debug(
+            f"Importing flow code from module path {deployment.entrypoint}"
+        )
+        flow = await run_sync_in_worker_thread(
+            load_flow_from_entrypoint,
+            deployment.entrypoint,
+            use_placeholder_flow=use_placeholder_flow,
+        )
+        return flow
+
     import_path = relative_path_to_current_platform(deployment.entrypoint)
     run_logger.debug(f"Importing flow code from '{import_path}'")
 

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/runner/_workspace_resolver.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import argparse
-import builtins
 import contextlib
 import os
 import sys
@@ -14,9 +13,14 @@ import anyio
 from pydantic import BaseModel
 
 from prefect.client.orchestration import get_client
-from prefect.deployments.steps.core import _observe_step_completion, run_steps
+from prefect.deployments.steps.core import (
+    _PULL_STEP_SOURCE_CWD,
+    _observe_step_completion,
+    run_steps,
+)
 from prefect.filesystems import LocalFileSystem
-from prefect.logging.loggers import get_logger
+from prefect.logging.handlers import APILogHandler
+from prefect.logging.loggers import PrefectLogAdapter, flow_run_logger
 from prefect.utilities.filesystem import relative_path_to_current_platform
 from prefect.utilities.processutils import get_sys_executable
 
@@ -25,7 +29,6 @@ if TYPE_CHECKING:
     from prefect.client.schemas.objects import FlowRun
     from prefect.client.schemas.responses import DeploymentResponse
 
-LOGGER = get_logger("prefect.runner.workspace_resolver")
 STORAGE_BASE_PATH_PLACEHOLDER = "$STORAGE_BASE_PATH"
 
 
@@ -63,11 +66,6 @@ def get_workspace_resolver_command(
     ]
 
 
-def _stderr_print(*args: Any, **kwargs: Any) -> None:
-    kwargs.pop("style", None)
-    builtins.print(*args, file=sys.stderr, **kwargs)
-
-
 def _resolve_runtime_entrypoint(entrypoint: str) -> str:
     if ":" not in entrypoint:
         return entrypoint
@@ -207,6 +205,7 @@ async def _ensure_entrypoint_in_workspace(
     workspace_root: Path,
     source_cwd: Path,
     storage_base_path: Path | None,
+    logger: PrefectLogAdapter,
 ) -> Path:
     if _has_entrypoint_file(deployment.entrypoint, workspace_root):
         return workspace_root
@@ -225,6 +224,7 @@ async def _ensure_entrypoint_in_workspace(
         workspace_root,
         source_cwd,
         storage_base_path,
+        logger,
     )
     return workspace_root
 
@@ -255,6 +255,7 @@ async def _pull_storage_into_workspace(
     workspace_root: Path,
     source_cwd: Path,
     storage_base_path: Path | None,
+    logger: PrefectLogAdapter,
 ) -> Path:
     local_path = _workspace_destination_for_deployment_path(
         deployment.path, workspace_root, storage_base_path
@@ -281,7 +282,7 @@ async def _pull_storage_into_workspace(
         )
         storage_block = LocalFileSystem(basepath=from_path)
 
-    LOGGER.info("Downloading flow code from storage at %r", from_path)
+    logger.info("Downloading flow code from storage at %r", from_path)
     await storage_block.get_directory(from_path=from_path, local_path=str(local_path))
     return local_path
 
@@ -297,6 +298,8 @@ async def prepare_workspace(
             f"Deployment {deployment.id} does not have an entrypoint and can not be run."
         )
 
+    run_logger = flow_run_logger(flow_run)
+
     source_cwd = Path.cwd().resolve()
     storage_base_path = _get_configured_storage_base_path()
     resolved_workspace_root = Path(workspace_root).expanduser().resolve()
@@ -310,6 +313,7 @@ async def prepare_workspace(
             resolved_workspace_root,
             source_cwd,
             storage_base_path,
+            run_logger,
         )
         local_runtime_directory = _resolve_local_runtime_directory(
             deployment.path, source_cwd, storage_base_path
@@ -322,7 +326,9 @@ async def prepare_workspace(
         working_directory = resolved_workspace_root
         step_selected_working_directory = False
         os.chdir(resolved_workspace_root)
-        LOGGER.info("Running %s deployment pull step(s)", len(deployment.pull_steps))
+        run_logger.info(
+            "Running %s deployment pull step(s)", len(deployment.pull_steps)
+        )
 
         def _track_step_workspace(
             _step: dict[str, Any],
@@ -339,20 +345,29 @@ async def prepare_workspace(
                 if resolved_directory is not None:
                     step_selected_working_directory = True
                     working_directory = resolved_directory
-                return
-
-            if step_end_cwd is not None and step_end_cwd != step_start_cwd:
+            elif step_end_cwd is not None and step_end_cwd != step_start_cwd:
                 step_selected_working_directory = True
                 working_directory = step_end_cwd
 
-        with _observe_step_completion(_track_step_workspace):
-            await run_steps(
-                deployment.pull_steps,
-                print_function=_stderr_print,
-                deployment=deployment,
-                flow_run=flow_run,
-                logger=LOGGER,
-            )
+            # Clear source CWD after every step so the fallback only applies
+            # to the first pull step (the baked-image case).  Steps that run
+            # before set_working_directory (e.g. run_shell_script) create
+            # workspace-relative content, so subsequent relative paths must
+            # resolve against the current CWD, not the original process CWD.
+            _PULL_STEP_SOURCE_CWD.set(None)
+
+        source_cwd_token = _PULL_STEP_SOURCE_CWD.set(source_cwd)
+        try:
+            with _observe_step_completion(_track_step_workspace):
+                await run_steps(
+                    deployment.pull_steps,
+                    print_function=run_logger.warning,
+                    deployment=deployment,
+                    flow_run=flow_run,
+                    logger=run_logger,
+                )
+        finally:
+            _PULL_STEP_SOURCE_CWD.reset(source_cwd_token)
 
         if not step_selected_working_directory:
             working_directory = await _ensure_entrypoint_in_workspace(
@@ -361,6 +376,7 @@ async def prepare_workspace(
                 resolved_workspace_root,
                 source_cwd,
                 storage_base_path,
+                run_logger,
             )
 
     os.chdir(working_directory)
@@ -423,6 +439,8 @@ async def _main_async(argv: list[str] | None = None) -> int:
         sys.stdout.write(result.model_dump_json())
         sys.stdout.write("\n")
         return 1
+    finally:
+        await APILogHandler.aflush()
 
     result = PreparedWorkspaceResult(status="success", workspace=workspace)
     sys.stdout.write(result.model_dump_json())

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/server/api/server.py

@@ -52,6 +52,7 @@ import prefect.settings
 from prefect._internal.compatibility.starlette import status
 from prefect._internal.observability import configure_logfire
 from prefect.client.constants import SERVER_API_VERSION
+from prefect.locking._filelock import FileLock
 from prefect.logging import get_logger
 from prefect.server.api._ui_static import UIBundle, UIVersion, log_ui_static_copy_error
 from prefect.server.api.background_workers import background_worker
@@ -691,7 +692,9 @@ def create_ui_app(ephemeral: bool) -> FastAPI:
             if scope_path.endswith(path) and path != "/"
             else request.scope.get("root_path", "")
         )
-        redirect_url = str(request.url.replace(path=f"{scope_prefix}{redirect_path}"))
+        redirect_url = f"{scope_prefix}{redirect_path}"
+        if request.url.query:
+            redirect_url = f"{redirect_url}?{request.url.query}"
         return RedirectResponse(
             url=redirect_url,
             status_code=status.HTTP_307_TEMPORARY_REDIRECT,
@@ -739,8 +742,20 @@ def create_ui_app(ephemeral: bool) -> FastAPI:
                 continue
 
             if not reference_file_matches_cache_key(bundle):
+                lock_path = os.path.join(
+                    os.path.dirname(bundle.static_dir),
+                    f".{bundle.version}_ui_static.lock",
+                )
+                lock = FileLock(lock_path, timeout=90)
                 try:
-                    create_ui_static_subpath(bundle)
+                    lock.acquire()
+                    try:
+                        # Re-check after acquiring the lock; another worker
+                        # may have completed the copy while we waited.
+                        if not reference_file_matches_cache_key(bundle):
+                            create_ui_static_subpath(bundle)
+                    finally:
+                        lock.release()
                 except OSError as exc:
                     log_ui_static_copy_error(bundle, exc, logger)
                     continue

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/server/api/workers.py

@@ -1148,6 +1148,7 @@ async def worker_channel_connect(
                 work_pool_id=ready.payload.initial_snapshot.work_pool.id,
                 consumer_id=hello.payload.consumer_id,
                 worker_name=hello.payload.worker_name,
+                work_pool_updated=ready.payload.initial_snapshot.work_pool.updated,
                 cleanup_queue=(
                     cleanup_queue
                     if CLEANUP_DELIVERY_CAPABILITY

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/task_engine.py

@@ -299,6 +299,8 @@ class BaseTaskRunEngine(Generic[P, R]):
     def _resolve_parameters(self):
         if not self.parameters:
             return None
+        if getattr(self, "_parameters_resolved", False):
+            return None
 
         resolved_parameters = {}
         for parameter, value in self.parameters.items():
@@ -311,7 +313,7 @@ class BaseTaskRunEngine(Generic[P, R]):
                     remove_annotations=True,
                     context={"parameter_name": parameter},
                 )
-            except UpstreamTaskError:
+            except (UpstreamTaskError, PrefectException):
                 raise
             except Exception as exc:
                 raise PrefectException(
@@ -322,6 +324,7 @@ class BaseTaskRunEngine(Generic[P, R]):
                 ) from exc
 
         self.parameters = resolved_parameters
+        self._parameters_resolved = True
 
     def _set_custom_task_run_name(self):
         from prefect._internal.engine import resolve_custom_task_run_name

{prefect_client-3.7.6.dev3 → prefect_client-3.7.7}/src/prefect/utilities/engine/__init__.py

@@ -28,6 +28,7 @@ import prefect.exceptions
 from prefect._internal.concurrency.cancellation import get_deadline
 from prefect.client.schemas import FlowRunResult, OrchestrationResult, TaskRun
 from prefect.client.schemas.objects import (
+    FlowRun,
     RunType,
     TaskRunResult,
 )
@@ -52,7 +53,7 @@ from prefect.results import ResultRecord, should_persist_result
 from prefect.settings import PREFECT_LOGGING_LOG_PRINTS
 from prefect.states import State
 from prefect.tasks import Task
-from prefect.utilities.annotations import allow_failure, quote
+from prefect.utilities.annotations import allow_failure, opaque, quote
 from prefect.utilities.collections import StopVisiting, visit_collection
 from prefect.utilities.text import truncated_to
 
@@ -61,7 +62,34 @@ if TYPE_CHECKING:
 
 API_HEALTHCHECKS: dict[str, float] = {}
 UNTRACKABLE_TYPES: set[type[Any]] = {bool, type(None), type(...), type(NotImplemented)}
+_RUN_SCHEMA_TYPES: tuple[type[Any], ...] = (FlowRun, TaskRun)
 engine_logger: Logger = get_logger("engine")
+
+
+def _raise_on_run_schema_unless_opaque(obj: Any, context: dict[str, Any]) -> None:
+    """Raise a clear error when a Prefect run schema object is passed as a
+    task argument without the `opaque` annotation.
+
+    These Pydantic models contain a `.state` attribute that
+    `visit_collection` would recurse into, causing the embedded state
+    to be mistakenly treated as an upstream task dependency.
+    """
+    if isinstance(obj, _RUN_SCHEMA_TYPES) and not isinstance(
+        context.get("annotation"), opaque
+    ):
+        type_name = type(obj).__name__
+        lower = type_name[0].lower() + type_name[1:]
+        raise PrefectException(
+            f"Passing a `{type_name}` object as a task argument is not supported."
+            " Prefect inspects task arguments for upstream `State` and"
+            " `PrefectFuture` dependencies, which causes the embedded"
+            f" `{type_name}.state` attribute to be mistakenly treated as an"
+            " upstream task dependency. Pass individual fields instead"
+            f" (e.g. `{lower}.id`) or wrap the object with"
+            f" `opaque({lower})` to skip dependency traversal."
+        )
+
+
 T = TypeVar("T")
 _prefect_sigterm_handler_depth = 0
 _prefect_sigterm_bridge_lock = threading.RLock()
@@ -379,6 +407,8 @@ async def resolve_inputs(
         if isinstance(context.get("annotation"), quote):
             raise StopVisiting()
 
+        _raise_on_run_schema_unless_opaque(expr, context)
+
         if isinstance(expr, PrefectFuture):
             fut: PrefectFuture[Any] = expr
             futures.add(fut)
@@ -415,6 +445,8 @@ async def resolve_inputs(
         if isinstance(context.get("annotation"), quote):
             raise StopVisiting()
 
+        _raise_on_run_schema_unless_opaque(expr, context)
+
         if isinstance(expr, PrefectFuture):
             state = expr.state
         elif isinstance(expr, State):
@@ -446,7 +478,9 @@ async def resolve_inputs(
         ):
             return state.data
 
-        return result_by_state.get(state)
+        resolved = result_by_state.get(state)
+        _raise_on_run_schema_unless_opaque(resolved, context)
+        return resolved
 
     resolved_parameters: dict[str, Any] = {}
     for parameter, value in parameters.items():
@@ -460,7 +494,7 @@ async def resolve_inputs(
                 remove_annotations=True,
                 context={},
             )
-        except UpstreamTaskError:
+        except (UpstreamTaskError, PrefectException):
             raise
         except Exception as exc:
             raise PrefectException(
@@ -951,6 +985,8 @@ def resolve_to_final_result(expr: Any, context: dict[str, Any]) -> Any:
     if isinstance(context.get("annotation"), quote):
         raise StopVisiting()
 
+    _raise_on_run_schema_unless_opaque(expr, context)
+
     if isinstance(expr, PrefectFuture):
         upstream_task_run: Optional[TaskRun] = context.get("current_task_run")
         upstream_task: Optional["Task[..., Any]"] = context.get("current_task")
@@ -996,6 +1032,11 @@ def resolve_to_final_result(expr: Any, context: dict[str, Any]) -> Any:
 
     result: Any = state.result(raise_on_failure=False, _sync=True)  # pyright: ignore[reportCallIssue] _sync messes up type inference and can be removed once async_dispatch is removed
 
+    # Check the resolved result: if a task returned a FlowRun/TaskRun, the
+    # caller (visit_collection) would recurse into its Pydantic fields and
+    # misinterpret the embedded .state as an upstream dependency.
+    _raise_on_run_schema_unless_opaque(result, context)
+
     if state.state_details.traceparent:
         parameter_context = propagate.extract(
             {"traceparent": state.state_details.traceparent}
@@ -1046,7 +1087,7 @@ def resolve_inputs_sync(
                 remove_annotations=True,
                 context={"parameter_name": parameter},
             )
-        except UpstreamTaskError:
+        except (UpstreamTaskError, PrefectException):
             raise
         except Exception as exc:
             raise PrefectException(

prefect_client-3.7.6.dev3/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.7.6.dev3"
-__build_date__ = "2026-06-24 09:14:05.531234+00:00"
-__git_commit__ = "598fa47876041aee908d22fd2624f1b357ba0ed3"
-__dirty__ = False