prefect-client 3.0.0rc12__tar.gz → 3.0.0rc13__tar.gz

{prefect-client-3.0.0rc12/src/prefect_client.egg-info → prefect-client-3.0.0rc13}/PKG-INFO

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

{prefect-client-3.0.0rc12 → prefect-client-3.0.0rc13}/src/prefect/events/clients.py

@@ -140,6 +140,11 @@ class AssertingEventsClient(EventsClient):
         cls.last = None
         cls.all = []
 
+    def pop_events(self) -> List[Event]:
+        events = self.events
+        self.events = []
+        return events
+
     async def _emit(self, event: Event) -> None:
         self.events.append(event)
 

{prefect-client-3.0.0rc12 → prefect-client-3.0.0rc13}/src/prefect/settings.py

@@ -1383,11 +1383,6 @@ PREFECT_WORKER_WEBSERVER_PORT = Setting(
 The port the worker's webserver should bind to.
 """
 
-PREFECT_API_SERVICES_TASK_SCHEDULING_ENABLED = Setting(bool, default=True)
-"""
-Whether or not to start the task scheduling service in the server application.
-"""
-
 PREFECT_TASK_SCHEDULING_DEFAULT_STORAGE_BLOCK = Setting(Optional[str], default=None)
 """The `block-type/block-document` slug of a block to use as the default storage
 for autonomous tasks."""

{prefect-client-3.0.0rc12 → prefect-client-3.0.0rc13}/src/prefect/task_engine.py

@@ -577,19 +577,23 @@ class TaskRunEngine(Generic[P, R]):
                 self._client = client_ctx.sync_client
                 self._is_started = True
                 try:
-                    if not self.task_run:
-                        if PREFECT_EXPERIMENTAL_ENABLE_CLIENT_SIDE_TASK_ORCHESTRATION:
-                            # TODO - this maybe should be a method on Task?
-                            from prefect.utilities.engine import (
-                                _resolve_custom_task_run_name,
+                    if PREFECT_EXPERIMENTAL_ENABLE_CLIENT_SIDE_TASK_ORCHESTRATION:
+                        from prefect.utilities.engine import (
+                            _resolve_custom_task_run_name,
+                        )
+
+                        task_run_name = (
+                            _resolve_custom_task_run_name(
+                                task=self.task, parameters=self.parameters
                             )
+                            if self.task.task_run_name
+                            else None
+                        )
 
-                            task_run_name = None
-                            if not self._task_name_set and self.task.task_run_name:
-                                task_run_name = _resolve_custom_task_run_name(
-                                    task=self.task, parameters=self.parameters
-                                )
+                        if self.task_run and task_run_name:
+                            self.task_run.name = task_run_name
 
+                        if not self.task_run:
                             self.task_run = run_coro_as_sync(
                                 self.task.create_local_run(
                                     id=task_run_id,
@@ -601,7 +605,8 @@ class TaskRunEngine(Generic[P, R]):
                                     task_run_name=task_run_name,
                                 )
                             )
-                        else:
+                    else:
+                        if not self.task_run:
                             self.task_run = run_coro_as_sync(
                                 self.task.create_run(
                                     id=task_run_id,

{prefect-client-3.0.0rc12 → prefect-client-3.0.0rc13}/src/prefect/task_worker.py

@@ -29,6 +29,7 @@ from prefect.logging.loggers import get_logger
 from prefect.results import ResultFactory
 from prefect.settings import (
     PREFECT_API_URL,
+    PREFECT_EXPERIMENTAL_ENABLE_CLIENT_SIDE_TASK_ORCHESTRATION,
     PREFECT_TASK_SCHEDULING_DELETE_FAILED_SUBMISSIONS,
 )
 from prefect.states import Pending
@@ -289,26 +290,33 @@ class TaskWorker:
                     await self._client._client.delete(f"/task_runs/{task_run.id}")
                 return
 
-        try:
+        if PREFECT_EXPERIMENTAL_ENABLE_CLIENT_SIDE_TASK_ORCHESTRATION:
             new_state = Pending()
             new_state.state_details.deferred = True
-            state = await propose_state(
-                client=get_client(),  # TODO prove that we cannot use self._client here
-                state=new_state,
-                task_run_id=task_run.id,
-            )
-        except Abort as exc:
-            logger.exception(
-                f"Failed to submit task run {task_run.id!r} to engine", exc_info=exc
-            )
-            return
-        except PrefectHTTPStatusError as exc:
-            if exc.response.status_code == 404:
-                logger.warning(
-                    f"Task run {task_run.id!r} not found. It may have been deleted."
+            new_state.state_details.task_run_id = task_run.id
+            new_state.state_details.flow_run_id = task_run.flow_run_id
+            state = new_state
+        else:
+            try:
+                new_state = Pending()
+                new_state.state_details.deferred = True
+                state = await propose_state(
+                    client=get_client(),  # TODO prove that we cannot use self._client here
+                    state=new_state,
+                    task_run_id=task_run.id,
+                )
+            except Abort as exc:
+                logger.exception(
+                    f"Failed to submit task run {task_run.id!r} to engine", exc_info=exc
                 )
                 return
-            raise
+            except PrefectHTTPStatusError as exc:
+                if exc.response.status_code == 404:
+                    logger.warning(
+                        f"Task run {task_run.id!r} not found. It may have been deleted."
+                    )
+                    return
+                raise
 
         if not state.is_pending():
             logger.warning(

{prefect-client-3.0.0rc12 → prefect-client-3.0.0rc13/src/prefect_client.egg-info}/PKG-INFO

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