prefect-client 3.4.1.dev2__tar.gz → 3.4.1.dev4__tar.gz

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.4.1.dev2
+Version: 3.4.1.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.1.dev4/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.1.dev4"
+__build_date__ = "2025-05-07 08:09:04.443127+00:00"
+__git_commit__ = "15e90f75877628d769414cb3382d3aa5b30b50a5"
+__dirty__ = False

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/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_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/src/prefect/_internal/schemas/validators.py

@@ -38,6 +38,7 @@ 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_]*$"
+SLUG_REGEX = "^[a-z0-9]+([_-]+[a-z0-9]+)*$"
 
 
 @overload
@@ -647,7 +648,10 @@ 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")
+        if not bool(re.match(SLUG_REGEX, value)):
+            raise ValueError(
+                "Variable name must only contain lowercase letters, numbers, dashes, and underscores"
+            )
     return value
 
 

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/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_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/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

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/src/prefect/runner/runner.py

@@ -89,9 +89,9 @@ from prefect.client.schemas.objects import (
 )
 from prefect.client.schemas.objects import Flow as APIFlow
 from prefect.events import DeploymentTriggerTypes, TriggerTypes
+from prefect.events.clients import EventsClient, get_events_client
 from prefect.events.related import tags_as_related_resources
-from prefect.events.schemas.events import RelatedResource
-from prefect.events.utilities import emit_event
+from prefect.events.schemas.events import Event, RelatedResource, Resource
 from prefect.exceptions import Abort, ObjectNotFound
 from prefect.flows import Flow, FlowStateHook, load_flow_from_flow_run
 from prefect.logging.loggers import PrefectLogAdapter, flow_run_logger, get_logger
@@ -224,6 +224,7 @@ class Runner:
         if self.heartbeat_seconds is not None and self.heartbeat_seconds < 30:
             raise ValueError("Heartbeat must be 30 seconds or greater.")
         self._heartbeat_task: asyncio.Task[None] | None = None
+        self._events_client: EventsClient = get_events_client(checkpoint_every=1)
 
         self._exit_stack = AsyncExitStack()
         self._limiter: anyio.CapacityLimiter | None = None
@@ -1005,7 +1006,7 @@ class Runner:
             )
 
             flow, deployment = await self._get_flow_and_deployment(flow_run)
