prefect-client 2.20.13__tar.gz → 2.20.15__tar.gz

{prefect_client-2.20.13/src/prefect_client.egg-info → prefect_client-2.20.15}/PKG-INFO

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

{prefect_client-2.20.13 → prefect_client-2.20.15}/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.13 → prefect_client-2.20.15}/src/prefect/workers/base.py

@@ -132,7 +132,7 @@ class BaseJobConfiguration(BaseModel):
         Important: this method expects that the base_job_template was already
         validated server-side.
         """
-        job_config: Dict[str, Any] = base_job_template["job_configuration"]
+        base_config: Dict[str, Any] = base_job_template["job_configuration"]
         variables_schema = base_job_template["variables"]
         variables = cls._get_base_config_defaults(
             variables_schema.get("properties", {})
@@ -141,17 +141,17 @@ class BaseJobConfiguration(BaseModel):
         # copy variable defaults for `env` to job config before they're replaced by
         # deployment overrides
         if variables.get("env"):
-            job_config["env"] = variables.get("env")
+            base_config["env"] = variables.get("env")
 
         variables.update(values)
 
         # deep merge `env`
-        if isinstance(job_config.get("env"), dict) and (
-            hardcoded_env := variables.get("env")
+        if isinstance(base_config.get("env"), dict) and (
+            deployment_env := variables.get("env")
         ):
-            job_config["env"] = {**hardcoded_env, **job_config.get("env", {})}
+            base_config["env"] = {**base_config.get("env", {}), **deployment_env}
 
-        populated_configuration = apply_values(template=job_config, values=variables)
+        populated_configuration = apply_values(template=base_config, values=variables)
         populated_configuration = await resolve_block_document_references(
             template=populated_configuration, client=client
         )

{prefect_client-2.20.13 → prefect_client-2.20.15/src/prefect_client.egg-info}/PKG-INFO

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

{prefect_client-2.20.13 → prefect_client-2.20.15}/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):