prefect-client 2.20.5__tar.gz → 2.20.7__tar.gz

{prefect_client-2.20.5/src/prefect_client.egg-info → prefect_client-2.20.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.5
+Version: 2.20.7
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -43,7 +43,7 @@ Requires-Dist: packaging<24.3,>=21.3
 Requires-Dist: pathspec>=0.8.0
 Requires-Dist: pendulum<3.0; python_version < "3.12"
 Requires-Dist: pendulum<4,>=3.0.0; python_version >= "3.12"
-Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
+Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0,>=1.10.0
 Requires-Dist: pydantic_core<3.0.0,>=2.12.0
 Requires-Dist: python_dateutil<3.0.0,>=2.8.2
 Requires-Dist: python-slugify<9.0,>=5.0

{prefect_client-2.20.5 → prefect_client-2.20.7}/requirements-client.txt

@@ -21,7 +21,7 @@ pathspec >= 0.8.0
 pendulum < 3.0; python_version < '3.12'
 pendulum >= 3.0.0, <4; python_version >= '3.12'
 # the version constraints for pydantic are merged with those from fastapi 0.103.2
-pydantic[email]>=1.10.0,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0
+pydantic[email]>=1.10.0,!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0
 pydantic_core >= 2.12.0, < 3.0.0
 python_dateutil >= 2.8.2, < 3.0.0
 python-slugify >= 5.0, < 9.0

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect/engine.py

@@ -167,6 +167,7 @@ from prefect.results import ResultFactory, UnknownResult
 from prefect.settings import (
     PREFECT_DEBUG_MODE,
     PREFECT_EXPERIMENTAL_ENABLE_NEW_ENGINE,
+    PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED,
     PREFECT_TASK_INTROSPECTION_WARN_THRESHOLD,
     PREFECT_TASKS_REFRESH_CACHE,
     PREFECT_UI_URL,
@@ -2117,6 +2118,19 @@ async def orchestrate_task_run(
     # flag to ensure we only update the task run name once
     run_name_set = False
 
+    run_on_completion_hooks_on_cached = (
+        PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED
+        and state.is_completed()
+        and state.name == "Cached"
+    )
+
+    if run_on_completion_hooks_on_cached:
+        await _run_task_hooks(
+            task=task,
+            task_run=task_run,
+            state=state,
+        )
+
     # Only run the task if we enter a `RUNNING` state
     while state.is_running():
         # Retrieve the latest metadata for the task run context
@@ -2326,9 +2340,16 @@ async def _run_task_hooks(task: Task, task_run: TaskRun, state: State) -> None:
     catch and log any errors that occur.
     """
     hooks = None
+    run_on_completion_hooks_on_cached = (
+        PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED
+        and state.is_completed()
+        and state.name == "Cached"
+    )
     if state.is_failed() and task.on_failure:
         hooks = task.on_failure
-    elif state.is_completed() and task.on_completion:
+    elif (
+        state.is_completed() or run_on_completion_hooks_on_cached
+    ) and task.on_completion:
         hooks = task.on_completion
 
     if hooks:

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect/logging/logging.yml

@@ -77,6 +77,7 @@ loggers:
     prefect.extra:
         level: "${PREFECT_LOGGING_LEVEL}"
         handlers: [api]
+        propagate: false
 
     prefect.flow_runs:
         level: NOTSET

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect/settings.py

@@ -649,7 +649,7 @@ PREFECT_API_KEY = Setting(
 )
 """API key used to authenticate with a the Prefect API. Defaults to `None`."""
 
-PREFECT_API_ENABLE_HTTP2 = Setting(bool, default=True)
+PREFECT_API_ENABLE_HTTP2 = Setting(bool, default=False)
 """
 If true, enable support for HTTP/2 for communicating with an API.
 
@@ -1759,6 +1759,11 @@ PREFECT_API_EVENTS_RELATED_RESOURCE_CACHE_TTL = Setting(
 How long to cache related resource data for emitting server-side vents
 """
 
+PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED = Setting(bool, default=False)
+"""
+Whether or not to run on_completion hooks on cached task runs.
+"""
+
 
 def automation_settings_enabled() -> bool:
     """

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect/utilities/importtools.py

@@ -399,6 +399,7 @@ def safe_load_namespace(
         # Save original sys.path and modify it
         original_sys_path = sys.path.copy()
         sys.path.insert(0, parent_dir)
+        sys.path.insert(0, file_dir)
 
         # Create a temporary module for import context
         temp_module = ModuleType(package_name)

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect/workers/base.py

@@ -139,6 +139,12 @@ class BaseJobConfiguration(BaseModel):
         )
         variables.update(values)
 
+        # deep merge `env`
+        if isinstance(job_config.get("env"), dict) and (
+            hardcoded_env := variables.get("env")
+        ):
+            job_config["env"] = {**hardcoded_env, **job_config.get("env", {})}
+
         populated_configuration = apply_values(template=job_config, values=variables)
         populated_configuration = await resolve_block_document_references(
             template=populated_configuration, client=client

{prefect_client-2.20.5 → prefect_client-2.20.7/src/prefect_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.5
+Version: 2.20.7
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -43,7 +43,7 @@ Requires-Dist: packaging<24.3,>=21.3
 Requires-Dist: pathspec>=0.8.0
 Requires-Dist: pendulum<3.0; python_version < "3.12"
 Requires-Dist: pendulum<4,>=3.0.0; python_version >= "3.12"
-Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
+Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0,>=1.10.0
 Requires-Dist: pydantic_core<3.0.0,>=2.12.0
 Requires-Dist: python_dateutil<3.0.0,>=2.8.2
 Requires-Dist: python-slugify<9.0,>=5.0

{prefect_client-2.20.5 → prefect_client-2.20.7}/src/prefect_client.egg-info/requires.txt

@@ -16,7 +16,7 @@ jsonschema<5.0.0,>=4.0.0
 orjson<4.0,>=3.7
 packaging<24.3,>=21.3
 pathspec>=0.8.0
-pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
+pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0,>=1.10.0
 pydantic_core<3.0.0,>=2.12.0
 python_dateutil<3.0.0,>=2.8.2
 python-slugify<9.0,>=5.0

{prefect_client-2.20.5 → prefect_client-2.20.7}/tests/test_tasks.py

@@ -29,6 +29,7 @@ from prefect.server import models
 from prefect.settings import (
     PREFECT_DEBUG_MODE,
     PREFECT_EXPERIMENTAL_ENABLE_NEW_ENGINE,
+    PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED,
     PREFECT_TASK_DEFAULT_RETRIES,
     PREFECT_TASKS_REFRESH_CACHE,
     temporary_settings,
@@ -3767,6 +3768,90 @@ class TestTaskHooksOnCompletion:
         assert my_mock.call_args_list == [call(), call()]
 
 
+class TestOnCompletionHooksForCachedTasks:
+    @pytest.mark.parametrize("run_hooks_on_cached", [True, False])
+    def test_on_completion_hooks_for_cached_tasks(self, run_hooks_on_cached):
+        my_mock = MagicMock()
+
+        def completed1(task, task_run, state):
+            my_mock("completed1")
+
+        def completed2(task, task_run, state):
+            my_mock("completed2")
+
+        @task(
+            cache_key_fn=lambda *_: "cache_2",
+            cache_expiration=datetime.timedelta(seconds=5),
+            on_completion=[completed1, completed2],
+        )
+        def cached_task():
+            return "cached_result"
+
+        @flow
+        def test_flow():
+            return cached_task._run()
+
+        with temporary_settings(
+            {PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED: run_hooks_on_cached}
+        ):
+            # First run to cache the result
+            state = test_flow()
+            assert my_mock.call_args_list == [call("completed1"), call("completed2")]
+            assert not (state.is_completed() and state.name == "Cached")
+
+            my_mock.reset_mock()
+
+            # Second run to test the hooks behavior
+            state = test_flow()
+            assert state.is_completed() and state.name == "Cached"
+            if run_hooks_on_cached:
+                assert my_mock.call_args_list == [
+                    call("completed1"),
+                    call("completed2"),
+                ]
+            else:
+                assert my_mock.call_args_list == []
+
+    @pytest.mark.parametrize("run_hooks_on_cached", [True, False])
+    def test_exception_in_on_completion_hook_for_cached_task(
+        self, caplog, run_hooks_on_cached
+    ):
+        def failing_hook(task, task_run, state):
+            raise ValueError("Hook failed")
+
+        @task(
+            cache_key_fn=lambda *_: "cache_3",
+            cache_expiration=datetime.timedelta(seconds=5),
+            on_completion=[failing_hook],
+        )
+        def cached_task():
+            return "cached_result"
+
+        @flow
+        def test_flow():
+            return cached_task._run()
+
+        with temporary_settings(
+            {PREFECT_RUN_ON_COMPLETION_HOOKS_ON_CACHED: run_hooks_on_cached}
+        ):
+            # First run to cache the result
+            state = test_flow()
+            assert state.result() == "cached_result"
+            assert not (state.is_completed() and state.name == "Cached")
+
+            caplog.clear()
+
+            # Second run to test the hook behavior
+            state = test_flow()
+            assert state.is_completed() and state.name == "Cached"
+            assert state.result() == "cached_result"
+
+            if run_hooks_on_cached:
+                assert "ValueError: Hook failed" in caplog.text
+            else:
+                assert "ValueError: Hook failed" not in caplog.text
+
+
 class TestTaskHooksOnFailure:
     def test_noniterable_hook_raises(self):
         def failure_hook():