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

{prefect_client-2.20.2/src/prefect_client.egg-info → prefect_client-2.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.2
+Version: 2.20.4
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -31,11 +31,11 @@ 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<0.48.0,>=0.20.0
+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.2.0,>=6.1.3
+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
@@ -56,7 +56,7 @@ 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<13.0,>=10.4
+Requires-Dist: websockets<14.0,>=10.4
 Requires-Dist: itsdangerous
 Requires-Dist: python-multipart>=0.0.7
 Provides-Extra: notifications

{prefect_client-2.20.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → prefect_client-2.20.4/src/prefect_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.2
+Version: 2.20.4
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -31,11 +31,11 @@ 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<0.48.0,>=0.20.0
+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.2.0,>=6.1.3
+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
@@ -56,7 +56,7 @@ 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<13.0,>=10.4
+Requires-Dist: websockets<14.0,>=10.4
 Requires-Dist: itsdangerous
 Requires-Dist: python-multipart>=0.0.7
 Provides-Extra: notifications

{prefect_client-2.20.2 → prefect_client-2.20.4}/src/prefect_client.egg-info/requires.txt

@@ -7,10 +7,10 @@ croniter<3.0.0,>=1.0.12
 fsspec>=2022.5.0
 exceptiongroup>=1.2.1
 graphviz>=0.20.1
-griffe<0.48.0,>=0.20.0
+griffe<2.0.0,>=0.49.0
 httpcore<2.0.0,>=1.0.5
 httpx[http2]!=0.23.2,>=0.23
-importlib-resources<6.2.0,>=6.1.3
+importlib-resources<6.5.0,>=6.1.3
 jsonpatch<2.0,>=1.32
 jsonschema<5.0.0,>=4.0.0
 orjson<4.0,>=3.7
@@ -29,7 +29,7 @@ toml>=0.10.0
 typing_extensions<5.0.0,>=4.5.0
 ujson<6.0.0,>=5.8.0
 uvicorn!=0.29.0,>=0.14.0
-websockets<13.0,>=10.4
+websockets<14.0,>=10.4
 itsdangerous
 python-multipart>=0.0.7
 

{prefect_client-2.20.2 → prefect_client-2.20.4}/tests/test_flows.py

@@ -2830,6 +2830,20 @@ class TestFlowHooksOnFailure:
         assert state.type == StateType.FAILED
         assert my_mock.call_args_list == [call(), call()]
 
+    def test_on_failure_hooks_run_on_bad_parameters(self):
+        my_mock = MagicMock()
+
+        def failure_hook(flow, flow_run, state):
+            my_mock("failure_hook")
+
+        @flow(on_failure=[failure_hook])
+        def my_flow(x: int):
+            pass
+
+        state = my_flow(x="x", return_state=True)
+        assert state.type == StateType.FAILED
+        assert my_mock.call_args_list == [call("failure_hook")]
+
 
 class TestFlowHooksOnCancellation:
     def test_noniterable_hook_raises(self):