prefect-client 2.16.5__tar.gz → 2.16.6__tar.gz

{prefect-client-2.16.5 → prefect-client-2.16.6}/PKG-INFO

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

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/_internal/pydantic/__init__.py

@@ -10,4 +10,4 @@ from pydantic.version import VERSION as PYDANTIC_VERSION
 
 HAS_PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
 
-from ._compat import model_dump, IncEx, model_json_schema
+from ._compat import model_dump, model_json_schema, model_validate, IncEx

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/_internal/pydantic/_compat.py

@@ -178,3 +178,36 @@ def model_json_schema(
         by_alias=by_alias,
         ref_template=ref_template,
     )
+
+
+def model_validate(
+    model: Type[BaseModel],
+    obj: Any,
+    *,
+    strict: bool = False,
+    from_attributes: bool = False,
+    context: Optional[Dict[str, Any]] = None,
+) -> Union[BaseModel, Dict[str, Any]]:
+    """Validate a pydantic model instance.
+
+    Args:
+        obj: The object to validate.
+        strict: Whether to enforce types strictly.
+        from_attributes: Whether to extract data from object attributes.
+        context: Additional context to pass to the validator.
+
+    Raises:
+        ValidationError: If the object could not be validated.
+
+    Returns:
+        The validated model instance.
+    """
+    if is_pydantic_v2_compatible(fn_name="model_validate"):
+        return model.model_validate(
+            obj=obj,
+            strict=strict,
+            from_attributes=from_attributes,
+            context=context,
+        )
+
+    return model.parse_obj(obj)

prefect-client-2.16.6/src/prefect/_internal/pydantic/v1_schema.py

@@ -0,0 +1,48 @@
+import inspect
+import typing
+
+from prefect._internal.pydantic import HAS_PYDANTIC_V2
+
+if HAS_PYDANTIC_V2:
+    from pydantic.v1 import BaseModel as V1BaseModel
+else:
+    from pydantic import BaseModel as V1BaseModel
+
+
+def is_v1_model(v) -> bool:
+    if isinstance(v, V1BaseModel):
+        return True
+    try:
+        if inspect.isclass(v) and issubclass(v, V1BaseModel):
+            return True
+    except TypeError:
+        pass
+
+    return False
+
+
+def is_v1_type(v) -> bool:
+    if HAS_PYDANTIC_V2:
+        if is_v1_model(v):
+            return True
+
+        try:
+            return v.__module__.startswith("pydantic.v1.types")
+        except AttributeError:
+            return False
+
+    return True
+
+
+def has_v1_type_as_param(signature: inspect.Signature) -> bool:
+    parameters = signature.parameters.values()
+    for p in parameters:
+        # check if this parameter is a v1 model
+        if is_v1_type(p.annotation):
+            return True
+
+        # check if this parameter is a collection of types
+        for v in typing.get_args(p.annotation):
+            if is_v1_type(v):
+                return True
+    return False

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/_internal/pydantic/v2_schema.py

@@ -7,7 +7,7 @@ import typing as t
 import pendulum
 import pydantic
 from pydantic import BaseModel as V2BaseModel
