prefect-client 2.20.1__tar.gz → 2.20.4__tar.gz

prefect_client-2.20.4/PKG-INFO

@@ -0,0 +1,173 @@
+Metadata-Version: 2.1
+Name: prefect-client
+Version: 2.20.4
+Summary: Workflow orchestration and management.
+Home-page: https://www.prefect.io
+Author: Prefect Technologies, Inc.
+Author-email: help@prefect.io
+Project-URL: Changelog, https://github.com/PrefectHQ/prefect/blob/main/RELEASE-NOTES.md
+Project-URL: Documentation, https://docs.prefect.io
+Project-URL: Source, https://github.com/PrefectHQ/prefect
+Project-URL: Tracker, https://github.com/PrefectHQ/prefect/issues
+Classifier: Natural Language :: English
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: anyio<5.0.0,>=4.4.0
+Requires-Dist: asgi-lifespan<3.0,>=1.0
+Requires-Dist: cachetools<6.0,>=5.3
+Requires-Dist: cloudpickle<4.0,>=2.0
+Requires-Dist: coolname<3.0.0,>=1.0.4
+Requires-Dist: croniter<3.0.0,>=1.0.12
+Requires-Dist: fsspec>=2022.5.0
+Requires-Dist: exceptiongroup>=1.2.1
+Requires-Dist: graphviz>=0.20.1
+Requires-Dist: griffe<2.0.0,>=0.49.0
+Requires-Dist: httpcore<2.0.0,>=1.0.5
+Requires-Dist: httpx[http2]!=0.23.2,>=0.23
+Requires-Dist: importlib_metadata>=4.4; python_version < "3.10"
+Requires-Dist: importlib-resources<6.5.0,>=6.1.3
+Requires-Dist: jsonpatch<2.0,>=1.32
+Requires-Dist: jsonschema<5.0.0,>=4.0.0
+Requires-Dist: orjson<4.0,>=3.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_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
+Requires-Dist: pyyaml<7.0.0,>=5.4.1
+Requires-Dist: rfc3339-validator<0.2.0,>=0.1.4
+Requires-Dist: rich<14.0,>=11.0
+Requires-Dist: ruamel.yaml>=0.17.0
+Requires-Dist: sniffio<2.0.0,>=1.3.0
+Requires-Dist: toml>=0.10.0
+Requires-Dist: typing_extensions<5.0.0,>=4.5.0
+Requires-Dist: ujson<6.0.0,>=5.8.0
+Requires-Dist: uvicorn!=0.29.0,>=0.14.0
+Requires-Dist: websockets<14.0,>=10.4
+Requires-Dist: itsdangerous
+Requires-Dist: python-multipart>=0.0.7
+Provides-Extra: notifications
+Requires-Dist: apprise<2.0.0,>=1.1.0; extra == "notifications"
+
+<p align="center"><img src="https://github.com/PrefectHQ/prefect/assets/3407835/c654cbc6-63e8-4ada-a92a-efd2f8f24b85" width=1000></p>
+
+<p align="center">
+    <a href="https://pypi.python.org/pypi/prefect-client/" alt="PyPI version">
+        <img alt="PyPI" src="https://img.shields.io/pypi/v/prefect-client?color=0052FF&labelColor=090422"></a>
+    <a href="https://github.com/prefecthq/prefect/" alt="Stars">
+        <img src="https://img.shields.io/github/stars/prefecthq/prefect?color=0052FF&labelColor=090422" /></a>
+    <a href="https://pepy.tech/badge/prefect-client/" alt="Downloads">
+        <img src="https://img.shields.io/pypi/dm/prefect-client?color=0052FF&labelColor=090422" /></a>
+    <a href="https://github.com/prefecthq/prefect/pulse" alt="Activity">
+        <img src="https://img.shields.io/github/commit-activity/m/prefecthq/prefect?color=0052FF&labelColor=090422" /></a>
+    <br>
+    <a href="https://prefect.io/slack" alt="Slack">
+        <img src="https://img.shields.io/badge/slack-join_community-red.svg?color=0052FF&labelColor=090422&logo=slack" /></a>
+    <a href="https://discourse.prefect.io/" alt="Discourse">
+        <img src="https://img.shields.io/badge/discourse-browse_forum-red.svg?color=0052FF&labelColor=090422&logo=discourse" /></a>
+    <a href="https://www.youtube.com/c/PrefectIO/" alt="YouTube">
+        <img src="https://img.shields.io/badge/youtube-watch_videos-red.svg?color=0052FF&labelColor=090422&logo=youtube" /></a>
+</p>
+
+# prefect-client
+
+The `prefect-client` package is a minimal-installation of `prefect` which is designed for interacting with Prefect Cloud 
+or remote any `prefect` server. It sheds some functionality and dependencies in exchange for a smaller installation size, 
+making it ideal for use in lightweight or ephemeral environments. These characteristics make it ideal for use in lambdas 
+or other resource-constrained environments. 
+
+
+## Getting started
+
+`prefect-client` shares the same installation requirements as prefect. To install, make sure you are on Python 3.8 or 
+later and run the following command:
+
+```bash
+pip install prefect-client
+```
+
+Next, ensure that your `prefect-client` has access to a remote `prefect` server by exporting the `PREFECT_API_KEY` 
+(if using Prefect Cloud) and `PREFECT_API_URL` environment variables. Once those are set, use the package in your code as 
+you would normally use `prefect`! 
+
+
+For example, to remotely trigger a run a deployment:
+
+```python
+from prefect.deployments import run_deployment
+
+
+def my_lambda(event):
+    ...
+    run_deployment(
+        name="my-flow/my-deployment",
+        parameters={"foo": "bar"},
+        timeout=0,
+    )
+
+my_lambda({})
+```
+
+To emit events in an event driven system:
+
+```python
+from prefect.events import emit_event
+
+
+def something_happened():
+    emit_event("my-event", resource={"prefect.resource.id": "foo.bar"})
+
+something_happened()
+```
+
+
+Or just interact with a `prefect` API:
+```python
+from prefect.client.orchestration import get_client
+
+
+async def query_api():
+    async with get_client() as client:
+        limits = await client.read_concurrency_limits(limit=10, offset=0)
+        print(limits)
+
+
+query_api()
+```
+
+
+## Known limitations
+By design, `prefect-client` omits all CLI and server components. This means that the CLI is not available for use 
+and attempts to access server objects will fail. Furthermore, some classes, methods, and objects may be available 
+for import in `prefect-client` but may not be "runnable" if they tap into server-oriented functionality. If you 
+encounter such a limitation, feel free to [open an issue](https://github.com/PrefectHQ/prefect/issues/new/choose) 
+describing the functionality you are interested in using and we will do our best to make it available.
+
+
+## Next steps
+
+There's lots more you can do to orchestrate and observe your workflows with Prefect!
+Start with our [friendly tutorial](https://docs.prefect.io/tutorials) or explore the [core concepts of Prefect workflows](https://docs.prefect.io/concepts/).
+
+## Join the community
+
+Prefect is made possible by the fastest growing community of thousands of friendly data engineers. Join us in building a new kind of workflow system. The [Prefect Slack community](https://prefect.io/slack) is a fantastic place to learn more about Prefect, ask questions, or get help with workflow design. All community forums, including code contributions, issue discussions, and slack messages are subject to our [Code of Conduct](https://discourse.prefect.io/faq).
+
+## Contribute
+
+See our [documentation on contributing to Prefect](https://docs.prefect.io/contributing/overview/).
+
+Thanks for being part of the mission to build a new kind of workflow system and, of course, **happy engineering!**

{prefect-client-2.20.1 → prefect_client-2.20.4}/requirements-client.txt

@@ -7,11 +7,11 @@ croniter >= 1.0.12, < 3.0.0
 fsspec >= 2022.5.0
 exceptiongroup >= 1.2.1
 graphviz >= 0.20.1
-griffe >= 0.20.0, <0.48.0
+griffe >= 0.49.0, <2.0.0
 httpcore >=1.0.5, < 2.0.0
 httpx[http2] >= 0.23, != 0.23.2
 importlib_metadata >= 4.4; python_version < '3.10'
-importlib-resources >= 6.1.3, < 6.2.0
+importlib-resources >= 6.1.3, < 6.5.0
 jsonpatch >= 1.32, < 2.0
 jsonschema >= 4.0.0, < 5.0.0
 orjson >= 3.7, < 4.0
@@ -34,7 +34,7 @@ toml >= 0.10.0
 typing_extensions >= 4.5.0, < 5.0.0
 ujson >= 5.8.0, < 6.0.0
 uvicorn >= 0.14.0, !=0.29.0
-websockets >= 10.4, < 13.0
+websockets >= 10.4, < 14.0
 
 # additional dependencies of starlette, which we're currently vendoring
 itsdangerous

{prefect-client-2.20.1 → prefect_client-2.20.4}/requirements-dev.txt

@@ -1,7 +1,6 @@
 ruff
 cairosvg
 codespell>=2.2.6
-ddtrace
 # Pin IPython to 8.12 when building on Python 3.8
 # https://github.com/ipython/ipython/blob/main/README.rst
 ipython == 8.12.*; python_version == '3.8'
@@ -19,7 +18,7 @@ numpy
 pillow
 pre-commit
 pluggy >= 1.4.0
-pytest > 7, < 8 # Datadog's ddtrace does not support pytest 8 yet. See https://github.com/DataDog/dd-trace-py/issues/8220
+pytest > 7, < 9 
 pytest-asyncio >= 0.18.2, != 0.22.0, < 0.23.0 # Cannot override event loop in 0.23.0. See https://github.com/pytest-dev/pytest-asyncio/issues/706 for more details.
 pytest-cov
 pytest-benchmark
@@ -29,7 +28,6 @@ pytest-timeout
 pytest-xdist < 3.4.0 # 3.5.0 introduces some flakiness. Need to investigate and resolve.
 pytkdocs >= 0.14.2
 pyyaml
-requests<2.32.0  # `requests` renamed `get_connection` to `_get_connection`, which is a method docker-py monkeypatches. See https://github.com/docker/docker-py/issues/3256 Should be able to un-pin when docker-py hotfix is out.
 setuptools != 60.9.0; python_version < '3.8'
 vermin
 virtualenv

{prefect-client-2.20.1 → prefect_client-2.20.4}/requirements.txt

@@ -1,18 +1,17 @@
 -r requirements-client.txt
 
-aiosqlite >= 0.17.0
+aiosqlite >= 0.17.0, < 1.0.0
 alembic >= 1.7.5, < 2.0.0
 apprise >= 1.8.0, < 2.0.0
-asyncpg >= 0.23
+asyncpg >= 0.23, < 1.0.0
 click >= 8.0, < 8.2
 cryptography >= 36.0.1
 dateparser >= 1.1.1, < 2.0.0
-docker >= 4.0
+docker >= 4.0, < 8.0
 graphviz >= 0.20.1
-griffe >= 0.20.0, <0.48.0
 jinja2 >= 3.0.0, < 4.0.0
 jinja2-humanize-extension >= 0.4.0
-humanize >= 4.9.0
+humanize >= 4.9.0, < 5.0.0
 kubernetes >= 24.2.0, < 30.0.0
 pytz >= 2021.1, < 2025
 readchar >= 4.0.0, < 5.0.0

{prefect-client-2.20.1 → prefect_client-2.20.4}/setup.cfg

@@ -64,7 +64,7 @@ follow_imports = skip
 ignore_missing_imports = True
 
 [versioneer]
-vcs = git
+VCS = git
 style = pep440
 versionfile_source = src/prefect/_version.py
 versionfile_build = prefect/_version.py

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/blocks/core.py

@@ -18,9 +18,7 @@ from typing import (
 )
 from uuid import UUID, uuid4
 
-from griffe.dataclasses import Docstring
-from griffe.docstrings.dataclasses import DocstringSection, DocstringSectionKind
-from griffe.docstrings.parsers import Parser, parse
+from griffe import Docstring, DocstringSection, DocstringSectionKind, Parser, parse
 from packaging.version import InvalidVersion, Version
 
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
@@ -120,18 +118,20 @@ def _is_subclass(cls, parent_cls) -> bool:
     Checks if a given class is a subclass of another class. Unlike issubclass,
     this will not throw an exception if cls is an instance instead of a type.
     """
-    return inspect.isclass(cls) and issubclass(cls, parent_cls)
+    # For python<=3.11 inspect.isclass() will return True for parametrized types (e.g. list[str])
+    # so we need to check for get_origin() to avoid TypeError for issubclass.
+    return inspect.isclass(cls) and not get_origin(cls) and issubclass(cls, parent_cls)
 
 
 def _collect_secret_fields(name: str, type_: Type, secrets: List[str]) -> None:
     """
     Recursively collects all secret fields from a given type and adds them to the
-    secrets list, supporting nested Union / BaseModel fields. Also, note, this function
-    mutates the input secrets list, thus does not return anything.
+    secrets list, supporting nested Union / Dict / Tuple / List / BaseModel fields.
+    Also, note, this function mutates the input secrets list, thus does not return anything.
     """
-    if get_origin(type_) is Union:
-        for union_type in get_args(type_):
-            _collect_secret_fields(name, union_type, secrets)
+    if get_origin(type_) in (Union, dict, list, tuple):
+        for nested_type in get_args(type_):
+            _collect_secret_fields(name, nested_type, secrets)
         return
     elif _is_subclass(type_, BaseModel):
         for field in type_.__fields__.values():
@@ -241,25 +241,29 @@ class Block(BaseModel, ABC):
 
             # create block schema references
             refs = schema["block_schema_references"] = {}
+
+            def collect_block_schema_references(
+                field_name: str, annotation: type
+            ) -> None:
+                """Walk through the annotation and collect block schemas for any nested blocks."""
+                if Block.is_block_class(annotation):
+                    if isinstance(refs.get(field_name), list):
+                        refs[field_name].append(
+                            annotation._to_block_schema_reference_dict()
+                        )
+                    elif isinstance(refs.get(field_name), dict):
+                        refs[field_name] = [
+                            refs[field_name],
+                            annotation._to_block_schema_reference_dict(),
+                        ]
+                    else:
+                        refs[field_name] = annotation._to_block_schema_reference_dict()
+                if get_origin(annotation) in (Union, list, tuple, dict):
+                    for type_ in get_args(annotation):
+                        collect_block_schema_references(field_name, type_)
+
             for field in model.__fields__.values():
-                if Block.is_block_class(field.type_):
-                    refs[field.name] = field.type_._to_block_schema_reference_dict()
-                if get_origin(field.type_) is Union:
-                    for type_ in get_args(field.type_):
-                        if Block.is_block_class(type_):
-                            if isinstance(refs.get(field.name), list):
-                                refs[field.name].append(
-                                    type_._to_block_schema_reference_dict()
-                                )
-                            elif isinstance(refs.get(field.name), dict):
-                                refs[field.name] = [
-                                    refs[field.name],
-                                    type_._to_block_schema_reference_dict(),
-                                ]
-                            else:
-                                refs[
-                                    field.name
-                                ] = type_._to_block_schema_reference_dict()
+                collect_block_schema_references(field.name, field.type_)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -888,13 +892,16 @@ class Block(BaseModel, ABC):
                 "subclass and not on a Block interface class directly."
             )
 
+        async def register_blocks_in_annotation(annotation: type) -> None:
+            """Walk through the annotation and register any nested blocks."""
+            if Block.is_block_class(annotation):
+                await annotation.register_type_and_schema(client=client)
+            elif get_origin(annotation) in (Union, tuple, list, dict):
+                for inner_annotation in get_args(annotation):
+                    await register_blocks_in_annotation(inner_annotation)
+
         for field in cls.__fields__.values():
-            if Block.is_block_class(field.type_):
-                await field.type_.register_type_and_schema(client=client)
-            if get_origin(field.type_) is Union:
-                for type_ in get_args(field.type_):
-                    if Block.is_block_class(type_):
-                        await type_.register_type_and_schema(client=client)
+            await register_blocks_in_annotation(field.annotation)
 
         try:
             block_type = await client.read_block_type_by_slug(

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/client/orchestration.py

@@ -2665,12 +2665,14 @@ class PrefectClient:
     async def create_work_pool(
         self,
         work_pool: WorkPoolCreate,
+        overwrite: bool = False,
     ) -> WorkPool:
         """
         Creates a work pool with the provided configuration.
 
         Args:
             work_pool: Desired configuration for the new work pool.
+            overwrite: Whether to overwrite an existing work pool with the same name.
 
         Returns:
             Information about the newly created work pool.
@@ -2682,7 +2684,24 @@ class PrefectClient:
             )
         except httpx.HTTPStatusError as e:
             if e.response.status_code == status.HTTP_409_CONFLICT:
-                raise prefect.exceptions.ObjectAlreadyExists(http_exc=e) from e
+                if overwrite:
+                    existing_work_pool = await self.read_work_pool(
+                        work_pool_name=work_pool.name
+                    )
+                    if existing_work_pool.type != work_pool.type:
+                        warnings.warn(
+                            "Overwriting work pool type is not supported. Ignoring provided type.",
+                            category=UserWarning,
+                        )
+                    await self.update_work_pool(
+                        work_pool_name=work_pool.name,
+                        work_pool=WorkPoolUpdate.parse_obj(
+                            work_pool.dict(exclude={"name", "type"})
+                        ),
+                    )
+                    response = await self._client.get(f"/work_pools/{work_pool.name}")
+                else:
+                    raise prefect.exceptions.ObjectAlreadyExists(http_exc=e) from e
             else:
                 raise
 

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/engine.py

@@ -332,6 +332,18 @@ def enter_flow_run_engine_from_subprocess(flow_run_id: UUID) -> State:
     return state
 
 
+async def _make_flow_run(
+    flow: Flow, parameters: Dict[str, Any], state: State, client: PrefectClient
+) -> FlowRun:
+    return await client.create_flow_run(
+        flow,
+        # Send serialized parameters to the backend
+        parameters=flow.serialize_parameters(parameters),
+        state=state,
+        tags=TagsContext.get().current_tags,
+    )
+
+
 @inject_client
 async def create_then_begin_flow_run(
     flow: Flow,
@@ -351,6 +363,7 @@ async def create_then_begin_flow_run(
 
     await check_api_reachable(client, "Cannot create flow run")
 
+    flow_run = None
     state = Pending()
     if flow.should_validate_parameters:
         try:
@@ -359,14 +372,10 @@ async def create_then_begin_flow_run(
             state = await exception_to_failed_state(
                 message="Validation of flow parameters failed with error:"
             )
+            flow_run = await _make_flow_run(flow, parameters, state, client)
+            await _run_flow_hooks(flow, flow_run, state)
 
-    flow_run = await client.create_flow_run(
-        flow,
-        # Send serialized parameters to the backend
-        parameters=flow.serialize_parameters(parameters),
-        state=state,
-        tags=TagsContext.get().current_tags,
-    )
+    flow_run = flow_run or await _make_flow_run(flow, parameters, state, client)
 
     engine_logger.info(f"Created flow run {flow_run.name!r} for flow {flow.name!r}")
 

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/infrastructure/kubernetes.py

@@ -586,7 +586,7 @@ class KubernetesJob(Infrastructure):
                         "prefect-job-"
                         # We generate a name using a hash of the primary job settings
                         + stable_hash(
-                            *self.command,
+                            *self.command if self.command else "",
                             *self.env.keys(),
                             *[v for v in self.env.values() if v is not None],
                         )

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/runner/runner.py

@@ -35,7 +35,6 @@ import datetime
 import inspect
 import logging
 import os
-import shlex
 import shutil
 import signal
 import subprocess
@@ -97,7 +96,11 @@ from prefect.utilities.asyncutils import (
     sync_compatible,
 )
 from prefect.utilities.engine import propose_state
-from prefect.utilities.processutils import _register_signal, run_process
+from prefect.utilities.processutils import (
+    _register_signal,
+    get_sys_executable,
+    run_process,
+)
 from prefect.utilities.services import critical_service_loop
 
 __all__ = ["Runner"]
@@ -533,7 +536,7 @@ class Runner:
             task_status: anyio task status used to send a message to the caller
                 than the flow run process has started.
         """
-        command = f"{shlex.quote(sys.executable)} -m prefect.engine"
+        command = [get_sys_executable(), "-m", "prefect.engine"]
 
         flow_run_logger = self._get_flow_run_logger(flow_run)
 
@@ -580,7 +583,7 @@ class Runner:
                 setattr(storage, "last_adhoc_pull", datetime.datetime.now())
 
         process = await run_process(
-            shlex.split(command),
+            command=command,
             stream_output=True,
             task_status=task_status,
             env=env,

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/runtime/flow_run.py

@@ -12,12 +12,14 @@ Available attributes:
     - `scheduled_start_time`: the flow run's expected scheduled start time; defaults to now if not present
     - `name`: the name of the flow run
     - `flow_name`: the name of the flow
+    - `flow_version`: the version of the flow
     - `parameters`: the parameters that were passed to this run; note that these do not necessarily
         include default values set on the flow function, only the parameter values explicitly passed for the run
     - `parent_flow_run_id`: the ID of the flow run that triggered this run, if any
     - `parent_deployment_id`: the ID of the deployment that triggered this run, if any
     - `run_count`: the number of times this flow run has been run
 """
+
 import os
 from typing import Any, Dict, List, Optional
 
@@ -34,6 +36,7 @@ __all__ = [
     "scheduled_start_time",
     "name",
     "flow_name",
+    "flow_version",
     "parameters",
     "parent_flow_run_id",
     "parent_deployment_id",
@@ -188,6 +191,21 @@ def get_flow_name() -> Optional[str]:
         return flow_run_ctx.flow.name
 
 
+def get_flow_version() -> Optional[str]:
+    flow_run_ctx = FlowRunContext.get()
+    run_id = get_id()
+    if flow_run_ctx is None and run_id is None:
+        return None
+    elif flow_run_ctx is None:
+        flow = from_sync.call_soon_in_loop_thread(
+            create_call(_get_flow_from_run, run_id)
+        ).result()
+
+        return flow.version
+    else:
+        return flow_run_ctx.flow.version
+
+
 def get_scheduled_start_time() -> pendulum.DateTime:
     flow_run_ctx = FlowRunContext.get()
     run_id = get_id()
@@ -271,6 +289,7 @@ FIELDS = {
     "scheduled_start_time": get_scheduled_start_time,
     "name": get_name,
     "flow_name": get_flow_name,
+    "flow_version": get_flow_version,
     "parameters": get_parameters,
     "parent_flow_run_id": get_parent_flow_run_id,
     "parent_deployment_id": get_parent_deployment_id,

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/settings.py

@@ -345,7 +345,11 @@ def template_with_settings(*upstream_settings: Setting) -> Callable[["Settings",
             setting.name: setting.value_from(settings) for setting in upstream_settings
         }
         template = string.Template(str(value))
-        return original_type(template.substitute(template_values))
+        # Note the use of `safe_substitute` to avoid raising an exception if a
+        # template value is missing. In this case, template values will be left
+        # as-is in the string. Using `safe_substitute` prevents us raising when
+        # the DB password contains a `$` character.
+        return original_type(template.safe_substitute(template_values))
 
     return templater
 

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/utilities/callables.py

@@ -24,9 +24,7 @@ if HAS_PYDANTIC_V2:
 else:
     import pydantic
 
-from griffe.dataclasses import Docstring
-from griffe.docstrings.dataclasses import DocstringSectionKind
-from griffe.docstrings.parsers import Parser, parse
+from griffe import Docstring, DocstringSectionKind, Parser, parse
 from typing_extensions import Literal
 
 from prefect.exceptions import (

{prefect-client-2.20.1 → prefect_client-2.20.4}/src/prefect/workers/base.py

@@ -981,7 +981,12 @@ class BaseWorker(abc.ABC):
 
         deployment_vars = deployment.job_variables or {}
         flow_run_vars = flow_run.job_variables or {}
-        job_variables = {**deployment_vars, **flow_run_vars}
+        job_variables = {**deployment_vars}
+
+        # merge environment variables carefully, otherwise full override
+        if isinstance(job_variables.get("env"), dict):
+            job_variables["env"].update(flow_run_vars.pop("env", {}))
+        job_variables.update(flow_run_vars)
 
         configuration = await self.job_configuration.from_template_and_values(
             base_job_template=self._work_pool.base_job_template,