prefect-client 2.20.14__tar.gz → 2.20.16__tar.gz

{prefect_client-2.20.14/src/prefect_client.egg-info → prefect_client-2.20.16}/PKG-INFO

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

{prefect_client-2.20.14 → prefect_client-2.20.16}/requirements.txt

@@ -16,4 +16,4 @@ kubernetes >= 24.2.0, < 32.0.0
 pytz >= 2021.1, < 2025
 readchar >= 4.0.0, < 5.0.0
 sqlalchemy[asyncio] >= 1.4.22, != 1.4.33, < 2.0.36
-typer >= 0.12.0, != 0.12.2, < 0.14.0
+typer >= 0.12.0, != 0.12.2, < 0.16.0

{prefect_client-2.20.14 → prefect_client-2.20.16}/src/prefect/client/orchestration.py

@@ -1,5 +1,6 @@
 import asyncio
 import datetime
+import ssl
 import warnings
 from contextlib import AsyncExitStack
 from typing import (
@@ -275,12 +276,18 @@ class PrefectClient:
         httpx_settings.setdefault("headers", {})
 
         if PREFECT_API_TLS_INSECURE_SKIP_VERIFY:
-            httpx_settings.setdefault("verify", False)
+            # Create an unverified context for insecure connections
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+            httpx_settings.setdefault("verify", ctx)
         else:
             cert_file = PREFECT_API_SSL_CERT_FILE.value()
             if not cert_file:
                 cert_file = certifi.where()
-            httpx_settings.setdefault("verify", cert_file)
+            # Create a verified context with the certificate file
+            ctx = ssl.create_default_context(cafile=cert_file)
+            httpx_settings.setdefault("verify", ctx)
 
         if api_version is None:
             api_version = SERVER_API_VERSION
@@ -492,6 +499,23 @@ class PrefectClient:
         response = await self._client.get(f"/flows/{flow_id}")
         return Flow.parse_obj(response.json())
 
+    async def delete_flow(self, flow_id: UUID) -> None:
+        """
+        Delete a flow by UUID.
+        Args:
+            flow_id: ID of the flow to be deleted
+        Raises:
+            prefect.exceptions.ObjectNotFound: If request returns 404
+            httpx.RequestError: If requests fails
+        """
+        try:
+            await self._client.delete(f"/flows/{flow_id}")
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code == status.HTTP_404_NOT_FOUND:
+                raise prefect.exceptions.ObjectNotFound(http_exc=e) from e
+            else:
+                raise
+
     async def read_flows(
         self,
         *,
@@ -3438,11 +3462,19 @@ class SyncPrefectClient:
 
         if PREFECT_API_TLS_INSECURE_SKIP_VERIFY:
             httpx_settings.setdefault("verify", False)
+            # Create an unverified context for insecure connections
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+            httpx_settings.setdefault("verify", ctx)
         else:
             cert_file = PREFECT_API_SSL_CERT_FILE.value()
             if not cert_file:
                 cert_file = certifi.where()
             httpx_settings.setdefault("verify", cert_file)
+            # Create a verified context with the certificate file
+            ctx = ssl.create_default_context(cafile=cert_file)
+            httpx_settings.setdefault("verify", ctx)
 
         if api_version is None:
             api_version = SERVER_API_VERSION

{prefect_client-2.20.14 → prefect_client-2.20.16}/src/prefect/client/schemas/objects.py

@@ -410,6 +410,9 @@ class FlowRunPolicy(PrefectBaseModel):
     resuming: Optional[bool] = Field(
         default=False, description="Indicates if this run is resuming from a pause."
     )
+    retry_type: Optional[Literal["in_process", "reschedule"]] = Field(
+        default=None, description="The type of retry this run is undergoing."
+    )
 
     @root_validator
     def populate_deprecated_fields(cls, values):

{prefect_client-2.20.14 → prefect_client-2.20.16}/src/prefect/flows.py

@@ -10,6 +10,7 @@ import datetime
 import importlib.util
 import inspect
 import os
+import sys
 import tempfile
 import warnings
 from functools import partial, update_wrapper
@@ -137,6 +138,16 @@ logger = get_logger("flows")
 if TYPE_CHECKING:
     from prefect.deployments.runner import FlexibleScheduleList, RunnerDeployment
 
+# Handle Python 3.8 compatibility for GenericAlias
+if sys.version_info >= (3, 9):
+    from types import GenericAlias  # novermin
+
+    GENERIC_ALIAS = (GenericAlias,)
+else:
+    from typing import _GenericAlias
+
+    GENERIC_ALIAS = (_GenericAlias,)
+
 
 @PrefectObjectRegistry.register_instances
 class Flow(Generic[P, R]):
@@ -530,18 +541,22 @@ class Flow(Generic[P, R]):
                 is_v1_type(param.annotation) for param in sig.parameters.values()
             )
             has_v1_models = any(
-                issubclass(param.annotation, V1BaseModel)
-                if isinstance(param.annotation, type)
-                else False
+                (
+                    isinstance(param.annotation, type)
+                    and not isinstance(param.annotation, GENERIC_ALIAS)
+                    and issubclass(param.annotation, V1BaseModel)
+                )
                 for param in sig.parameters.values()
             )
             has_v2_types = any(
                 is_v2_type(param.annotation) for param in sig.parameters.values()
             )
             has_v2_models = any(
-                issubclass(param.annotation, V2BaseModel)
-                if isinstance(param.annotation, type)
-                else False
+                (
+                    isinstance(param.annotation, type)
+                    and not isinstance(param.annotation, GENERIC_ALIAS)
+                    and issubclass(param.annotation, V2BaseModel)
+                )
                 for param in sig.parameters.values()
             )
 
@@ -1601,7 +1616,9 @@ flow.from_source = Flow.from_source
 
 
 def select_flow(
-    flows: Iterable[Flow], flow_name: str = None, from_message: str = None
+    flows: Iterable[Flow],
+    flow_name: Optional[str] = None,
+    from_message: Optional[str] = None,
 ) -> Flow:
     """
     Select the only flow in an iterable or a flow specified by name.

{prefect_client-2.20.14 → prefect_client-2.20.16}/src/prefect/tasks.py

@@ -342,6 +342,10 @@ class Task(Generic[P, R]):
 
         if callable(retry_delay_seconds):
             self.retry_delay_seconds = retry_delay_seconds(retries)
+        elif not isinstance(retry_delay_seconds, (list, int, float, type(None))):
+            raise TypeError(
+                f"Invalid `retry_delay_seconds` provided; must be an int, float, list or callable. Received type {type(retry_delay_seconds)}"
+            )
         else:
             self.retry_delay_seconds = retry_delay_seconds
 

{prefect_client-2.20.14 → prefect_client-2.20.16/src/prefect_client.egg-info}/PKG-INFO

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

{prefect_client-2.20.14 → prefect_client-2.20.16}/tests/test_deployments.py

@@ -937,7 +937,7 @@ class TestDeploymentApply:
         ):
             assert get_client().server_type.supports_automations()
 
-            with respx.mock(base_url=PREFECT_API_URL.value()) as router:
+            with respx.mock(base_url=PREFECT_API_URL.value(), using="httpx") as router:
                 router.post("/flows/").mock(
                     return_value=httpx.Response(201, json={"id": str(uuid4())})
                 )
@@ -989,7 +989,7 @@ class TestDeploymentApply:
         ):
             assert get_client().server_type.supports_automations()
 
-            with respx.mock(base_url=PREFECT_API_URL.value()) as router:
+            with respx.mock(base_url=PREFECT_API_URL.value(), using="httpx") as router:
                 router.post("/flows/").mock(
                     return_value=httpx.Response(201, json={"id": str(uuid4())})
                 )
@@ -1036,7 +1036,8 @@ class TestDeploymentApply:
         assert not get_client().server_type.supports_automations()
 
         with respx.mock(
-            base_url=PREFECT_API_URL.value(), assert_all_called=False
+            assert_all_mocked=False,
+            assert_all_called=False,
         ) as router:
             router.post("/flows/").mock(
                 return_value=httpx.Response(201, json={"id": str(uuid4())})
@@ -1084,7 +1085,7 @@ class TestDeploymentApply:
         }
 
         with temporary_settings(updates=updates):
-            with respx.mock(base_url=PREFECT_API_URL.value()) as router:
+            with respx.mock(base_url=PREFECT_API_URL.value(), using="httpx") as router:
                 router.post("/flows/").mock(
                     return_value=httpx.Response(201, json={"id": str(uuid4())})
                 )
@@ -1169,6 +1170,7 @@ class TestRunDeployment:
         with respx.mock(
             base_url=PREFECT_API_URL.value(),
             assert_all_mocked=True,
+            using="httpx",
         ) as router:
             poll_responses = [
                 Response(
@@ -1217,6 +1219,7 @@ class TestRunDeployment:
         async with respx.mock(
             base_url=PREFECT_API_URL.value(),
             assert_all_mocked=True,
+            using="httpx",
         ) as router:
             poll_responses = [
                 Response(
@@ -1330,7 +1333,7 @@ class TestRunDeployment:
         }
 
         with respx.mock(
-            base_url=PREFECT_API_URL.value(), assert_all_mocked=True
+            base_url=PREFECT_API_URL.value(), assert_all_mocked=True, using="httpx"
         ) as router:
             router.get("/csrf-token", params={"client": mock.ANY}).pass_through()
             router.get(f"/deployments/name/{d.flow_name}/{d.name}").pass_through()
@@ -1365,6 +1368,7 @@ class TestRunDeployment:
             base_url=PREFECT_API_URL.value(),
             assert_all_mocked=True,
             assert_all_called=False,
+            using="httpx",
         ) as router:
             router.get("/csrf-token", params={"client": mock.ANY}).pass_through()
             router.get(f"/deployments/name/{d.flow_name}/{d.name}").pass_through()
@@ -1410,6 +1414,7 @@ class TestRunDeployment:
             base_url=PREFECT_API_URL.value(),
             assert_all_mocked=True,
             assert_all_called=False,
+            using="httpx",
         ) as router:
             router.get("/csrf-token", params={"client": mock.ANY}).pass_through()
             router.get(f"/deployments/name/{d.flow_name}/{d.name}").pass_through()

{prefect_client-2.20.14 → prefect_client-2.20.16}/tests/test_flows.py

@@ -1517,6 +1517,23 @@ class TestFlowParameterTypes:
             "secret": SecretStr("my secret")
         }
 
+    @pytest.mark.skipif(
+        sys.version_info < (3, 9), reason="Python 3.9+ required for GenericAlias"
+    )
+    def test_flow_signature_can_contain_generic_type_hints(self):
+        """Test that generic type hints like dict[str, str] work correctly
+
+        this is a regression test for https://github.com/PrefectHQ/prefect/issues/16105
+        """
+
+        @flow
+        def my_flow(param: dict[str, str]):  # novermin
+            return param
+
+        test_data = {"foo": "bar"}
+        assert my_flow(test_data) == test_data
+        assert my_flow.validate_parameters({"param": test_data}) == {"param": test_data}
+
 
 class TestSubflowTaskInputs:
     async def test_subflow_with_one_upstream_task_future(self, prefect_client):

{prefect_client-2.20.14 → prefect_client-2.20.16}/tests/test_tasks.py

@@ -3381,6 +3381,21 @@ class TestTaskMap:
 
 
 class TestTaskConstructorValidation:
+    async def test_task_cannot_configure_poorly_typed_retry_delay(self):
+        with pytest.raises(TypeError, match="Invalid"):
+
+            @task(retries=42, retry_delay_seconds=dict(x=4))
+            async def insanity():
+                raise RuntimeError("try again!")
+
+        with pytest.raises(TypeError, match="Invalid"):
+
+            @task(retries=42, retry_delay_seconds=2)
+            async def sanity():
+                raise RuntimeError("try again!")
+
+            more_insanity = sanity.with_options(retry_delay_seconds=dict(x=4))  # noqa: F841
+
     async def test_task_cannot_configure_too_many_custom_retry_delays(self):
         with pytest.raises(ValueError, match="Can not configure more"):