Skip to content

Automate browser based workflows with AI

Revert "feat(workflow): ValidationBlock data_extraction_goal/data_schema frontend" (#6072)

Aaron Perez3c0174b1aa8b
diff --git a/docs/api-reference/openapi.json b/docs/api-reference/openapi.json
index 22e2ada20..8b6847625 100644
--- a/docs/api-reference/openapi.json
+++ b/docs/api-reference/openapi.json
@@ -12059,11 +12059,6 @@
"title": "Next Loop On Failure",
"default": false
},
- "navigation_goal": {
- "type": "string",
- "nullable": true,
- "title": "Navigation Goal"
- },
"complete_criterion": {
"type": "string",
"nullable": true,
@@ -12094,28 +12089,6 @@
"type": "boolean",
"title": "Disable Cache",
"default": false
- },
- "data_extraction_goal": {
- "type": "string",
- "nullable": true,
- "title": "Data Extraction Goal"
- },
- "data_schema": {
- "anyOf": [
- {
- "additionalProperties": true,
- "type": "object"
- },
- {
- "items": {},
- "type": "array"
- },
- {
- "type": "string"
- }
- ],
- "title": "Data Schema",
- "nullable": true
}
},
"type": "object",
diff --git a/fern/openapi/skyvern_openapi.json b/fern/openapi/skyvern_openapi.json
index 8fe316071..7e4193fed 100644
--- a/fern/openapi/skyvern_openapi.json
+++ b/fern/openapi/skyvern_openapi.json
@@ -19164,17 +19164,6 @@
"title": "Next Loop On Failure",
"default": false
},
- "navigation_goal": {
- "anyOf": [
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ],
- "title": "Navigation Goal"
- },
"complete_criterion": {
"anyOf": [
{
@@ -19229,36 +19218,6 @@
"type": "boolean",
"title": "Disable Cache",
"default": false
- },
- "data_extraction_goal": {
- "anyOf": [
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ],
- "title": "Data Extraction Goal"
- },
- "data_schema": {
- "anyOf": [
- {
- "additionalProperties": true,
- "type": "object"
- },
- {
- "items": {},
- "type": "array"
- },
- {
- "type": "string"
- },
- {
- "type": "null"
- }
- ],
- "title": "Data Schema"
}
},
"type": "object",
diff --git a/skyvern-frontend/src/routes/workflows/editor/constants.ts b/skyvern-frontend/src/routes/workflows/editor/constants.ts
index 4d5b43aa6..e10b23d94 100644
--- a/skyvern-frontend/src/routes/workflows/editor/constants.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/constants.ts
@@ -95,7 +95,6 @@ export const AI_IMPROVE_CONFIGS = {
dataSchema: createAiImproveConfig("extraction", "data_schema"),
},
validation: {
- navigationGoal: createAiImproveConfig("validation", "navigation_goal"),
completeCriterion: createAiImproveConfig(
"validation",
"complete_criterion",
@@ -104,11 +103,6 @@ export const AI_IMPROVE_CONFIGS = {
"validation",
"terminate_criterion",
),
- dataExtractionGoal: createAiImproveConfig(
- "validation",
- "data_extraction_goal",
- ),
- dataSchema: createAiImproveConfig("validation", "data_schema"),
},
login: {
navigationGoal: createAiImproveConfig("login", "navigation_goal"),
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx
index 81a70c5fd..2856f4254 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx
@@ -11,13 +11,12 @@ import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
import { Separator } from "@/components/ui/separator";
import { WorkflowBlockInputTextarea } from "@/components/WorkflowBlockInputTextarea";
-import { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";
import { BlockCodeEditor } from "@/routes/workflows/components/BlockCodeEditor";
import { ErrorCodeMappingEditor } from "@/routes/workflows/editor/ErrorCodeMappingEditor";
import { useBlockScriptStore } from "@/store/BlockScriptStore";
import { Handle, NodeProps, Position, useEdges, useNodes } from "@xyflow/react";
-import { helpTooltips, placeholders } from "../../helpContent";
-import { dataSchemaExampleValue, errorMappingExampleValue } from "../types";
+import { helpTooltips } from "../../helpContent";
+import { errorMappingExampleValue } from "../types";
import type { ValidationNode } from "./types";
import { AppNode } from "..";
import {
@@ -132,101 +131,11 @@ function ValidationNode({ id, data, type }: NodeProps<ValidationNode>) {
/>
</div>
<Separator />
- <Accordion type="multiple" onValueChange={() => rerender.bump()}>
- <AccordionItem value="extraction">
- <AccordionTrigger className="py-0">Extraction</AccordionTrigger>
- <AccordionContent className="pl-[1.5rem] pr-1 pt-4">
- <div key={`${rerender.key}-extraction`} className="space-y-4">
- <div className="space-y-2">
- <div className="flex gap-2">
- <Label className="text-xs text-slate-300">
- Navigation Goal
- </Label>
- <HelpTooltip
- content={helpTooltips["validation"]["navigationGoal"]}
- />
- </div>
- <WorkflowBlockInputTextarea
- aiImprove={{
- useCase:
- AI_IMPROVE_CONFIGS.validation.navigationGoal.useCase,
- context: {
- ...AI_IMPROVE_CONFIGS.validation.navigationGoal
- .context,
- data_extraction_goal:
- data.dataExtractionGoal || undefined,
- complete_criterion:
- data.completeCriterion || undefined,
- terminate_criterion:
- data.terminateCriterion || undefined,
- },
- }}
- nodeId={id}
- onChange={(value) => {
- update({ navigationGoal: value });
- }}
- value={data.navigationGoal}
- placeholder={placeholders["validation"]["navigationGoal"]}
- className="nopan text-xs"
- />
- </div>
- <div className="space-y-2">
- <div className="flex gap-2">
- <Label className="text-xs text-slate-300">
- Data Extraction Goal
- </Label>
- <HelpTooltip
- content={
- helpTooltips["validation"]["dataExtractionGoal"]
- }
- />
- </div>
- <WorkflowBlockInputTextarea
- aiImprove={{
- useCase:
- AI_IMPROVE_CONFIGS.validation.dataExtractionGoal
- .useCase,
- context: {
- ...AI_IMPROVE_CONFIGS.validation.dataExtractionGoal
- .context,
- navigation_goal: data.navigationGoal || undefined,
- data_schema:
- data.dataSchema && data.dataSchema !== "null"
- ? data.dataSchema
- : undefined,
- complete_criterion:
- data.completeCriterion || undefined,
- terminate_criterion:
- data.terminateCriterion || undefined,
- },
- }}
- nodeId={id}
- onChange={(value) => {
- update({ dataExtractionGoal: value });
- }}
- value={data.dataExtractionGoal}
- placeholder={
- placeholders["validation"]["dataExtractionGoal"]
- }
- className="nopan text-xs"
- />
- </div>
- <WorkflowDataSchemaInputGroup
- exampleValue={dataSchemaExampleValue}
- onChange={(value) => {
- update({ dataSchema: value });
- }}
- value={data.dataSchema}
- suggestionContext={{
- data_extraction_goal: data.dataExtractionGoal,
- current_schema: data.dataSchema,
- complete_criterion: data.completeCriterion,
- terminate_criterion: data.terminateCriterion,
- }}
- />
- </div>
- </AccordionContent>
- </AccordionItem>
+ <Accordion
+ type="single"
+ collapsible
+ onValueChange={() => rerender.bump()}
+ >
<AccordionItem value="advanced" className="border-b-0">
<AccordionTrigger className="py-0">
Advanced Settings
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts
index 0f483da2e..d8ff2b935 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts
@@ -5,11 +5,8 @@ export type ValidationNodeData = NodeBaseData & {
completeCriterion: string;
terminateCriterion: string;
errorCodeMapping: string;
- navigationGoal: string;
parameterKeys: Array<string>;
disableCache: boolean;
- dataExtractionGoal: string;
- dataSchema: string;
};
export type ValidationNode = Node<ValidationNodeData, "validation">;
@@ -20,14 +17,11 @@ export const validationNodeDefaultData: ValidationNodeData = {
completeCriterion: "",
terminateCriterion: "",
errorCodeMapping: "null",
- navigationGoal: "",
continueOnFailure: false,
editable: true,
parameterKeys: [],
disableCache: false,
model: null,
- dataExtractionGoal: "",
- dataSchema: "null",
};
export function isValidationNode(node: Node): node is ValidationNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
index 17b53453a..a75700ff4 100644
--- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
@@ -708,18 +708,10 @@ function convertToNode(
data: {
...commonData,
errorCodeMapping: JSON.stringify(block.error_code_mapping, null, 2),
- navigationGoal: block.navigation_goal ?? "",
completeCriterion: block.complete_criterion ?? "",
terminateCriterion: block.terminate_criterion ?? "",
parameterKeys: block.parameters.map((p) => p.key),
disableCache: block.disable_cache ?? false,
- dataExtractionGoal: block.data_extraction_goal ?? "",
- dataSchema:
- block.data_schema == null
- ? "null"
- : typeof block.data_schema === "string"
- ? block.data_schema
- : JSON.stringify(block.data_schema, null, 2),
},
};
}
@@ -2491,7 +2483,6 @@ function getWorkflowBlock(
return {
...base,
block_type: "validation",
- navigation_goal: node.data.navigationGoal || null,
complete_criterion: node.data.completeCriterion,
terminate_criterion: node.data.terminateCriterion,
error_code_mapping: JSONParseSafe(node.data.errorCodeMapping) as Record<
@@ -2499,9 +2490,6 @@ function getWorkflowBlock(
string
> | null,
parameter_keys: node.data.parameterKeys,
- data_extraction_goal: node.data.dataExtractionGoal || null,
- data_schema: JSONSafeOrString(node.data.dataSchema),
- disable_cache: node.data.disableCache ?? false,
};
}
case "human_interaction": {
@@ -3976,14 +3964,10 @@ function convertBlocksToBlockYAML(
const blockYaml: ValidationBlockYAML = {
...base,
block_type: "validation",
- navigation_goal: block.navigation_goal ?? null,
complete_criterion: block.complete_criterion,
terminate_criterion: block.terminate_criterion,
error_code_mapping: block.error_code_mapping,
parameter_keys: block.parameters.map((p) => p.key),
- data_extraction_goal: block.data_extraction_goal ?? null,
- data_schema: block.data_schema ?? null,
- disable_cache: block.disable_cache ?? false,
};
return blockYaml;
}
@@ -4437,23 +4421,6 @@ function getWorkflowErrors(nodes: Array<AppNode>): Array<string> {
`${node.data.label}: At least one of completion or termination criteria must be provided`,
);
}
- if (
- node.data.dataExtractionGoal.trim().length > 0 &&
- node.data.navigationGoal.trim().length === 0
- ) {
- errors.push(
- `${node.data.label}: Navigation Goal is required when Data Extraction Goal is set`,
- );
- }
- if (node.data.dataSchema && node.data.dataSchema !== "null") {
- const result = TSON.parse(node.data.dataSchema);
-
- if (!result.success) {
- errors.push(
- `${node.data.label}: Data schema has invalid templated JSON: ${result.error ?? "-"}`,
- );
- }
- }
});
const interactionNodes = nodes.filter(isHumanInteractionNode);
diff --git a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
index d955c1c72..c67754bf8 100644
--- a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
+++ b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
@@ -436,14 +436,11 @@ export type FileURLParserBlock = WorkflowBlockBase & {
export type ValidationBlock = WorkflowBlockBase & {
block_type: "validation";
- navigation_goal?: string | null;
complete_criterion: string | null;
terminate_criterion: string | null;
error_code_mapping: Record<string, string> | null;
parameters: Array<WorkflowParameter>;
disable_cache?: boolean;
- data_extraction_goal?: string | null;
- data_schema?: Record<string, unknown> | string | null;
};
export type HumanInteractionBlock = WorkflowBlockBase & {
diff --git a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
index 4cc022373..0ca686730 100644
--- a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
+++ b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
@@ -194,14 +194,10 @@ export type Taskv2BlockYAML = BlockYAMLBase & {
export type ValidationBlockYAML = BlockYAMLBase & {
block_type: "validation";
- navigation_goal?: string | null;
complete_criterion: string | null;
terminate_criterion: string | null;
error_code_mapping: Record<string, string> | null;
parameter_keys?: Array<string> | null;
- data_extraction_goal?: string | null;
- data_schema?: Record<string, unknown> | string | null;
- disable_cache?: boolean;
};
export type HumanInteractionBlockYAML = BlockYAMLBase & {
diff --git a/skyvern/client/types/__init__.py b/skyvern/client/types/__init__.py
index 172687f95..38799a4df 100644
--- a/skyvern/client/types/__init__.py
+++ b/skyvern/client/types/__init__.py
@@ -459,7 +459,6 @@ if typing.TYPE_CHECKING:
ValidationBlockParametersItem_Workflow,
)
from .validation_block_yaml import ValidationBlockYaml
- from .validation_block_yaml_data_schema import ValidationBlockYamlDataSchema
from .validation_error import ValidationError
from .validation_error_loc_item import ValidationErrorLocItem
from .wait_block import WaitBlock
@@ -1085,7 +1084,6 @@ _dynamic_imports: typing.Dict[str, str] = {
"ValidationBlockParametersItem_Output": ".validation_block_parameters_item",
"ValidationBlockParametersItem_Workflow": ".validation_block_parameters_item",
"ValidationBlockYaml": ".validation_block_yaml",
- "ValidationBlockYamlDataSchema": ".validation_block_yaml_data_schema",
"ValidationError": ".validation_error",
"ValidationErrorLocItem": ".validation_error_loc_item",
"WaitBlock": ".wait_block",
@@ -1717,7 +1715,6 @@ __all__ = [
"ValidationBlockParametersItem_Output",
"ValidationBlockParametersItem_Workflow",
"ValidationBlockYaml",
- "ValidationBlockYamlDataSchema",
"ValidationError",
"ValidationErrorLocItem",
"WaitBlock",
diff --git a/skyvern/client/types/for_loop_block_yaml_loop_blocks_item.py b/skyvern/client/types/for_loop_block_yaml_loop_blocks_item.py
index 17984a9de..7a87b74ec 100644
--- a/skyvern/client/types/for_loop_block_yaml_loop_blocks_item.py
+++ b/skyvern/client/types/for_loop_block_yaml_loop_blocks_item.py
@@ -17,7 +17,6 @@ from .for_loop_block_yaml_data_schema import ForLoopBlockYamlDataSchema
from .pdf_format import PdfFormat
from .run_engine import RunEngine
from .task_block_yaml_data_schema import TaskBlockYamlDataSchema
-from .validation_block_yaml_data_schema import ValidationBlockYamlDataSchema
class ForLoopBlockYamlLoopBlocksItem_Task(UniversalBaseModel):
@@ -246,14 +245,11 @@ class ForLoopBlockYamlLoopBlocksItem_Validation(UniversalBaseModel):
continue_on_failure: typing.Optional[bool] = None
model: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
next_loop_on_failure: typing.Optional[bool] = None
- navigation_goal: typing.Optional[str] = None
complete_criterion: typing.Optional[str] = None
terminate_criterion: typing.Optional[str] = None
error_code_mapping: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None
parameter_keys: typing.Optional[typing.List[str]] = None
disable_cache: typing.Optional[bool] = None
- data_extraction_goal: typing.Optional[str] = None
- data_schema: typing.Optional[ValidationBlockYamlDataSchema] = None
if IS_PYDANTIC_V2:
model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True) # type: ignore # Pydantic v2
diff --git a/skyvern/client/types/validation_block_yaml.py b/skyvern/client/types/validation_block_yaml.py
index 86ae09c1e..4bdd9434d 100644
--- a/skyvern/client/types/validation_block_yaml.py
+++ b/skyvern/client/types/validation_block_yaml.py
@@ -4,7 +4,6 @@ import typing
import pydantic
from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .validation_block_yaml_data_schema import ValidationBlockYamlDataSchema
class ValidationBlockYaml(UniversalBaseModel):
@@ -21,14 +20,11 @@ class ValidationBlockYaml(UniversalBaseModel):
continue_on_failure: typing.Optional[bool] = None
model: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
next_loop_on_failure: typing.Optional[bool] = None
- navigation_goal: typing.Optional[str] = None
complete_criterion: typing.Optional[str] = None
terminate_criterion: typing.Optional[str] = None
error_code_mapping: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None
parameter_keys: typing.Optional[typing.List[str]] = None
disable_cache: typing.Optional[bool] = None
- data_extraction_goal: typing.Optional[str] = None
- data_schema: typing.Optional[ValidationBlockYamlDataSchema] = None
if IS_PYDANTIC_V2:
model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True) # type: ignore # Pydantic v2
diff --git a/skyvern/client/types/validation_block_yaml_data_schema.py b/skyvern/client/types/validation_block_yaml_data_schema.py
deleted file mode 100644
index da5435480..000000000
--- a/skyvern/client/types/validation_block_yaml_data_schema.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-
-ValidationBlockYamlDataSchema = typing.Union[
- typing.Dict[str, typing.Optional[typing.Any]], typing.List[typing.Optional[typing.Any]], str
-]
diff --git a/skyvern/client/types/while_loop_block_yaml_loop_blocks_item.py b/skyvern/client/types/while_loop_block_yaml_loop_blocks_item.py
index 16d9cd25b..c604507f9 100644
--- a/skyvern/client/types/while_loop_block_yaml_loop_blocks_item.py
+++ b/skyvern/client/types/while_loop_block_yaml_loop_blocks_item.py
@@ -17,7 +17,6 @@ from .for_loop_block_yaml_data_schema import ForLoopBlockYamlDataSchema
from .pdf_format import PdfFormat
from .run_engine import RunEngine
from .task_block_yaml_data_schema import TaskBlockYamlDataSchema
-from .validation_block_yaml_data_schema import ValidationBlockYamlDataSchema
class WhileLoopBlockYamlLoopBlocksItem_Task(UniversalBaseModel):
@@ -246,14 +245,11 @@ class WhileLoopBlockYamlLoopBlocksItem_Validation(UniversalBaseModel):
continue_on_failure: typing.Optional[bool] = None
model: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
next_loop_on_failure: typing.Optional[bool] = None
- navigation_goal: typing.Optional[str] = None
complete_criterion: typing.Optional[str] = None
terminate_criterion: typing.Optional[str] = None
error_code_mapping: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None
parameter_keys: typing.Optional[typing.List[str]] = None
disable_cache: typing.Optional[bool] = None
- data_extraction_goal: typing.Optional[str] = None
- data_schema: typing.Optional[ValidationBlockYamlDataSchema] = None
if IS_PYDANTIC_V2:
model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True) # type: ignore # Pydantic v2
diff --git a/skyvern/client/types/workflow_definition_yaml_blocks_item.py b/skyvern/client/types/workflow_definition_yaml_blocks_item.py
index a90521d64..e43eee71b 100644
--- a/skyvern/client/types/workflow_definition_yaml_blocks_item.py
+++ b/skyvern/client/types/workflow_definition_yaml_blocks_item.py
@@ -17,7 +17,6 @@ from .for_loop_block_yaml_data_schema import ForLoopBlockYamlDataSchema
from .pdf_format import PdfFormat
from .run_engine import RunEngine
from .task_block_yaml_data_schema import TaskBlockYamlDataSchema
-from .validation_block_yaml_data_schema import ValidationBlockYamlDataSchema
class WorkflowDefinitionYamlBlocksItem_Action(UniversalBaseModel):
@@ -563,14 +562,11 @@ class WorkflowDefinitionYamlBlocksItem_Validation(UniversalBaseModel):
continue_on_failure: typing.Optional[bool] = None
model: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
next_loop_on_failure: typing.Optional[bool] = None
- navigation_goal: typing.Optional[str] = None
complete_criterion: typing.Optional[str] = None
terminate_criterion: typing.Optional[str] = None
error_code_mapping: typing.Optional[typing.Dict[str, typing.Optional[str]]] = None
parameter_keys: typing.Optional[typing.List[str]] = None
disable_cache: typing.Optional[bool] = None
- data_extraction_goal: typing.Optional[str] = None
- data_schema: typing.Optional[ValidationBlockYamlDataSchema] = None
if IS_PYDANTIC_V2:
model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True) # type: ignore # Pydantic v2
diff --git a/skyvern/forge/sdk/workflow/workflow_definition_converter.py b/skyvern/forge/sdk/workflow/workflow_definition_converter.py
index 081ec5b9c..aded77aba 100644
--- a/skyvern/forge/sdk/workflow/workflow_definition_converter.py
+++ b/skyvern/forge/sdk/workflow/workflow_definition_converter.py
@@ -580,23 +580,13 @@ def block_yaml_to_block(
f"Validation block '{block_yaml.label}' requires at least one of complete_criterion or terminate_criterion"
)
- if block_yaml.data_extraction_goal and not block_yaml.navigation_goal:
- raise InvalidWorkflowDefinition(
- f"Validation block '{block_yaml.label}' has data_extraction_goal but no navigation_goal; "
- "extraction requires both fields to be set"
- )
-
return ValidationBlock(
**base_kwargs,
task_type=TaskType.validation,
parameters=validation_block_parameters,
- navigation_goal=block_yaml.navigation_goal,
complete_criterion=block_yaml.complete_criterion,
terminate_criterion=block_yaml.terminate_criterion,
error_code_mapping=block_yaml.error_code_mapping,
- data_extraction_goal=block_yaml.data_extraction_goal,
- data_schema=block_yaml.data_schema,
- disable_cache=block_yaml.disable_cache,
# Should only need one step for validation block, but we allow 2 in case the LLM has an unexpected failure and we need to retry.
max_steps_per_run=2,
)
diff --git a/skyvern/schemas/workflows.py b/skyvern/schemas/workflows.py
index 690884a26..7f3e30324 100644
--- a/skyvern/schemas/workflows.py
+++ b/skyvern/schemas/workflows.py
@@ -879,14 +879,11 @@ class PDFParserBlockYAML(BlockYAML):
class ValidationBlockYAML(BlockYAML):
block_type: Literal[BlockType.VALIDATION] = BlockType.VALIDATION # type: ignore
- navigation_goal: str | None = None
complete_criterion: str | None = None
terminate_criterion: str | None = None
error_code_mapping: dict[str, str] | None = None
parameter_keys: list[str] | None = None
disable_cache: bool = False
- data_extraction_goal: str | None = None
- data_schema: dict[str, Any] | list | str | None = None
class ActionBlockYAML(BlockYAML):
diff --git a/tests/unit/test_validation_block_extraction.py b/tests/unit/test_validation_block_extraction.py
deleted file mode 100644
index bdfac0685..000000000
--- a/tests/unit/test_validation_block_extraction.py
+++ /dev/null
@@ -1,228 +0,0 @@
-from datetime import datetime, timezone
-from typing import Any, TypeAlias, cast
-
-import pytest
-
-from skyvern.client.types.for_loop_block_yaml_loop_blocks_item import (
- ForLoopBlockYamlLoopBlocksItem_Validation,
-)
-from skyvern.client.types.validation_block_yaml import ValidationBlockYaml
-from skyvern.client.types.while_loop_block_yaml_loop_blocks_item import (
- WhileLoopBlockYamlLoopBlocksItem_Validation,
-)
-from skyvern.client.types.workflow_definition_yaml_blocks_item import (
- WorkflowDefinitionYamlBlocksItem_Validation,
-)
-from skyvern.forge.agent import ForgeAgent
-from skyvern.forge.sdk.schemas.tasks import TaskType
-from skyvern.forge.sdk.workflow.exceptions import InvalidWorkflowDefinition
-from skyvern.forge.sdk.workflow.models.block import ValidationBlock
-from skyvern.forge.sdk.workflow.models.parameter import (
- PARAMETER_TYPE,
- OutputParameter,
- ParameterType,
-)
-from skyvern.forge.sdk.workflow.workflow_definition_converter import block_yaml_to_block
-from skyvern.schemas.workflows import ValidationBlockYAML
-from skyvern.webeye.actions.actions import CompleteAction, TerminateAction
-from skyvern.webeye.actions.models import DetailedAgentStepOutput
-from skyvern.webeye.actions.responses import ActionFailure, ActionSuccess
-
-
-def _output_parameter(label: str) -> OutputParameter:
- now = datetime.now(timezone.utc)
- return OutputParameter(
- parameter_type=ParameterType.OUTPUT,
- key=f"{label}_output",
- description="test output",
- output_parameter_id=f"op_{label}",
- workflow_id="w_test",
- created_at=now,
- modified_at=now,
- )
-
-
-class TestValidationBlockExtractionFields:
- def test_yaml_accepts_extraction_fields(self) -> None:
- schema = {"type": "object", "properties": {"price": {"type": "number"}}}
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- navigation_goal="validate the cart total",
- complete_criterion="cart total matches expected total",
- data_extraction_goal="extract the cart subtotal as price",
- data_schema=schema,
- )
-
- assert block_yaml.navigation_goal == "validate the cart total"
- assert block_yaml.data_extraction_goal == "extract the cart subtotal as price"
- assert block_yaml.data_schema == schema
-
- def test_yaml_defaults_extraction_fields_to_none(self) -> None:
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- complete_criterion="cart total matches expected total",
- )
-
- assert block_yaml.navigation_goal is None
- assert block_yaml.data_extraction_goal is None
- assert block_yaml.data_schema is None
-
- def test_converter_passes_extraction_fields_to_validation_block(self) -> None:
- schema = {"type": "object", "properties": {"price": {"type": "number"}}}
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- navigation_goal="validate the cart total",
- terminate_criterion="cart is empty",
- data_extraction_goal="extract the cart subtotal as price",
- data_schema=schema,
- )
- parameters: dict[str, PARAMETER_TYPE] = {
- "validate_cart_output": cast(PARAMETER_TYPE, _output_parameter("validate_cart")),
- }
-
- block = block_yaml_to_block(block_yaml, parameters)
-
- assert isinstance(block, ValidationBlock)
- assert block.navigation_goal == "validate the cart total"
- assert block.data_extraction_goal == "extract the cart subtotal as price"
- assert block.data_schema == schema
- assert block.terminate_criterion == "cart is empty"
- assert block.disable_cache is False
-
- def test_converter_threads_disable_cache_to_validation_block(self) -> None:
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- complete_criterion="cart total matches expected total",
- disable_cache=True,
- )
- parameters: dict[str, PARAMETER_TYPE] = {
- "validate_cart_output": cast(PARAMETER_TYPE, _output_parameter("validate_cart")),
- }
-
- block = block_yaml_to_block(block_yaml, parameters)
-
- assert isinstance(block, ValidationBlock)
- assert block.disable_cache is True
-
- def test_converter_rejects_extraction_goal_without_navigation_goal(self) -> None:
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- complete_criterion="cart total matches expected total",
- data_extraction_goal="extract the cart subtotal as price",
- )
- parameters: dict[str, PARAMETER_TYPE] = {
- "validate_cart_output": cast(PARAMETER_TYPE, _output_parameter("validate_cart")),
- }
-
- with pytest.raises(InvalidWorkflowDefinition, match="navigation_goal"):
- block_yaml_to_block(block_yaml, parameters)
-
- def test_yaml_roundtrip_preserves_extraction_fields(self) -> None:
- schema = {"type": "object", "properties": {"price": {"type": "number"}}}
- original = ValidationBlockYAML(
- label="validate_cart",
- navigation_goal="validate the cart total",
- complete_criterion="cart total matches expected total",
- terminate_criterion="cart is empty",
- data_extraction_goal="extract the cart subtotal as price",
- data_schema=schema,
- error_code_mapping={"NO_CART": "cart is missing"},
- parameter_keys=["expected_total"],
- disable_cache=True,
- )
-
- dumped = original.model_dump()
- restored = ValidationBlockYAML.model_validate(dumped)
-
- assert restored.navigation_goal == original.navigation_goal
- assert restored.data_extraction_goal == original.data_extraction_goal
- assert restored.data_schema == original.data_schema
- assert restored.complete_criterion == original.complete_criterion
- assert restored.terminate_criterion == original.terminate_criterion
- assert restored.error_code_mapping == original.error_code_mapping
- assert restored.parameter_keys == original.parameter_keys
- assert restored.disable_cache == original.disable_cache
-
-
-FernValidationYamlModel: TypeAlias = (
- type[ValidationBlockYaml]
- | type[WorkflowDefinitionYamlBlocksItem_Validation]
- | type[ForLoopBlockYamlLoopBlocksItem_Validation]
- | type[WhileLoopBlockYamlLoopBlocksItem_Validation]
-)
-
-
-class TestValidationBlockFernSdkFields:
- def test_fern_validation_yaml_models_accept_runtime_extraction_fields(self) -> None:
- schema: dict[str, Any] = {
- "type": "object",
- "properties": {"price": {"type": "number"}},
- }
- model_classes: tuple[FernValidationYamlModel, ...] = (
- ValidationBlockYaml,
- WorkflowDefinitionYamlBlocksItem_Validation,
- ForLoopBlockYamlLoopBlocksItem_Validation,
- WhileLoopBlockYamlLoopBlocksItem_Validation,
- )
-
- for model_class in model_classes:
- block_yaml = model_class(
- label="validate_cart",
- navigation_goal="validate the cart total",
- complete_criterion="cart total matches expected total",
- data_extraction_goal="extract the cart subtotal as price",
- data_schema=schema,
- )
-
- assert block_yaml.navigation_goal == "validate the cart total"
- assert block_yaml.data_extraction_goal == "extract the cart subtotal as price"
- assert block_yaml.data_schema == schema
-
-
-class TestValidationBlockRuntimeExtractionGate:
- def test_converter_output_satisfies_runtime_extraction_gate(self) -> None:
- schema = {"type": "object", "properties": {"price": {"type": "number"}}}
- block_yaml = ValidationBlockYAML(
- label="validate_cart",
- navigation_goal="validate the cart total",
- complete_criterion="cart total matches expected total",
- data_extraction_goal="extract the cart subtotal as price",
- data_schema=schema,
- )
- parameters: dict[str, PARAMETER_TYPE] = {
- "validate_cart_output": cast(PARAMETER_TYPE, _output_parameter("validate_cart")),
- }
-
- block = block_yaml_to_block(block_yaml, parameters)
-
- assert isinstance(block, ValidationBlock)
- assert block.task_type == TaskType.validation
- assert block.navigation_goal is not None
- assert block.data_extraction_goal is not None
- assert block.data_schema is not None
-
- def test_step_has_completed_goal_true_on_successful_complete_action(self) -> None:
- complete_action = CompleteAction(reasoning="criterion met", verified=True)
- detailed_output = DetailedAgentStepOutput(
- scraped_page=None,
- extract_action_prompt=None,
- llm_response=None,
- actions=[complete_action],
- action_results=[ActionSuccess()],
- actions_and_results=[(complete_action, [ActionSuccess()])],
- )
-
- assert ForgeAgent.step_has_completed_goal(detailed_output) is True
-
- def test_step_has_completed_goal_false_on_terminate_action(self) -> None:
- terminate_action = TerminateAction(reasoning="cannot continue")
- detailed_output = DetailedAgentStepOutput(
- scraped_page=None,
- extract_action_prompt=None,
- llm_response=None,
- actions=[terminate_action],
- action_results=[ActionFailure(exception=Exception("terminated"))],
- actions_and_results=[(terminate_action, [ActionFailure(exception=Exception("terminated"))])],
- )
-
- assert ForgeAgent.step_has_completed_goal(detailed_output) is False