-            self._emit_flow_run_cancelled_event(
+            await self._emit_flow_run_cancelled_event(
                 flow_run=flow_run, flow=flow, deployment=deployment
             )
             run_logger.info(f"Cancelled flow run '{flow_run.name}'!")
@@ -1064,14 +1065,18 @@ class Runner:
         related = [RelatedResource.model_validate(r) for r in related]
         related += tags_as_related_resources(set(tags))
 
-        emit_event(
-            event="prefect.flow-run.heartbeat",
-            resource={
-                "prefect.resource.id": f"prefect.flow-run.{flow_run.id}",
-                "prefect.resource.name": flow_run.name,
-                "prefect.version": __version__,
-            },
-            related=related,
+        await self._events_client.emit(
+            Event(
+                event="prefect.flow-run.heartbeat",
+                resource=Resource(
+                    {
+                        "prefect.resource.id": f"prefect.flow-run.{flow_run.id}",
+                        "prefect.resource.name": flow_run.name,
+                        "prefect.version": __version__,
+                    }
+                ),
+                related=related,
+            )
         )
 
     def _event_resource(self):
@@ -1083,7 +1088,7 @@ class Runner:
             "prefect.version": __version__,
         }
 
-    def _emit_flow_run_cancelled_event(
+    async def _emit_flow_run_cancelled_event(
         self,
         flow_run: "FlowRun",
         flow: "Optional[APIFlow]",
@@ -1118,10 +1123,12 @@ class Runner:
         related = [RelatedResource.model_validate(r) for r in related]
         related += tags_as_related_resources(set(tags))
 
-        emit_event(
-            event="prefect.runner.cancelled-flow-run",
-            resource=self._event_resource(),
-            related=related,
+        await self._events_client.emit(
+            Event(
+                event="prefect.runner.cancelled-flow-run",
+                resource=Resource(self._event_resource()),
+                related=related,
+            )
         )
         self._logger.debug(f"Emitted flow run heartbeat event for {flow_run.id}")
 
@@ -1502,6 +1509,7 @@ class Runner:
             )
         )
         await self._exit_stack.enter_async_context(self._client)
+        await self._exit_stack.enter_async_context(self._events_client)
 
         if not hasattr(self, "_runs_task_group") or not self._runs_task_group:
             self._runs_task_group: anyio.abc.TaskGroup = anyio.create_task_group()

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/src/prefect/utilities/dockerutils.py

@@ -495,10 +495,11 @@ def parse_image_tag(name: str) -> tuple[str, Optional[str]]:
     """
     Parse Docker Image String
 
-    - If a tag exists, this function parses and returns the image registry and tag,
+    - If a tag or digest exists, this function parses and returns the image registry and tag/digest,
       separately as a tuple.
       - Example 1: 'prefecthq/prefect:latest' -> ('prefecthq/prefect', 'latest')
       - Example 2: 'hostname.io:5050/folder/subfolder:latest' -> ('hostname.io:5050/folder/subfolder', 'latest')
+      - Example 3: 'prefecthq/prefect@sha256:abc123' -> ('prefecthq/prefect', 'sha256:abc123')
     - Supports parsing Docker Image strings that follow Docker Image Specification v1.1.0
       - Image building tools typically enforce this standard
 
@@ -506,26 +507,35 @@ def parse_image_tag(name: str) -> tuple[str, Optional[str]]:
         name (str): Name of Docker Image
 
     Return:
-        tuple: image registry, image tag
+        tuple: image registry, image tag/digest
     """
     tag = None
     name_parts = name.split("/")
-    # First handles the simplest image names (DockerHub-based, index-free, potentionally with a tag)
-    # - Example: simplename:latest
+
+    # First handles the simplest image names (DockerHub-based, index-free, potentially with a tag or digest)
+    # - Example: simplename:latest or simplename@sha256:abc123
     if len(name_parts) == 1:
-        if ":" in name_parts[0]:
+        if "@" in name_parts[0]:
+            image_name, tag = name_parts[0].split("@")
+        elif ":" in name_parts[0]:
             image_name, tag = name_parts[0].split(":")
+
         else:
             image_name = name_parts[0]
     else:
         # 1. Separates index (hostname.io or prefecthq) from path:tag (folder/subfolder:latest or prefect:latest)
-        # 2. Separates path and tag (if tag exists)
-        # 3. Reunites index and path (without tag) as image name
+        # 2. Separates path and tag/digest (if exists)
+        # 3. Reunites index and path (without tag/digest) as image name
         index_name = name_parts[0]
         image_path = "/".join(name_parts[1:])
-        if ":" in image_path:
+
+        if "@" in image_path:
+            image_path, tag = image_path.split("@")
+        elif ":" in image_path:
             image_path, tag = image_path.split(":")
+
         image_name = f"{index_name}/{image_path}"
+
     return image_name, tag
 
 

{prefect_client-3.4.1.dev2 → prefect_client-3.4.1.dev4}/src/prefect/utilities/importtools.py

@@ -145,17 +145,19 @@ def import_object(import_path: str) -> Any:
     - module.object
     - module:object
     - /path/to/script.py:object
+    - module:object.method
+    - /path/to/script.py:object.method
 
     This function is not thread safe as it modifies the 'sys' module during execution.
     """
     if ".py:" in import_path:
-        script_path, object_name = import_path.rsplit(":", 1)
+        script_path, object_path = import_path.rsplit(":", 1)
         module = load_script_as_module(script_path)
     else:
         if ":" in import_path:
-            module_name, object_name = import_path.rsplit(":", 1)
+            module_name, object_path = import_path.rsplit(":", 1)
         elif "." in import_path:
-            module_name, object_name = import_path.rsplit(".", 1)
+            module_name, object_path = import_path.rsplit(".", 1)
         else:
             raise ValueError(
                 f"Invalid format for object import. Received {import_path!r}."
@@ -163,7 +165,13 @@ def import_object(import_path: str) -> Any:
 
         module = load_module(module_name)
 
-    return getattr(module, object_name)
+    # Handle nested object/method access
+    parts = object_path.split(".")
+    obj = module
+    for part in parts:
+        obj = getattr(obj, part)
+
+    return obj
 
 
 class DelayedImportErrorModule(ModuleType):

prefect_client-3.4.1.dev2/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.1.dev2"
-__build_date__ = "2025-05-05 08:08:58.760597+00:00"
-__git_commit__ = "c158d3eb6aae366fd814ba55c9151ca73ca1666a"
-__dirty__ = False