prefect 3.4.1.dev3__tar.gz → 3.4.1.dev5__tar.gz

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/PKG-INFO

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

prefect-3.4.1.dev5/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.1.dev5"
+__build_date__ = "2025-05-08 08:09:47.969062+00:00"
+__git_commit__ = "7e7a18743f5fd0bd4e513ca22c5408e7176390b8"
+__dirty__ = False

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/_experimental/bundles/__init__.py

@@ -30,7 +30,7 @@ def _get_uv_path() -> str:
         import uv
 
         uv_path = uv.find_uv_bin()
-    except (ImportError, ModuleNotFoundError):
+    except (ImportError, ModuleNotFoundError, FileNotFoundError):
         uv_path = "uv"
 
     return uv_path

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/_internal/schemas/validators.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 
 import datetime
 import os
-import re
 import urllib.parse
 import warnings
 from collections.abc import Iterable, Mapping, MutableMapping
@@ -36,59 +35,6 @@ M = TypeVar("M", bound=Mapping[str, Any])
 MM = TypeVar("MM", bound=MutableMapping[str, Any])
 
 
-LOWERCASE_LETTERS_NUMBERS_AND_DASHES_ONLY_REGEX = "^[a-z0-9-]*$"
-LOWERCASE_LETTERS_NUMBERS_AND_UNDERSCORES_REGEX = "^[a-z0-9_]*$"
-
-
-@overload
-def raise_on_name_alphanumeric_dashes_only(
-    value: str, field_name: str = ...
-) -> str: ...
-
-
-@overload
-def raise_on_name_alphanumeric_dashes_only(
-    value: None, field_name: str = ...
-) -> None: ...
-
-
-def raise_on_name_alphanumeric_dashes_only(
-    value: Optional[str], field_name: str = "value"
-) -> Optional[str]:
-    if value is not None and not bool(
-        re.match(LOWERCASE_LETTERS_NUMBERS_AND_DASHES_ONLY_REGEX, value)
-    ):
-        raise ValueError(
-            f"{field_name} must only contain lowercase letters, numbers, and dashes."
-        )
-    return value
-
-
-@overload
-def raise_on_name_alphanumeric_underscores_only(
-    value: str, field_name: str = ...
-) -> str: ...
-
-
-@overload
-def raise_on_name_alphanumeric_underscores_only(
-    value: None, field_name: str = ...
-) -> None: ...
-
-
-def raise_on_name_alphanumeric_underscores_only(
-    value: Optional[str], field_name: str = "value"
-) -> Optional[str]:
-    if value is not None and not re.match(
-        LOWERCASE_LETTERS_NUMBERS_AND_UNDERSCORES_REGEX, value
-    ):
-        raise ValueError(
-            f"{field_name} must only contain lowercase letters, numbers, and"
-            " underscores."
-        )
-    return value
-
-
 def validate_values_conform_to_schema(
     values: Optional[Mapping[str, Any]],
     schema: Optional[Mapping[str, Any]],
@@ -610,47 +556,3 @@ def validate_working_dir(v: Optional[Path | str]) -> Optional[Path]:
     if isinstance(v, str):
         return relative_path_to_current_platform(v)
     return v
-
-
-### UNCATEGORIZED VALIDATORS ###
-
-# the above categories seem to be getting a bit unwieldy, so this is a temporary
-# catch-all for validators until we organize these into files
-
-
-@overload
-def validate_block_document_name(value: str) -> str: ...
-
-
-@overload
-def validate_block_document_name(value: None) -> None: ...
-
-
-def validate_block_document_name(value: Optional[str]) -> Optional[str]:
-    if value is not None:
-        raise_on_name_alphanumeric_dashes_only(value, field_name="Block document name")
-    return value
-
-
-def validate_artifact_key(value: str) -> str:
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Artifact key")
-    return value
-
-
-@overload
-def validate_variable_name(value: str) -> str: ...
-
-
-@overload
-def validate_variable_name(value: None) -> None: ...
-
-
-def validate_variable_name(value: Optional[str]) -> Optional[str]:
-    if value is not None:
-        raise_on_name_alphanumeric_underscores_only(value, field_name="Variable name")
-    return value
-
-
-def validate_block_type_slug(value: str):
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Block type slug")
-    return value

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/cli/work_pool.py

@@ -980,14 +980,14 @@ async def gcs(
                             "prefect_gcp.experimental.bundles.upload": {
                                 "requires": "prefect-gcp",
                                 "bucket": bucket,
-                                "credentials_block_name": credentials_block_name,
+                                "gcp_credentials_block_name": credentials_block_name,
                             }
                         },
                         bundle_execution_step={
                             "prefect_gcp.experimental.bundles.execute": {
                                 "requires": "prefect-gcp",
                                 "bucket": bucket,
-                                "credentials_block_name": credentials_block_name,
+                                "gcp_credentials_block_name": credentials_block_name,
                             }
                         },
                         default_result_storage_block_id=block_document.id,

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/client/schemas/actions.py

@@ -12,12 +12,8 @@ from prefect._internal.schemas.bases import ActionBaseModel
 from prefect._internal.schemas.validators import (
     convert_to_strings,
     remove_old_deployment_fields,
-    validate_artifact_key,
-    validate_block_document_name,
-    validate_block_type_slug,
     validate_name_present_on_nonanonymous_blocks,
     validate_schedule_max_scheduled_runs,
-    validate_variable_name,
 )
 from prefect.client.schemas.objects import (
     StateDetails,
@@ -34,7 +30,6 @@ from prefect.client.schemas.schedules import (
 from prefect.schedules import Schedule
 from prefect.settings import PREFECT_DEPLOYMENT_SCHEDULE_MAX_SCHEDULED_RUNS
 from prefect.types import (
-    MAX_VARIABLE_NAME_LENGTH,
     DateTime,
     KeyValueLabelsField,
     Name,
@@ -45,6 +40,12 @@ from prefect.types import (
     PositiveInteger,
     StrictVariableValue,
 )
+from prefect.types.names import (
+    ArtifactKey,
+    BlockDocumentName,
+    BlockTypeSlug,
+    VariableName,
+)
 from prefect.utilities.collections import visit_collection
 from prefect.utilities.pydantic import get_class_fields_only
 
@@ -216,7 +217,7 @@ class DeploymentCreate(ActionBaseModel):
     flow_id: UUID = Field(..., description="The ID of the flow to deploy.")
     paused: Optional[bool] = Field(default=None)
     schedules: list[DeploymentScheduleCreate] = Field(
-        default_factory=list,
+        default_factory=lambda: [],
         description="A list of schedules for the deployment.",
     )
     concurrency_limit: Optional[int] = Field(
@@ -537,7 +538,7 @@ class SavedSearchCreate(ActionBaseModel):
 
     name: str = Field(default=..., description="The name of the saved search.")
     filters: list[objects.SavedSearchFilter] = Field(
-        default_factory=list, description="The filter set for the saved search."
+        default_factory=lambda: [], description="The filter set for the saved search."
     )
 
 
@@ -585,7 +586,7 @@ class BlockTypeCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block type."""
 
     name: str = Field(default=..., description="A block type's name")
-    slug: str = Field(default=..., description="A block type's slug")
+    slug: BlockTypeSlug = Field(default=..., description="A block type's slug")
     logo_url: Optional[objects.HttpUrl] = Field(
         default=None, description="Web URL for the block type's logo"
     )
@@ -601,9 +602,6 @@ class BlockTypeCreate(ActionBaseModel):
         description="A code snippet demonstrating use of the corresponding block",
     )
 
-    # validators
-    _validate_slug_format = field_validator("slug")(validate_block_type_slug)
-
 
 class BlockTypeUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a block type."""
@@ -638,7 +636,7 @@ class BlockSchemaCreate(ActionBaseModel):
 class BlockDocumentCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block document."""
 
-    name: Optional[Name] = Field(
+    name: Optional[BlockDocumentName] = Field(
         default=None, description="The name of the block document"
     )
     data: dict[str, Any] = Field(
@@ -658,8 +656,6 @@ class BlockDocumentCreate(ActionBaseModel):
         ),
     )
 
-    _validate_name_format = field_validator("name")(validate_block_document_name)
-
     @model_validator(mode="before")
     def validate_name_is_present_if_not_anonymous(
         cls, values: dict[str, Any]
@@ -814,7 +810,7 @@ class WorkQueueUpdate(ActionBaseModel):
 class ArtifactCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create an artifact."""
 
-    key: Optional[str] = Field(default=None)
+    key: Optional[ArtifactKey] = Field(default=None)
     type: Optional[str] = Field(default=None)
     description: Optional[str] = Field(default=None)
     data: Optional[Union[dict[str, Any], Any]] = Field(default=None)
@@ -822,8 +818,6 @@ class ArtifactCreate(ActionBaseModel):
     flow_run_id: Optional[UUID] = Field(default=None)
     task_run_id: Optional[UUID] = Field(default=None)
 
-    _validate_artifact_format = field_validator("key")(validate_artifact_key)
-
 
 class ArtifactUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update an artifact."""
@@ -836,12 +830,7 @@ class ArtifactUpdate(ActionBaseModel):
 class VariableCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a Variable."""
 
-    name: str = Field(
-        default=...,
-        description="The name of the variable",
-        examples=["my_variable"],
-        max_length=MAX_VARIABLE_NAME_LENGTH,
-    )
+    name: VariableName = Field(default=...)
     value: StrictVariableValue = Field(
         default=...,
         description="The value of the variable",
@@ -849,19 +838,11 @@ class VariableCreate(ActionBaseModel):
     )
     tags: Optional[list[str]] = Field(default=None)
 
-    # validators
-    _validate_name_format = field_validator("name")(validate_variable_name)
-
 
 class VariableUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a Variable."""
 
-    name: Optional[str] = Field(
-        default=None,
-        description="The name of the variable",
-        examples=["my_variable"],
-        max_length=MAX_VARIABLE_NAME_LENGTH,
-    )
+    name: Optional[VariableName] = Field(default=None)
     value: StrictVariableValue = Field(
         default=None,
         description="The value of the variable",
@@ -869,9 +850,6 @@ class VariableUpdate(ActionBaseModel):
     )
     tags: Optional[list[str]] = Field(default=None)
 
-    # validators
-    _validate_name_format = field_validator("name")(validate_variable_name)
-
 
 class GlobalConcurrencyLimitCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a global concurrency limit."""

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/client/schemas/objects.py

@@ -19,6 +19,7 @@ from uuid import UUID, uuid4
 
 import orjson
 from pydantic import (
+    AfterValidator,
     ConfigDict,
     Discriminator,
     Field,
@@ -40,9 +41,7 @@ from prefect._internal.schemas.fields import CreatedBy, UpdatedBy
 from prefect._internal.schemas.validators import (
     get_or_create_run_name,
     list_length_50_or_less,
-    raise_on_name_alphanumeric_dashes_only,
     set_run_policy_deprecated_fields,
-    validate_block_document_name,
     validate_default_queue_id_not_none,
     validate_max_metadata_length,
     validate_name_present_on_nonanonymous_blocks,
@@ -61,6 +60,10 @@ from prefect.types import (
     StrictVariableValue,
 )
 from prefect.types._datetime import DateTime, now
+from prefect.types.names import (
+    BlockDocumentName,
+    raise_on_name_alphanumeric_dashes_only,
+)
 from prefect.utilities.asyncutils import run_coro_as_sync
 from prefect.utilities.collections import AutoEnum, visit_collection
 from prefect.utilities.names import generate_slug
@@ -1000,7 +1003,7 @@ class BlockSchema(ObjectBaseModel):
 class BlockDocument(ObjectBaseModel):
     """An ORM representation of a block document."""
 
-    name: Optional[Name] = Field(
+    name: Optional[BlockDocumentName] = Field(
         default=None,
         description=(
             "The block document's name. Not required for anonymous block documents."
@@ -1029,8 +1032,6 @@ class BlockDocument(ObjectBaseModel):
         ),
     )
 
-    _validate_name_format = field_validator("name")(validate_block_document_name)
-
     @model_validator(mode="before")
     @classmethod
     def validate_name_is_present_if_not_anonymous(
@@ -1133,7 +1134,8 @@ class Deployment(ObjectBaseModel):
         default=None, description="The concurrency limit for the deployment."
     )
     schedules: list[DeploymentSchedule] = Field(
-        default_factory=list, description="A list of schedules for the deployment."
+        default_factory=lambda: [],
+        description="A list of schedules for the deployment.",
     )
     job_variables: dict[str, Any] = Field(
         default_factory=dict,
@@ -1219,7 +1221,7 @@ class ConcurrencyLimit(ObjectBaseModel):
     )
     concurrency_limit: int = Field(default=..., description="The concurrency limit.")
     active_slots: list[UUID] = Field(
-        default_factory=list,
+        default_factory=lambda: [],
         description="A list of active run ids using a concurrency slot",
     )
 
@@ -1300,7 +1302,8 @@ class SavedSearch(ObjectBaseModel):
 
     name: str = Field(default=..., description="The name of the saved search.")
     filters: list[SavedSearchFilter] = Field(
-        default_factory=list, description="The filter set for the saved search."
+        default_factory=lambda: [],
+        description="The filter set for the saved search.",
     )
 
 
@@ -1644,7 +1647,9 @@ class Variable(ObjectBaseModel):
 
 class FlowRunInput(ObjectBaseModel):
     flow_run_id: UUID = Field(description="The flow run ID associated with the input.")
-    key: str = Field(description="The key of the input.")
+    key: Annotated[str, AfterValidator(raise_on_name_alphanumeric_dashes_only)] = Field(
+        description="The key of the input."
+    )
     value: str = Field(description="The value of the input.")
     sender: Optional[str] = Field(default=None, description="The sender of the input.")
 
@@ -1658,12 +1663,6 @@ class FlowRunInput(ObjectBaseModel):
         """
         return orjson.loads(self.value)
 
-    @field_validator("key", check_fields=False)
-    @classmethod
-    def validate_name_characters(cls, v: str) -> str:
-        raise_on_name_alphanumeric_dashes_only(v)
-        return v
-
 
 class GlobalConcurrencyLimit(ObjectBaseModel):
     """An ORM representation of a global concurrency limit"""

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/events/clients.py

@@ -251,8 +251,8 @@ class EventsClient(abc.ABC):
 
     async def __aexit__(
         self,
-        exc_type: Optional[Type[Exception]],
-        exc_val: Optional[Exception],
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:
         del self._in_context
@@ -360,8 +360,8 @@ class PrefectEventsClient(EventsClient):
 
     async def __aexit__(
         self,
-        exc_type: Optional[Type[Exception]],
-        exc_val: Optional[Exception],
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:
         self._websocket = None

{prefect-3.4.1.dev3 → prefect-3.4.1.dev5}/src/prefect/flows.py

@@ -27,6 +27,7 @@ from typing import (
     Coroutine,
     Generic,
     Iterable,
+    List,
     NoReturn,
     Optional,
     Protocol,
@@ -2309,8 +2310,9 @@ def load_flow_from_entrypoint(
     Extract a flow object from a script at an entrypoint by running all of the code in the file.
 
     Args:
-        entrypoint: a string in the format `<path_to_script>:<flow_func_name>` or a module path
-            to a flow function
+        entrypoint: a string in the format `<path_to_script>:<flow_func_name>`
+            or a string in the format `<path_to_script>:<class_name>.<flow_method_name>`
+            or a module path to a flow function
         use_placeholder_flow: if True, use a placeholder Flow object if the actual flow object
             cannot be loaded from the entrypoint (e.g. dependencies are missing)
 
@@ -2700,26 +2702,55 @@ def load_placeholder_flow(entrypoint: str, raises: Exception) -> Flow[P, Any]:
 
 def safe_load_flow_from_entrypoint(entrypoint: str) -> Optional[Flow[P, Any]]:
     """
-    Load a flow from an entrypoint and return None if an exception is raised.
+    Safely load a Prefect flow from an entrypoint string. Returns None if loading fails.
 
     Args:
-        entrypoint: a string in the format `<path_to_script>:<flow_func_name>`
-          or a module path to a flow function
+        entrypoint (str): A string identifying the flow to load. Can be in one of the following formats:
+            - `<path_to_script>:<flow_func_name>`
+            - `<path_to_script>:<class_name>.<flow_method_name>`
+            - `<module_path>.<flow_func_name>`
+
+    Returns:
+        Optional[Flow]: The loaded Prefect flow object, or None if loading fails due to errors
+        (e.g. unresolved dependencies, syntax errors, or missing objects).
     """
-    func_def, source_code = _entrypoint_definition_and_source(entrypoint)
-    path = None
-    if ":" in entrypoint:
-        path = entrypoint.rsplit(":")[0]
+    func_or_cls_def, source_code, parts = _entrypoint_definition_and_source(entrypoint)
+
+    path = entrypoint.rsplit(":", maxsplit=1)[0] if ":" in entrypoint else None
     namespace = safe_load_namespace(source_code, filepath=path)
-    if func_def.name in namespace:
-        return namespace[func_def.name]
-    else:
-        # If the function is not in the namespace, if may be due to missing dependencies
-        # for the function. We will attempt to compile each annotation and default value
-        # and remove them from the function definition to see if the function can be
-        # compiled without them.
 
-        return _sanitize_and_load_flow(func_def, namespace)
+    if parts[0] not in namespace:
+        # If the object is not in the namespace, it may be due to missing dependencies
+        # in annotations or default values. We will attempt to sanitize them by removing
+        # anything that cannot be compiled, and then recompile the function or class.
+        if isinstance(func_or_cls_def, (ast.FunctionDef, ast.AsyncFunctionDef)):
+            return _sanitize_and_load_flow(func_or_cls_def, namespace)
+        elif (
+            isinstance(func_or_cls_def, ast.ClassDef)
+            and len(parts) >= 2
+            and func_or_cls_def.name == parts[0]
+        ):
+            method_name = parts[1]
+            method_def = next(
+                (
+                    stmt
+                    for stmt in func_or_cls_def.body
+                    if isinstance(stmt, (ast.FunctionDef, ast.AsyncFunctionDef))
+                    and stmt.name == method_name
+                ),
+                None,
+            )
+            if method_def is not None:
+                return _sanitize_and_load_flow(method_def, namespace)
+        else:
+            return None
+
+    obj = namespace.get(parts[0])
+    for part in parts[1:]:
+        obj = getattr(obj, part, None)
+        if obj is None:
+            return None
+    return obj
 
 
 def _sanitize_and_load_flow(
@@ -2853,7 +2884,7 @@ def load_flow_arguments_from_entrypoint(
           or a module path to a flow function
     """
 
-    func_def, source_code = _entrypoint_definition_and_source(entrypoint)
+    func_def, source_code, _ = _entrypoint_definition_and_source(entrypoint)
     path = None
     if ":" in entrypoint:
         path = entrypoint.rsplit(":")[0]
@@ -2930,26 +2961,45 @@ def is_entrypoint_async(entrypoint: str) -> bool:
     Returns:
         True if the function is asynchronous, False otherwise.
     """
-    func_def, _ = _entrypoint_definition_and_source(entrypoint)
+    func_def, _, _ = _entrypoint_definition_and_source(entrypoint)
     return isinstance(func_def, ast.AsyncFunctionDef)
 
 
 def _entrypoint_definition_and_source(
     entrypoint: str,
-) -> Tuple[Union[ast.FunctionDef, ast.AsyncFunctionDef], str]:
+) -> Tuple[Union[ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef], str, List[str]]:
+    """
+    Resolves and parses the source definition of a given entrypoint.
+
+    The entrypoint can be provided in one of the following formats:
+        - '<path_to_script>:<flow_func_name>'
+        - '<path_to_script>:<class_name>.<flow_method_name>'
+        - '<module_path.to.flow_function>'
+
+    Returns:
+        A tuple containing:
+        - The AST node (FunctionDef, AsyncFunctionDef, or ClassDef) of the base object.
+        - The full source code of the file or module as a string.
+        - A list of attribute access parts from the object path (e.g., ['MyFlowClass', 'run']).
+
+    Raises:
+        ValueError: If the module or target object cannot be found.
+    """
     if ":" in entrypoint:
-        # Split by the last colon once to handle Windows paths with drive letters i.e C:\path\to\file.py:do_stuff
-        path, func_name = entrypoint.rsplit(":", maxsplit=1)
+        path, object_path = entrypoint.rsplit(":", maxsplit=1)
         source_code = Path(path).read_text()
     else:
-        path, func_name = entrypoint.rsplit(".", maxsplit=1)
+        path, object_path = entrypoint.rsplit(".", maxsplit=1)
         spec = importlib.util.find_spec(path)
         if not spec or not spec.origin:
             raise ValueError(f"Could not find module {path!r}")
         source_code = Path(spec.origin).read_text()
 
     parsed_code = ast.parse(source_code)
-    func_def = next(
+    parts = object_path.split(".")
+    base_name = parts[0]
+
+    base_def = next(
         (
             node
             for node in ast.walk(parsed_code)
@@ -2958,14 +3008,15 @@ def _entrypoint_definition_and_source(
                 (
                     ast.FunctionDef,
                     ast.AsyncFunctionDef,
+                    ast.ClassDef,  # flow can be staticmethod/classmethod
                 ),
             )
-            and node.name == func_name
+            and node.name == base_name
         ),
         None,
     )
 
-    if not func_def:
-        raise ValueError(f"Could not find flow {func_name!r} in {path!r}")
+    if not base_def:
+        raise ValueError(f"Could not find object {base_name!r} in {path!r}")
 
-    return func_def, source_code
+    return base_def, source_code, parts