prefect-client 3.4.21.dev3__tar.gz → 3.4.21.dev4__tar.gz

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.4.21.dev3
+Version: 3.4.21.dev4
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

prefect_client-3.4.21.dev4/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.21.dev4"
+__build_date__ = "2025-10-01 08:09:16.922739+00:00"
+__git_commit__ = "80c14743c0c98d4a718fe8fcc93a12f023d88f0b"
+__dirty__ = False

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/src/prefect/_experimental/bundles/__init__.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
 
+import ast
 import asyncio
 import base64
 import gzip
+import importlib
+import inspect
 import json
 import logging
 import multiprocessing
@@ -10,8 +13,10 @@ import multiprocessing.context
 import os
 import subprocess
 import sys
+from contextlib import contextmanager
 from pathlib import Path
 import tempfile
+from types import ModuleType
 from typing import Any, TypedDict
 
 import anyio
@@ -69,6 +74,256 @@ def _deserialize_bundle_object(serialized_obj: str) -> Any:
     return cloudpickle.loads(gzip.decompress(base64.b64decode(serialized_obj)))
 
 
+def _is_local_module(module_name: str, module_path: str | None = None) -> bool:
+    """
+    Check if a module is a local module (not from standard library or site-packages).
+
+    Args:
+        module_name: The name of the module.
+        module_path: Optional path to the module file.
+
+    Returns:
+        True if the module is a local module, False otherwise.
+    """
+    # Skip modules that are known to be problematic or not needed
+    skip_modules = {
+        "__pycache__",
+        # Skip test modules
+        "unittest",
+        "pytest",
+        "test_",
+        "_pytest",
+        # Skip prefect modules - they'll be available on remote
+        "prefect",
+    }
+
+    # Check module name prefixes
+    for skip in skip_modules:
+        if module_name.startswith(skip):
+            return False
+
+    # Check if it's a built-in module
+    if module_name in sys.builtin_module_names:
+        return False
+
+    # Check if it's in the standard library (Python 3.10+)
+    if hasattr(sys, "stdlib_module_names"):
+        # Check both full module name and base module name
+        base_module = module_name.split(".")[0]
+        if (
+            module_name in sys.stdlib_module_names
+            or base_module in sys.stdlib_module_names
+        ):
+            return False
+
+    # If we have the module path, check if it's in site-packages or dist-packages
+    if module_path:
+        path_str = str(module_path)
+        # Also exclude standard library paths
+        if (
+            "site-packages" in path_str
+            or "dist-packages" in path_str
+            or "/lib/python" in path_str
+            or "/.venv/" in path_str
+        ):
+            return False
+    else:
+        # Try to import the module to get its path
+        try:
+            module = importlib.import_module(module_name)
+            if hasattr(module, "__file__") and module.__file__:
+                path_str = str(module.__file__)
+                if (
+                    "site-packages" in path_str
+                    or "dist-packages" in path_str
+                    or "/lib/python" in path_str
+                    or "/.venv/" in path_str
+                ):
+                    return False
+        except (ImportError, AttributeError):
+            # If we can't import it, it's probably not a real module
+            return False
+
+    # Only consider it local if it exists and we can verify it
+    return True
+
+
+def _extract_imports_from_source(source_code: str) -> set[str]:
+    """
+    Extract all import statements from Python source code.
+
+    Args:
+        source_code: The Python source code to analyze.
+
+    Returns:
+        A set of imported module names.
+    """
+    imports: set[str] = set()
+
+    try:
+        tree = ast.parse(source_code)
+    except SyntaxError:
+        logger.debug("Failed to parse source code for import extraction")
+        return imports
+
+    for node in ast.walk(tree):
+        if isinstance(node, ast.Import):
+            for alias in node.names:
+                imports.add(alias.name)
+        elif isinstance(node, ast.ImportFrom):
+            if node.module:
+                imports.add(node.module)
+                # Don't add individual imported items as they might be classes/functions
+                # Only track the module itself
+
+    return imports
+
+
+def _discover_local_dependencies(
+    flow: Flow[Any, Any], visited: set[str] | None = None
+) -> set[str]:
+    """
+    Recursively discover local module dependencies of a flow.
+
+    Args:
+        flow: The flow to analyze.
+        visited: Set of already visited modules to avoid infinite recursion.
+
+    Returns:
+        A set of local module names that should be serialized by value.
+    """
+    if visited is None:
+        visited = set()
+
+    local_modules: set[str] = set()
+
+    # Get the module containing the flow
+    try:
+        flow_module = inspect.getmodule(flow.fn)
+    except (AttributeError, TypeError):
+        # Flow function doesn't have a module (e.g., defined in REPL)
+        return local_modules
+
+    if not flow_module:
+        return local_modules
+
+    module_name = flow_module.__name__
+
+    # Skip if we've already processed this module
+    if module_name in visited:
+        return local_modules
+    visited.add(module_name)
+
+    # Check if the flow's module itself is local
+    module_file = getattr(flow_module, "__file__", None)
+    if not module_file or not _is_local_module(module_name, module_file):
+        return local_modules
+
+    local_modules.add(module_name)
+
+    # Get the source code of the module
+    try:
+        source_code = inspect.getsource(flow_module)
+    except (OSError, TypeError):
+        # Can't get source for the flow's module
+        return local_modules
+
+    imports = _extract_imports_from_source(source_code)
+
+    # Check each import to see if it's local
+    for import_name in imports:
+        # Skip if already visited
+        if import_name in visited:
+            continue
+
+        # Try to resolve the import
+        imported_module = None
+        try:
+            # Handle relative imports by resolving them
+            if module_name and "." in module_name:
+                package = ".".join(module_name.split(".")[:-1])
+                try:
+                    imported_module = importlib.import_module(import_name, package)
+                except ImportError:
+                    imported_module = importlib.import_module(import_name)
+            else:
+                imported_module = importlib.import_module(import_name)
+        except (ImportError, AttributeError):
+            # Can't import or module has no __file__, skip it
+            continue
+
+        imported_file = getattr(imported_module, "__file__", None)
+        if not imported_file or not _is_local_module(import_name, imported_file):
+            continue
+
+        local_modules.add(import_name)
+        visited.add(import_name)
+
+        # Recursively check this module's dependencies
+        try:
+            imported_source = inspect.getsource(imported_module)
+        except (OSError, TypeError):
+            # Can't get source for this module, skip its dependencies
+            continue
+
+        nested_imports = _extract_imports_from_source(imported_source)
+        for nested_import in nested_imports:
+            if nested_import not in visited and _is_local_module(nested_import):
+                local_modules.add(nested_import)
+                visited.add(nested_import)
+
+    return local_modules
+
+
+@contextmanager
+def _pickle_local_modules_by_value(flow: Flow[Any, Any]):
+    """
+    Context manager that registers local modules for pickle-by-value serialization.
+
+    Args:
+        flow: The flow whose dependencies should be registered.
+    """
+    registered_modules: list[ModuleType] = []
+
+    try:
+        # Discover local dependencies
+        local_modules = _discover_local_dependencies(flow)
+        logger.debug("Local modules: %s", local_modules)
+
+        if local_modules:
+            logger.debug(
+                "Registering local modules for pickle-by-value serialization: %s",
+                ", ".join(local_modules),
+            )
+
+        # Register each local module for pickle-by-value
+        for module_name in local_modules:
+            try:
+                module = importlib.import_module(module_name)
+                cloudpickle.register_pickle_by_value(module)  # pyright: ignore[reportUnknownMemberType] Missing stubs
+                registered_modules.append(module)
+            except (ImportError, AttributeError) as e:
+                logger.debug(
+                    "Failed to register module %s for pickle-by-value: %s",
+                    module_name,
+                    e,
+                )
+
+        yield
+
+    finally:
+        # Unregister all modules we registered
+        for module in registered_modules:
+            try:
+                cloudpickle.unregister_pickle_by_value(module)  # pyright: ignore[reportUnknownMemberType] Missing stubs
+            except Exception as e:
+                logger.debug(
+                    "Failed to unregister module %s from pickle-by-value: %s",
+                    getattr(module, "__name__", module),
+                    e,
+                )
+
+
 def create_bundle_for_flow_run(
     flow: Flow[Any, Any],
     flow_run: FlowRun,
@@ -120,12 +375,14 @@ def create_bundle_for_flow_run(
             "\n".join(file_dependencies),
         )
 
-    return {
-        "function": _serialize_bundle_object(flow),
-        "context": _serialize_bundle_object(context),
-        "flow_run": flow_run.model_dump(mode="json"),
-        "dependencies": dependencies,
-    }
+    # Automatically register local modules for pickle-by-value serialization
+    with _pickle_local_modules_by_value(flow):
+        return {
+            "function": _serialize_bundle_object(flow),
+            "context": _serialize_bundle_object(context),
+            "flow_run": flow_run.model_dump(mode="json"),
+            "dependencies": dependencies,
+        }
 
 
 def extract_flow_from_bundle(bundle: SerializedBundle) -> Flow[Any, Any]:

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/src/prefect/settings/models/client.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Dict
+from typing import ClassVar
 
 from pydantic import AliasChoices, AliasPath, Field
 from pydantic_settings import SettingsConfigDict
@@ -7,7 +7,7 @@ from prefect.settings.base import (
     PrefectBaseSettings,
     build_settings_config,
 )
-from prefect.types import ClientRetryExtraCodes
+from prefect.types import ClientRetryExtraCodes, JsonStringOrDict
 
 
 class ClientMetricsSettings(PrefectBaseSettings):
@@ -87,8 +87,7 @@ class ClientSettings(PrefectBaseSettings):
         """,
     )
 
-    # this needs to be typing.Dict for now as dict[str, str] is not compatible with pydantic < 2.11
-    custom_headers: Dict[str, str] = Field(
+    custom_headers: JsonStringOrDict = Field(
         default_factory=dict,
         description="""
         Custom HTTP headers to include with every API request to the Prefect server.

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/src/prefect/settings/models/server/concurrency.py

@@ -1,6 +1,6 @@
 from typing import ClassVar
 
-from pydantic import Field
+from pydantic import AliasChoices, AliasPath, Field
 from pydantic_settings import SettingsConfigDict
 
 from prefect.settings.base import PrefectBaseSettings, build_settings_config
@@ -15,3 +15,14 @@ class ServerConcurrencySettings(PrefectBaseSettings):
         default="prefect.server.concurrency.lease_storage.memory",
         description="The module to use for storing concurrency limit leases.",
     )
