prefect-client 2.18.2__py3-none-any.whl → 2.18.3__py3-none-any.whl

prefect/engine.py

@@ -163,6 +163,7 @@ from prefect.logging.loggers import (
 from prefect.results import ResultFactory, UnknownResult
 from prefect.settings import (
     PREFECT_DEBUG_MODE,
+    PREFECT_EXPERIMENTAL_ENABLE_NEW_ENGINE,
     PREFECT_TASK_INTROSPECTION_WARN_THRESHOLD,
     PREFECT_TASKS_REFRESH_CACHE,
     PREFECT_UI_URL,
@@ -189,6 +190,7 @@ from prefect.utilities.annotations import allow_failure, quote, unmapped
 from prefect.utilities.asyncutils import (
     gather,
     is_async_fn,
+    run_sync,
     sync_compatible,
 )
 from prefect.utilities.callables import (
@@ -2433,7 +2435,21 @@ if __name__ == "__main__":
         exit(1)
 
     try:
-        enter_flow_run_engine_from_subprocess(flow_run_id)
+        if PREFECT_EXPERIMENTAL_ENABLE_NEW_ENGINE.value():
+            from prefect.new_flow_engine import (
+                load_flow_and_flow_run,
+                run_flow,
+                run_flow_sync,
+            )
+
+            flow_run, flow = run_sync(load_flow_and_flow_run)
+            # run the flow
+            if flow.isasync:
+                run_sync(run_flow(flow, flow_run=flow_run))
+            else:
+                run_flow_sync(flow, flow_run=flow_run)
+        else:
+            enter_flow_run_engine_from_subprocess(flow_run_id)
     except Abort as exc:
         engine_logger.info(
             f"Engine execution of flow run '{flow_run_id}' aborted by orchestrator:"

prefect/new_flow_engine.py

@@ -1,5 +1,6 @@
 import asyncio
 import inspect
+import os
 from contextlib import AsyncExitStack, asynccontextmanager, contextmanager
 from dataclasses import dataclass
 from typing import (
@@ -10,22 +11,26 @@ from typing import (
     Iterable,
     Literal,
     Optional,
+    Tuple,
     TypeVar,
     Union,
     cast,
 )
+from uuid import UUID
 
 import anyio
 import anyio._backends._asyncio
 from sniffio import AsyncLibraryNotFoundError
 from typing_extensions import ParamSpec
 
-from prefect import Flow, Task, get_client
+from prefect import Task, get_client
 from prefect.client.orchestration import PrefectClient
 from prefect.client.schemas import FlowRun, TaskRun
 from prefect.client.schemas.filters import FlowRunFilter
 from prefect.client.schemas.sorting import FlowRunSort
 from prefect.context import FlowRunContext
+from prefect.deployments import load_flow_from_flow_run
+from prefect.flows import Flow, load_flow_from_entrypoint
 from prefect.futures import PrefectFuture, resolve_futures_to_states
 from prefect.logging.loggers import flow_run_logger
 from prefect.results import ResultFactory
@@ -49,16 +54,34 @@ P = ParamSpec("P")
 R = TypeVar("R")
 
 
+async def load_flow_and_flow_run(flow_run_id: UUID) -> Tuple[FlowRun, Flow]:
+    ## TODO: add error handling to update state and log tracebacks
+    entrypoint = os.environ.get("PREFECT__FLOW_ENTRYPOINT")
+
+    async with get_client() as client:
+        flow_run = await client.read_flow_run(flow_run_id)
+        flow = (
+            load_flow_from_entrypoint(entrypoint)
+            if entrypoint
+            else await load_flow_from_flow_run(flow_run, client=client)
+        )
+    return flow_run, flow
+
+
 @dataclass
 class FlowRunEngine(Generic[P, R]):
-    flow: Union[Flow[P, R], Flow[P, Coroutine[Any, Any, R]]]
+    flow: Optional[Union[Flow[P, R], Flow[P, Coroutine[Any, Any, R]]]] = None
     parameters: Optional[Dict[str, Any]] = None
     flow_run: Optional[FlowRun] = None
+    flow_run_id: Optional[UUID] = None
     _is_started: bool = False
     _client: Optional[PrefectClient] = None
     short_circuit: bool = False
 
     def __post_init__(self):
+        if self.flow is None and self.flow_run_id is None:
+            raise ValueError("Either a flow or a flow_run_id must be provided.")
+
         if self.parameters is None:
             self.parameters = {}
 
@@ -304,6 +327,18 @@ class FlowRunEngine(Generic[P, R]):
             self._client = client
             self._is_started = True
 
+            # this conditional is engaged whenever a run is triggered via deployment
+            if self.flow_run_id and not self.flow:
+                self.flow_run = await client.read_flow_run(self.flow_run_id)
+                try:
+                    self.flow = await self.load_flow(client)
+                except Exception as exc:
+                    await self.handle_exception(
+                        exc,
+                        msg="Failed to load flow from entrypoint.",
+                    )
+                    self.short_circuit = True
+
             if not self.flow_run:
                 self.flow_run = await self.create_flow_run(client)
 
@@ -373,8 +408,9 @@ class FlowRunEngine(Generic[P, R]):
 
 
 async def run_flow(
-    flow: Flow[P, Coroutine[Any, Any, R]],
+    flow: Optional[Flow[P, Coroutine[Any, Any, R]]] = None,
     flow_run: Optional[FlowRun] = None,
+    flow_run_id: Optional[UUID] = None,
     parameters: Optional[Dict[str, Any]] = None,
     wait_for: Optional[Iterable[PrefectFuture[A, Async]]] = None,
     return_type: Literal["state", "result"] = "result",
@@ -385,7 +421,7 @@ async def run_flow(
     We will most likely want to use this logic as a wrapper and return a coroutine for type inference.
     """
 
-    engine = FlowRunEngine[P, R](flow, parameters, flow_run)
+    engine = FlowRunEngine[P, R](flow, parameters, flow_run, flow_run_id)
 
     # This is a context manager that keeps track of the state of the flow run.
     async with engine.start() as run:

{prefect_client-2.18.2.dist-info → prefect_client-2.18.3.dist-info}/METADATA

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

{prefect_client-2.18.2.dist-info → prefect_client-2.18.3.dist-info}/RECORD

@@ -5,14 +5,14 @@ prefect/agent.py,sha256=HaGT0yh3fciluYpO99dVHo_LHq7N2cYLuWNrEV_kPV8,27789
 prefect/artifacts.py,sha256=mreaBE4qMoXkjc9YI-5cAxoye7ixraHB_zr8GTK9xPU,8694
 prefect/automations.py,sha256=rjVtQblBlKhD_q24bG6zbxJeb_XQJnodMlhr565aZJY,4853
 prefect/context.py,sha256=BMT8VbI5OmQPFll6I5BlP5lZYn8IoxFsuRjjkqu7wK4,18144
-prefect/engine.py,sha256=fzBIleMz7QYM96ENov4t91L3dhrwHcK0AX9a-jL_uOE,89858
+prefect/engine.py,sha256=iDzMZRwB_avmftGVxCJwO4ezW-faLpaoTxeGLWNXqKY,90406
 prefect/exceptions.py,sha256=Fyl-GXvF9OuKHtsyn5EhWg81pkU1UG3DFHsI1JzhOQE,10851
 prefect/filesystems.py,sha256=XniPSdBAqywj43X7GyfuWJQIbz07QJ5Y3cVNLhIF3lQ,35260
 prefect/flow_runs.py,sha256=mFHLavZk1yZ62H3UazuNDBZWAF7AqKttA4rMcHgsVSw,3119
 prefect/flows.py,sha256=eAn4sGqGHG8afpjMIDOwY1xl5CciioYIYB5v8fsrwc0,71253
 prefect/futures.py,sha256=RaWfYIXtH7RsWxQ5QWTTlAzwtVV8XWpXaZT_hLq35vQ,12590
 prefect/manifests.py,sha256=sTM7j8Us5d49zaydYKWsKb7zJ96v1ChkLkLeR0GFYD8,683
-prefect/new_flow_engine.py,sha256=sLIimdG3-Nyg8VVy4ItGe4YRdcq7nj7-3jNhz3rwfkM,16174
+prefect/new_flow_engine.py,sha256=OyKq0ngvQMWajCESfUsTu15mARv3zoM7sC6kP2uBm-w,17649
 prefect/new_task_engine.py,sha256=orLK-RPeJleJ5ID5zKRk-g0TQFtxT_qSTCvOK775pKU,17458
 prefect/plugins.py,sha256=0C-D3-dKi06JZ44XEGmLjCiAkefbE_lKX-g3urzdbQ4,4163
 prefect/profiles.toml,sha256=Fs8hD_BdWHZgAijgk8pK_Zx-Pm-YFixqDIfEP6fM-qU,38
@@ -284,8 +284,8 @@ prefect/workers/block.py,sha256=5bdCuqT-4I-et_8ZLG2y1AODzYiCQwFiivhdt5NMEog,7635
 prefect/workers/process.py,sha256=JkmG-juTiVR6acy1t29NkTdLgp5p5VbBHA-2dCCOdv4,10094
 prefect/workers/server.py,sha256=WVZJxR8nTMzK0ov0BD0xw5OyQpT26AxlXbsGQ1OrxeQ,1551
 prefect/workers/utilities.py,sha256=VfPfAlGtTuDj0-Kb8WlMgAuOfgXCdrGAnKMapPSBrwc,2483
-prefect_client-2.18.2.dist-info/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
-prefect_client-2.18.2.dist-info/METADATA,sha256=3blkjGy7AWMyMJJC4C9GYoO-xKRgbJOgEzIGCo-FkjM,7401
-prefect_client-2.18.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-prefect_client-2.18.2.dist-info/top_level.txt,sha256=MJZYJgFdbRc2woQCeB4vM6T33tr01TmkEhRcns6H_H4,8
-prefect_client-2.18.2.dist-info/RECORD,,
+prefect_client-2.18.3.dist-info/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
+prefect_client-2.18.3.dist-info/METADATA,sha256=OTl_Gv2PvAeIT0Cc0nDWRRxdA16Ro2ZSlEulpPdfu7o,7401
+prefect_client-2.18.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+prefect_client-2.18.3.dist-info/top_level.txt,sha256=MJZYJgFdbRc2woQCeB4vM6T33tr01TmkEhRcns6H_H4,8
+prefect_client-2.18.3.dist-info/RECORD,,