-from pydantic import ConfigDict, create_model
+from pydantic import ConfigDict, PydanticUndefinedAnnotation, create_model
 from pydantic.type_adapter import TypeAdapter
 
 from prefect._internal.pydantic.annotations.pendulum import (
@@ -106,7 +106,11 @@ def create_v2_schema(
     model = create_model(
         name_, __config__=model_cfg, __base__=model_base, **model_fields
     )
-    adapter = TypeAdapter(model)
+    try:
+        adapter = TypeAdapter(model)
+    except PydanticUndefinedAnnotation as exc:
+        # in v1 this raises a TypeError, which is handled by parameter_schema
+        raise TypeError(exc.message)
 
     # root model references under #definitions
     schema = adapter.json_schema(

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/client/cloud.py

@@ -85,7 +85,10 @@ class CloudClient:
             await self.read_workspaces()
 
     async def read_workspaces(self) -> List[Workspace]:
-        return pydantic.parse_obj_as(List[Workspace], await self.get("/me/workspaces"))
+        workspaces = pydantic.parse_obj_as(
+            List[Workspace], await self.get("/me/workspaces")
+        )
+        return workspaces
 
     async def read_worker_metadata(self) -> Dict[str, Any]:
         configured_url = prefect.settings.PREFECT_API_URL.value()

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/settings.py

@@ -1235,7 +1235,7 @@ Note this setting only applies when calling `prefect server start`; if hosting t
 API with another tool you will need to configure this there instead.
 """
 
-PREFECT_SERVER_CSRF_PROTECTION_ENABLED = Setting(bool, default=False)
+PREFECT_SERVER_CSRF_PROTECTION_ENABLED = Setting(bool, default=True)
 """
 Controls the activation of CSRF protection for the Prefect server API.
 

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/utilities/callables.py

@@ -9,13 +9,13 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple
 import cloudpickle
 
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
+from prefect._internal.pydantic.v1_schema import has_v1_type_as_param
 
 if HAS_PYDANTIC_V2:
     import pydantic.v1 as pydantic
 
     from prefect._internal.pydantic.v2_schema import (
         create_v2_schema,
-        has_v2_type_as_param,
         process_v2_params,
     )
 else:
@@ -325,7 +325,7 @@ def parameter_schema(fn: Callable) -> ParameterSchema:
     class ModelConfig:
         arbitrary_types_allowed = True
 
-    if HAS_PYDANTIC_V2 and has_v2_type_as_param(signature):
+    if HAS_PYDANTIC_V2 and not has_v1_type_as_param(signature):
         create_schema = create_v2_schema
         process_params = process_v2_params
     else:

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect/utilities/schema_tools/hydration.py

@@ -149,9 +149,13 @@ def null_handler(obj: Dict, ctx: HydrationContext):
 @handler("json")
 def json_handler(obj: Dict, ctx: HydrationContext):
     if "value" in obj:
+        if isinstance(obj["value"], dict):
+            dehydrated_json = _hydrate(obj["value"], ctx)
+        else:
+            dehydrated_json = obj["value"]
         try:
-            return json.loads(obj["value"])
-        except json.decoder.JSONDecodeError as e:
+            return json.loads(dehydrated_json)
+        except (json.decoder.JSONDecodeError, TypeError) as e:
             return InvalidJSON(detail=str(e))
     else:
         # If `value` is not in the object, we need special handling to help
@@ -166,11 +170,15 @@ def json_handler(obj: Dict, ctx: HydrationContext):
 @handler("workspace_variable")
 def workspace_variable_handler(obj: Dict, ctx: HydrationContext):
     if "variable_name" in obj:
-        variable = obj["variable_name"]
-        if variable in ctx.workspace_variables:
-            return ctx.workspace_variables[variable]
+        if isinstance(obj["variable_name"], dict):
+            dehydrated_variable = _hydrate(obj["variable_name"], ctx)
+        else:
+            dehydrated_variable = obj["variable_name"]
+
+        if dehydrated_variable in ctx.workspace_variables:
+            return ctx.workspace_variables[dehydrated_variable]
         else:
-            return WorkspaceVariableNotFound(detail=variable)
+            return WorkspaceVariableNotFound(detail=dehydrated_variable)
     else:
         # Special handling if `variable_name` is not in the object.
         # If an object looks like {"__prefect_kind": "workspace_variable"}

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect_client.egg-info/PKG-INFO

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

{prefect-client-2.16.5 → prefect-client-2.16.6}/src/prefect_client.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ src/prefect/_internal/concurrency/waiters.py
 src/prefect/_internal/pydantic/__init__.py
 src/prefect/_internal/pydantic/_compat.py
 src/prefect/_internal/pydantic/schemas.py
+src/prefect/_internal/pydantic/v1_schema.py
 src/prefect/_internal/pydantic/v2_schema.py
 src/prefect/_internal/pydantic/v2_validated_func.py
 src/prefect/_internal/pydantic/annotations/__init__.py