+
+    initial_lease_timeout: float = Field(
+        default=300.0,
+        ge=30.0,  # Minimum 30 seconds
+        le=3600.0,  # Maximum 1 hour
+        description="Initial timeout for concurrency lease acquisition in seconds.",
+        validation_alias=AliasChoices(
+            AliasPath("initial_lease_timeout"),
+            "prefect_server_concurrency_initial_lease_timeout",
+        ),
+    )

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/src/prefect/types/__init__.py

@@ -214,12 +214,33 @@ KeyValueLabelsField = Annotated[
 ]
 
 
+def _deserialize_dict_if_string(value: Any) -> dict[str, str]:
+    """
+    Useful when a value is sometimes passed as a string or natively as a dict.
+
+    Example, setting the custom headers via the CLI involves passing a string format of a dict:
+    ```
+    prefect settings set PREFECT_CLIENT_CUSTOM_HEADERS='{"X-Test-Header": "test-value", "Authorization": "Bearer token123"}'
+    ```
+    """
+    if isinstance(value, str):
+        return orjson.loads(value)
+    return value
+
+
+JsonStringOrDict = Annotated[
+    dict[str, str],
+    BeforeValidator(_deserialize_dict_if_string),
+]
+
+
 __all__ = [
     "BANNED_CHARACTERS",
     "WITHOUT_BANNED_CHARACTERS",
     "ClientRetryExtraCodes",
     "Date",
     "DateTime",
+    "JsonStringOrDict",
     "LogLevel",
     "KeyValueLabelsField",
     "MAX_VARIABLE_NAME_LENGTH",

{prefect_client-3.4.21.dev3 → prefect_client-3.4.21.dev4}/src/prefect/utilities/engine.py

@@ -703,6 +703,13 @@ def emit_task_run_state_change_event(
             "prefect.state-type": str(validated_state.type.value),
             "prefect.orchestration": "client",
         },
+        related=[
+            {
+                "prefect.resource.id": f"prefect.tag.{tag}",
+                "prefect.resource.role": "tag",
+            }
+            for tag in sorted(task_run.tags)
+        ],
         follows=follows,
     )
 

prefect_client-3.4.21.dev3/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.21.dev3"
-__build_date__ = "2025-09-30 08:09:39.936874+00:00"
-__git_commit__ = "24acc22aa1f862b7869d80a8af69272175448e11"
-__dirty__ = False