prefect-client 2.20.6__tar.gz → 2.20.8__tar.gz

{prefect-client-2.20.6/src/prefect_client.egg-info → prefect-client-2.20.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.6
+Version: 2.20.8
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-client-2.20.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8}/src/prefect/deployments/runner.py

@@ -580,6 +580,7 @@ class RunnerDeployment(BaseModel):
         cls,
         entrypoint: str,
         name: str,
+        flow_name: Optional[str] = None,
         interval: Optional[
             Union[Iterable[Union[int, float, timedelta]], int, float, timedelta]
         ] = None,
@@ -606,6 +607,7 @@ class RunnerDeployment(BaseModel):
             entrypoint:  The path to a file containing a flow and the name of the flow function in
                 the format `./path/to/file.py:flow_func_name`.
             name: A name for the deployment
+            flow_name: The name of the flow to deploy
             interval: An interval on which to execute the current flow. Accepts either a number
                 or a timedelta object. If a number is given, it will be interpreted as seconds.
             cron: A cron schedule of when to execute runs of this flow.
@@ -649,7 +651,7 @@ class RunnerDeployment(BaseModel):
 
         deployment = cls(
             name=Path(name).stem,
-            flow_name=flow.name,
+            flow_name=flow_name or flow.name,
             schedule=schedule,
             schedules=constructed_schedules,
             paused=paused,
@@ -678,6 +680,7 @@ class RunnerDeployment(BaseModel):
         storage: RunnerStorage,
         entrypoint: str,
         name: str,
+        flow_name: Optional[str] = None,
         interval: Optional[
             Union[Iterable[Union[int, float, timedelta]], int, float, timedelta]
         ] = None,
@@ -705,6 +708,7 @@ class RunnerDeployment(BaseModel):
             entrypoint:  The path to a file containing a flow and the name of the flow function in
                 the format `./path/to/file.py:flow_func_name`.
             name: A name for the deployment
+            flow_name: The name of the flow to deploy
             storage: A storage object to use for retrieving flow code. If not provided, a
                 URL must be provided.
             interval: An interval on which to execute the current flow. Accepts either a number
@@ -755,7 +759,7 @@ class RunnerDeployment(BaseModel):
 
         deployment = cls(
             name=Path(name).stem,
-            flow_name=flow.name,
+            flow_name=flow_name or flow.name,
             schedule=schedule,
             schedules=constructed_schedules,
             paused=paused,

{prefect-client-2.20.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8}/src/prefect/flows.py

@@ -679,6 +679,7 @@ class Flow(Generic[P, R]):
                 storage=self._storage,
                 entrypoint=self._entrypoint,
                 name=name,
+                flow_name=self.name,
                 interval=interval,
                 cron=cron,
                 rrule=rrule,
@@ -698,7 +699,7 @@ class Flow(Generic[P, R]):
             )
         else:
             return RunnerDeployment.from_flow(
-                self,
+                flow=self,
                 name=name,
                 interval=interval,
                 cron=cron,

{prefect-client-2.20.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8}/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.6 → prefect-client-2.20.8/src/prefect_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.6
+Version: 2.20.8
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-client-2.20.6 → prefect-client-2.20.8}/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