feat: persist and inspect run step budgets
This commit is contained in:
@@ -83,6 +83,9 @@ class RunResultBase(ArtifactVersionPayload, GuidedResultPayload):
|
||||
error: str | None
|
||||
output: JsonObject | None
|
||||
trace_count: int
|
||||
max_steps: int
|
||||
steps_executed: int
|
||||
steps_remaining: int
|
||||
|
||||
|
||||
class RunResult(RunResultBase):
|
||||
|
||||
@@ -13,7 +13,7 @@ from wf_artifacts import (
|
||||
WorkflowDeployment,
|
||||
)
|
||||
from wf_authoring import NodeSpec
|
||||
from wf_core import RunState
|
||||
from wf_core import RunLimits, RunState
|
||||
from wf_platform import CapabilitySource
|
||||
|
||||
from .models import RawWorkflowPlan
|
||||
@@ -61,6 +61,7 @@ class WorkflowRuntimeRunner(Protocol):
|
||||
deployment: WorkflowDeployment | None = None,
|
||||
artifact: WorkflowArtifact | None = None,
|
||||
saved_subgraph_tree: SavedSubgraphTree | None = None,
|
||||
limits: RunLimits | None = None,
|
||||
) -> RunState:
|
||||
"""Execute one raw workflow plan and return its run state."""
|
||||
...
|
||||
|
||||
@@ -25,6 +25,7 @@ from wf_core import (
|
||||
RunStatus,
|
||||
dump_run_state,
|
||||
load_run_state,
|
||||
load_run_state_with_upgrade,
|
||||
)
|
||||
|
||||
|
||||
@@ -100,10 +101,29 @@ def persist_stopped_run(
|
||||
def restore_interrupted_run(
|
||||
store: RunStore, run_id: str
|
||||
) -> tuple[WorkflowRunRecord, RunState]:
|
||||
"""Load a persisted interrupted run and its latest typed runtime state."""
|
||||
record, run = load_stored_run(store, run_id)
|
||||
"""Load a persisted interrupted run, persisting a v1 upgrade first.
|
||||
|
||||
A pre-budget (v1) checkpoint receives its one-time defaults and is
|
||||
rewritten as a new v2 interrupted checkpoint under the same run id and
|
||||
pinned environment *before* the run is returned, so resume dispatch
|
||||
never runs on unmigrated state and a failed upgrade fails resume before
|
||||
any handler runs. Ordinary inspection uses :func:`load_stored_run`,
|
||||
which decodes v1 prospectively without mutating the store.
|
||||
"""
|
||||
record = store.get_run(run_id)
|
||||
if record.status is not StoredRunStatus.INTERRUPTED:
|
||||
raise ValueError(f"workflow run {run_id!r} is not interrupted")
|
||||
checkpoint = store.get_latest_checkpoint(run_id)
|
||||
run, upgraded = load_run_state_with_upgrade(
|
||||
checkpoint.state.model_dump(mode="json")
|
||||
)
|
||||
if upgraded:
|
||||
record = persist_stopped_run(
|
||||
store=store,
|
||||
environment=record.environment,
|
||||
run=run,
|
||||
run_id=run_id,
|
||||
)
|
||||
return record, run
|
||||
|
||||
|
||||
|
||||
+33
-1
@@ -11,7 +11,7 @@ from wf_artifacts import (
|
||||
WorkflowDeployment,
|
||||
WorkflowRunRecord,
|
||||
)
|
||||
from wf_core import RunState
|
||||
from wf_core import RunLimits, RunState
|
||||
|
||||
from .artifact_plans import raw_plan_from_artifact
|
||||
from .deployments import WorkflowDeploymentApi, _available_sources
|
||||
@@ -80,6 +80,7 @@ class WorkflowRunApi:
|
||||
deployment_id: str,
|
||||
workflow_input: dict[str, Any],
|
||||
trace_range: TraceRangeLike | None = None,
|
||||
max_steps: int | None = None,
|
||||
) -> RunResult:
|
||||
trace_values = _trace_range_values(trace_range)
|
||||
deployment, artifact, diagnostics, tree = (
|
||||
@@ -94,12 +95,16 @@ class WorkflowRunApi:
|
||||
)
|
||||
|
||||
plan = raw_plan_from_artifact(artifact)
|
||||
limits = (
|
||||
RunLimits(max_steps=max_steps) if max_steps is not None else RunLimits()
|
||||
)
|
||||
run = await self.context.runtime.run_workflow_from_plan(
|
||||
plan,
|
||||
workflow_input,
|
||||
deployment=deployment,
|
||||
artifact=artifact,
|
||||
saved_subgraph_tree=tree,
|
||||
limits=limits,
|
||||
)
|
||||
record = persist_stopped_run(
|
||||
store=self._run_store(),
|
||||
@@ -121,6 +126,9 @@ class WorkflowRunApi:
|
||||
error=run.error,
|
||||
output=run.output,
|
||||
trace_count=len(run.trace),
|
||||
max_steps=run.limits.max_steps,
|
||||
steps_executed=run.steps_executed,
|
||||
steps_remaining=run.steps_remaining,
|
||||
**_trace_slice_fields(run, trace_values),
|
||||
)
|
||||
|
||||
@@ -176,6 +184,9 @@ class WorkflowRunApi:
|
||||
output=stopped_run.output,
|
||||
diagnostics=diagnostics,
|
||||
trace_count=len(stopped_run.trace),
|
||||
max_steps=stopped_run.limits.max_steps,
|
||||
steps_executed=stopped_run.steps_executed,
|
||||
steps_remaining=stopped_run.steps_remaining,
|
||||
)
|
||||
plan = raw_plan_from_artifact(environment.root_artifact)
|
||||
tree = saved_subgraph_tree_from_snapshots(environment.child_artifacts)
|
||||
@@ -205,6 +216,9 @@ class WorkflowRunApi:
|
||||
error=run.error,
|
||||
output=run.output,
|
||||
trace_count=len(run.trace),
|
||||
max_steps=run.limits.max_steps,
|
||||
steps_executed=run.steps_executed,
|
||||
steps_remaining=run.steps_remaining,
|
||||
**_trace_slice_fields(run, trace_values),
|
||||
)
|
||||
|
||||
@@ -261,6 +275,9 @@ class WorkflowRunApi:
|
||||
output=run.output,
|
||||
diagnostics=record.diagnostics,
|
||||
trace_count=len(run.trace),
|
||||
max_steps=run.limits.max_steps,
|
||||
steps_executed=run.steps_executed,
|
||||
steps_remaining=run.steps_remaining,
|
||||
)
|
||||
|
||||
async def read_run_trace(
|
||||
@@ -281,6 +298,9 @@ class WorkflowRunApi:
|
||||
resume_readiness=record.resume_readiness.value,
|
||||
diagnostics=record.diagnostics,
|
||||
trace_count=len(run.trace),
|
||||
max_steps=run.limits.max_steps,
|
||||
steps_executed=run.steps_executed,
|
||||
steps_remaining=run.steps_remaining,
|
||||
**_trace_slice_fields(run, trace_values),
|
||||
)
|
||||
# A concrete trace range makes _run_payload include the four trace
|
||||
@@ -366,7 +386,16 @@ def _run_payload(
|
||||
trace_start: int | None = None,
|
||||
trace_limit: int | None = None,
|
||||
trace_truncated: bool = False,
|
||||
max_steps: int | None = None,
|
||||
steps_executed: int = 0,
|
||||
steps_remaining: int | None = None,
|
||||
) -> RunResult:
|
||||
effective_max = max_steps if max_steps is not None else RunLimits().max_steps
|
||||
effective_remaining = (
|
||||
steps_remaining
|
||||
if steps_remaining is not None
|
||||
else max(effective_max - steps_executed, 0)
|
||||
)
|
||||
payload = {
|
||||
"deployment_id": deployment.id,
|
||||
"artifact_id": artifact.id,
|
||||
@@ -382,6 +411,9 @@ def _run_payload(
|
||||
diagnostic.model_dump(mode="json") for diagnostic in diagnostics or []
|
||||
],
|
||||
"trace_count": trace_count,
|
||||
"max_steps": effective_max,
|
||||
"steps_executed": steps_executed,
|
||||
"steps_remaining": effective_remaining,
|
||||
"next_actions": NextActions.from_run_result(
|
||||
run_id=run_id,
|
||||
status=status,
|
||||
|
||||
@@ -1048,11 +1048,13 @@ class WorkflowApi:
|
||||
deployment_id: str,
|
||||
workflow_input: dict[str, Any],
|
||||
trace_range: TraceRangeLike | None = None,
|
||||
max_steps: int | None = None,
|
||||
) -> RunResult:
|
||||
return await self.runs.run_deployment(
|
||||
deployment_id=deployment_id,
|
||||
workflow_input=workflow_input,
|
||||
trace_range=trace_range,
|
||||
max_steps=max_steps,
|
||||
)
|
||||
|
||||
async def resume_run(
|
||||
|
||||
@@ -517,6 +517,7 @@ class WorkflowRunSurface(Protocol):
|
||||
deployment_id: str,
|
||||
workflow_input: dict[str, Any],
|
||||
trace_range: TraceRangeLike | None = None,
|
||||
max_steps: int | None = None,
|
||||
) -> RunResult: ...
|
||||
|
||||
async def resume_run(
|
||||
|
||||
Reference in New Issue
Block a user