Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
SKY-5061: add model to workflow (#2529)
Shuchang Zheng69a07c01ab92
diff --git a/skyvern-frontend/src/api/types.ts b/skyvern-frontend/src/api/types.tsindex 4c4710561..b54ebc3e1 100644--- a/skyvern-frontend/src/api/types.ts+++ b/skyvern-frontend/src/api/types.ts@@ -392,6 +392,10 @@ export type CreditCardCredential = {card_holder_name: string;};+export type ModelsResponse = {+ models: string[];+};+export const RunEngine = {SkyvernV1: "skyvern-1.0",SkyvernV2: "skyvern-2.0",diff --git a/skyvern-frontend/src/components/ModelSelector.tsx b/skyvern-frontend/src/components/ModelSelector.tsxnew file mode 100644index 000000000..73677d7b5--- /dev/null+++ b/skyvern-frontend/src/components/ModelSelector.tsx@@ -0,0 +1,66 @@+import { HelpTooltip } from "@/components/HelpTooltip";+import { Label } from "@/components/ui/label";+import {+ Select,+ SelectTrigger,+ SelectContent,+ SelectValue,+ SelectItem,+} from "@/components/ui/select";+import { getClient } from "@/api/AxiosClient";+import { useQuery } from "@tanstack/react-query";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";+import { ModelsResponse } from "@/api/types";+import { WorkflowModel } from "@/routes/workflows/types/workflowTypes";++type Props = {+ className?: string;+ value: WorkflowModel | null;+ // --+ onChange: (value: WorkflowModel | null) => void;+};++function ModelSelector({ value, onChange, className }: Props) {+ const credentialGetter = useCredentialGetter();++ const { data: availableModels } = useQuery<ModelsResponse>({+ queryKey: ["models"],+ queryFn: async () => {+ const client = await getClient(credentialGetter);+ return client.get("/models").then((res) => res.data);+ },+ });++ const models = availableModels?.models ?? [];++ return (+ <div className="flex items-center justify-between">+ <div className="flex gap-2">+ <Label className="text-xs font-normal text-slate-300">Model</Label>+ <HelpTooltip content="The LLM model to use for this block" />+ </div>+ <Select+ value={value?.model ?? ""}+ onValueChange={(value) => {+ onChange({ model: value });+ }}+ >+ {/* className="nopan w-52 text-xs" */}+ <SelectTrigger className={className}>+ <SelectValue placeholder="Skyvern Optimized" />+ </SelectTrigger>+ <SelectContent>+ {models.map((m) => (+ <SelectItem key={m} value={m}>+ {m}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ );+}++ModelSelector.displayName = "ModelSelector";++export { ModelSelector };diff --git a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsxindex b41f67324..cfebc235f 100644--- a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx@@ -233,6 +233,7 @@ function FlowRenderer({proxy_location: data.settings.proxyLocation,webhook_callback_url: data.settings.webhookCallbackUrl,persist_browser_session: data.settings.persistBrowserSession,+ model: data.settings.model,totp_verification_url: workflow.totp_verification_url,workflow_definition: {parameters: data.parameters,diff --git a/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx b/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsxindex 70728ea86..1cdf21571 100644--- a/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx@@ -58,6 +58,7 @@ function WorkflowEditor() {persistBrowserSession: workflow.persist_browser_session,proxyLocation: workflow.proxy_location,webhookCallbackUrl: workflow.webhook_callback_url,+ model: workflow.model,};const elements = getElements(diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsxindex a9699c0fa..88721c3ef 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx@@ -35,6 +35,7 @@ import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";const urlTooltip ="The URL Skyvern is navigating to. Leave this field blank to pick up from where the last block left off.";@@ -59,6 +60,7 @@ function ActionNode({ id, data }: NodeProps<ActionNode>) {cacheActions: data.cacheActions,downloadSuffix: data.downloadSuffix,totpVerificationUrl: data.totpVerificationUrl,+ model: data.model,totpIdentifier: data.totpIdentifier,engine: data.engine,});@@ -175,6 +177,13 @@ function ActionNode({ id, data }: NodeProps<ActionNode>) {<AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4"><div className="space-y-2">+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><ParametersMultiSelectavailableOutputParameters={outputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.tsindex e05711de5..d54cfe957 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts@@ -33,6 +33,7 @@ export const actionNodeDefaultData: ActionNodeData = {continueOnFailure: false,cacheActions: false,engine: RunEngine.SkyvernV1,+ model: null,} as const;export function isActionNode(node: Node): node is ActionNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/CodeBlockNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/CodeBlockNode/types.tsindex 794045ab7..47d4678a2 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/CodeBlockNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/CodeBlockNode/types.ts@@ -25,4 +25,5 @@ export const codeBlockNodeDefaultData: CodeBlockNodeData = {code: codeLead,continueOnFailure: false,parameterKeys: null,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/DownloadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/DownloadNode/types.tsindex 7bb3f6a46..a22aaae7e 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/DownloadNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/DownloadNode/types.ts@@ -13,4 +13,5 @@ export const downloadNodeDefaultData: DownloadNodeData = {label: "",url: SKYVERN_DOWNLOAD_DIRECTORY,continueOnFailure: false,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsxindex 75552ba65..67f8ac2e8 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx@@ -34,6 +34,7 @@ import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";import { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {const { updateNodeData } = useReactFlow();@@ -50,6 +51,7 @@ function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {continueOnFailure: data.continueOnFailure,cacheActions: data.cacheActions,engine: data.engine,+ model: data.model,});const deleteNodeCallback = useDeleteNodeCallback();const nodes = useNodes<AppNode>();@@ -153,6 +155,13 @@ function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {<AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4"><div className="space-y-2">+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><ParametersMultiSelectavailableOutputParameters={outputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.tsindex 9bfa2c4ba..c78d2c16d 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts@@ -27,6 +27,7 @@ export const extractionNodeDefaultData: ExtractionNodeData = {continueOnFailure: false,cacheActions: false,engine: RunEngine.SkyvernV1,+ model: null,} as const;export function isExtractionNode(node: Node): node is ExtractionNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsxindex 49bb8a4d6..c7888ff46 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx@@ -34,6 +34,7 @@ import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";const urlTooltip ="The URL Skyvern is navigating to. Leave this field blank to pick up from where the last block left off.";@@ -60,6 +61,7 @@ function FileDownloadNode({ id, data }: NodeProps<FileDownloadNode>) {totpVerificationUrl: data.totpVerificationUrl,totpIdentifier: data.totpIdentifier,engine: data.engine,+ model: data.model,});const deleteNodeCallback = useDeleteNodeCallback();@@ -167,6 +169,13 @@ function FileDownloadNode({ id, data }: NodeProps<FileDownloadNode>) {<AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4"><div className="space-y-2">+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><ParametersMultiSelectavailableOutputParameters={outputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.tsindex 69c08773d..877211ac4 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts@@ -33,6 +33,7 @@ export const fileDownloadNodeDefaultData: FileDownloadNodeData = {continueOnFailure: false,cacheActions: false,engine: RunEngine.SkyvernV1,+ model: null,} as const;export function isFileDownloadNode(node: Node): node is FileDownloadNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileParserNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/FileParserNode/types.tsindex 0cfca6256..6a44fe590 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileParserNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileParserNode/types.ts@@ -12,4 +12,5 @@ export const fileParserNodeDefaultData: FileParserNodeData = {label: "",fileUrl: "",continueOnFailure: false,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.tsindex 12e39b1d4..0efa575fa 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts@@ -23,4 +23,5 @@ export const fileUploadNodeDefaultData: FileUploadNodeData = {awsSecretAccessKey: "",regionName: "",continueOnFailure: false,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsxindex db294faee..d91ca53c6 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx@@ -36,6 +36,8 @@ import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { LoginBlockCredentialSelector } from "./LoginBlockCredentialSelector";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";+function LoginNode({ id, data }: NodeProps<LoginNode>) {const { updateNodeData } = useReactFlow();const { editable } = data;@@ -55,6 +57,7 @@ function LoginNode({ id, data }: NodeProps<LoginNode>) {completeCriterion: data.completeCriterion,terminateCriterion: data.terminateCriterion,engine: data.engine,+ model: data.model,});const deleteNodeCallback = useDeleteNodeCallback();@@ -177,6 +180,13 @@ function LoginNode({ id, data }: NodeProps<LoginNode>) {<AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4"><div className="space-y-2">+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><ParametersMultiSelectavailableOutputParameters={outputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.tsindex 08f6e2df1..4ab534738 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts@@ -36,6 +36,7 @@ export const loginNodeDefaultData: LoginNodeData = {completeCriterion: "",terminateCriterion: "",engine: RunEngine.SkyvernV1,+ model: null,} as const;export function isLoginNode(node: Node): node is LoginNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/LoopNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/LoopNode/types.tsindex fbac60366..e2843fa49 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/LoopNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/LoopNode/types.ts@@ -16,6 +16,7 @@ export const loopNodeDefaultData: LoopNodeData = {loopVariableReference: "",completeIfEmpty: false,continueOnFailure: false,+ model: null,} as const;export function isLoopNode(node: Node): node is LoopNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsxindex f762c611d..01cb83831 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx@@ -36,6 +36,7 @@ import { AppNode } from "..";import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";function NavigationNode({ id, data }: NodeProps<NavigationNode>) {const { updateNodeData } = useReactFlow();@@ -58,6 +59,7 @@ function NavigationNode({ id, data }: NodeProps<NavigationNode>) {completeCriterion: data.completeCriterion,terminateCriterion: data.terminateCriterion,engine: data.engine,+ model: data.model,includeActionHistoryInVerification: data.includeActionHistoryInVerification,});const deleteNodeCallback = useDeleteNodeCallback();@@ -198,6 +200,13 @@ function NavigationNode({ id, data }: NodeProps<NavigationNode>) {/></div><Separator />+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.tsindex 796941357..3457aaee5 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts@@ -29,6 +29,7 @@ export const navigationNodeDefaultData: NavigationNodeData = {completeCriterion: "",terminateCriterion: "",errorCodeMapping: "null",+ model: { model: "" },engine: RunEngine.SkyvernV1,maxRetries: null,maxStepsOverride: null,diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/PDFParserNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/PDFParserNode/types.tsindex f29f6affd..0edf685e2 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/PDFParserNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/PDFParserNode/types.ts@@ -15,6 +15,7 @@ export const pdfParserNodeDefaultData: PDFParserNodeData = {fileUrl: "",continueOnFailure: false,jsonSchema: "null",+ model: null,} as const;export function isPdfParserNode(node: AppNode): node is PDFParserNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.tsindex 8abf30b83..62e6ffbf4 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/SendEmailNode/types.ts@@ -36,4 +36,5 @@ export const sendEmailNodeDefaultData: SendEmailNodeData = {smtpUsernameSecretParameterKey: SMTP_USERNAME_PARAMETER_KEY,smtpPasswordSecretParameterKey: SMTP_PASSWORD_PARAMETER_KEY,continueOnFailure: false,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/StartNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/StartNode.tsxindex bc0a4835e..a6ba69566 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/StartNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/StartNode.tsx@@ -1,3 +1,4 @@+import { getClient } from "@/api/AxiosClient";import { Handle, NodeProps, Position, useReactFlow } from "@xyflow/react";import type { StartNode } from "./types";import {@@ -8,15 +9,38 @@ import {} from "@/components/ui/accordion";import { useState } from "react";import { ProxyLocation } from "@/api/types";+import { useQuery } from "@tanstack/react-query";import { Label } from "@/components/ui/label";import { HelpTooltip } from "@/components/HelpTooltip";import { Input } from "@/components/ui/input";import { ProxySelector } from "@/components/ProxySelector";+import {+ Select,+ SelectTrigger,+ SelectValue,+ SelectContent,+ SelectItem,+} from "@/components/ui/select";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";import { Switch } from "@/components/ui/switch";import { Separator } from "@/components/ui/separator";+import { ModelsResponse } from "@/api/types";function StartNode({ id, data }: NodeProps<StartNode>) {+ const credentialGetter = useCredentialGetter();const { updateNodeData } = useReactFlow();++ const { data: availableModels } = useQuery<ModelsResponse>({+ queryKey: ["models"],+ queryFn: async () => {+ const client = await getClient(credentialGetter);++ return client.get("/models").then((res) => res.data);+ },+ });++ const models = availableModels?.models ?? [];+const [inputs, setInputs] = useState({webhookCallbackUrl: data.withWorkflowSettings? data.webhookCallbackUrl@@ -27,6 +51,7 @@ function StartNode({ id, data }: NodeProps<StartNode>) {persistBrowserSession: data.withWorkflowSettings? data.persistBrowserSession: false,+ model: data.withWorkflowSettings ? data.model : { model: models[0] || "" },});function handleChange(key: string, value: unknown) {@@ -57,6 +82,29 @@ function StartNode({ id, data }: NodeProps<StartNode>) {</AccordionTrigger><AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4">+ <div className="space-y-2">+ <div className="flex gap-2">+ <Label>Model</Label>+ <HelpTooltip content="The LLM model to use for this workflow" />+ </div>+ <Select+ value={inputs.model?.model ?? "Skyvern Optimized"}+ onValueChange={(value) => {+ handleChange("model", { model: value });+ }}+ >+ <SelectTrigger>+ <SelectValue placeholder="Select model" />+ </SelectTrigger>+ <SelectContent>+ {models.map((m) => (+ <SelectItem key={m} value={m}>+ {m}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div><div className="space-y-2"><div className="flex gap-2"><Label>Webhook Callback URL</Label>diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/types.tsindex f0c4ef209..b931e097e 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/types.ts@@ -1,12 +1,14 @@import { ProxyLocation } from "@/api/types";import type { Node } from "@xyflow/react";import { AppNode } from "..";+import { WorkflowModel } from "@/routes/workflows/types/workflowTypes";export type WorkflowStartNodeData = {withWorkflowSettings: true;webhookCallbackUrl: string;proxyLocation: ProxyLocation;persistBrowserSession: boolean;+ model: WorkflowModel;editable: boolean;};diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsxindex 2a29db9d2..82808f2a1 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx@@ -37,6 +37,7 @@ import type { TaskNode } from "./types";import { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";import { RunEngineSelector } from "@/components/EngineSelector";+import { ModelSelector } from "@/components/ModelSelector";function TaskNode({ id, data }: NodeProps<TaskNode>) {const { updateNodeData } = useReactFlow();@@ -69,6 +70,7 @@ function TaskNode({ id, data }: NodeProps<TaskNode>) {totpIdentifier: data.totpIdentifier,includeActionHistoryInVerification: data.includeActionHistoryInVerification,engine: data.engine,+ model: data.model,});function handleChange(key: string, value: unknown) {@@ -231,6 +233,13 @@ function TaskNode({ id, data }: NodeProps<TaskNode>) {/></div><Separator />+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.tsindex d37c93a1a..2180dca86 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts@@ -45,6 +45,7 @@ export const taskNodeDefaultData: TaskNodeData = {cacheActions: false,includeActionHistoryInVerification: false,engine: RunEngine.SkyvernV1,+ model: null,} as const;export function isTaskNode(node: Node): node is TaskNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/Taskv2Node.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/Taskv2Node.tsxindex dd4b6c73a..f4defd458 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/Taskv2Node.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/Taskv2Node.tsx@@ -20,6 +20,7 @@ import { NodeActionMenu } from "../NodeActionMenu";import { WorkflowBlockIcon } from "../WorkflowBlockIcon";import { EditableNodeTitle } from "../components/EditableNodeTitle";import { MAX_STEPS_DEFAULT, type Taskv2Node } from "./types";+import { ModelSelector } from "@/components/ModelSelector";function Taskv2Node({ id, data, type }: NodeProps<Taskv2Node>) {const { updateNodeData } = useReactFlow();@@ -38,6 +39,7 @@ function Taskv2Node({ id, data, type }: NodeProps<Taskv2Node>) {totpVerificationUrl: data.totpVerificationUrl,totpIdentifier: data.totpIdentifier,maxSteps: data.maxSteps,+ model: data.model,});function handleChange(key: string, value: unknown) {@@ -131,6 +133,13 @@ function Taskv2Node({ id, data, type }: NodeProps<Taskv2Node>) {</AccordionTrigger><AccordionContent className="pl-6 pr-1 pt-4"><div className="space-y-4">+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><div className="space-y-2"><div className="flex gap-2"><Label className="text-xs text-slate-300">Max Steps</Label>diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/types.tsindex 8329b53fd..cafdea7da 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/Taskv2Node/types.ts@@ -22,6 +22,7 @@ export const taskv2NodeDefaultData: Taskv2NodeData = {totpIdentifier: null,totpVerificationUrl: null,maxSteps: MAX_STEPS_DEFAULT,+ model: null,};export function isTaskV2Node(node: Node): node is Taskv2Node {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/TextPromptNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/TextPromptNode.tsxindex 080c716d2..16b16d3d3 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/TextPromptNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/TextPromptNode.tsx@@ -25,6 +25,7 @@ import { WorkflowBlockInputTextarea } from "@/components/WorkflowBlockInputTextaimport { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";import { dataSchemaExampleValue } from "../types";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";+import { ModelSelector } from "@/components/ModelSelector";function TextPromptNode({ id, data }: NodeProps<TextPromptNode>) {const { updateNodeData } = useReactFlow();@@ -33,6 +34,7 @@ function TextPromptNode({ id, data }: NodeProps<TextPromptNode>) {const [inputs, setInputs] = useState({prompt: data.prompt,jsonSchema: data.jsonSchema,+ model: data.model,});const nodes = useNodes<AppNode>();@@ -127,6 +129,13 @@ function TextPromptNode({ id, data }: NodeProps<TextPromptNode>) {/></div><Separator />+ <ModelSelector+ className="nopan w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><WorkflowDataSchemaInputGroupexampleValue={dataSchemaExampleValue}value={inputs.jsonSchema}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/types.tsindex a1e1d6ce4..29806fc0d 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TextPromptNode/types.ts@@ -17,6 +17,7 @@ export const textPromptNodeDefaultData: TextPromptNodeData = {jsonSchema: "null",continueOnFailure: false,parameterKeys: [],+ model: null,} as const;export function isTextPromptNode(node: AppNode): node is TextPromptNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/URLNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/URLNode/types.tsindex 937108c1d..94c81bcaa 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/URLNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/URLNode/types.ts@@ -12,6 +12,7 @@ export const urlNodeDefaultData: URLNodeData = {continueOnFailure: false,url: "",editable: true,+ model: null,};export function isUrlNode(node: Node): node is URLNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/UploadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/UploadNode/types.tsindex f2bc75a3b..b0529dcaa 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/UploadNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/UploadNode/types.ts@@ -14,4 +14,5 @@ export const uploadNodeDefaultData: UploadNodeData = {label: "",path: SKYVERN_DOWNLOAD_DIRECTORY,continueOnFailure: false,+ model: null,} as const;diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsxindex 13a3147b4..aa01fba6f 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/ValidationNode.tsx@@ -33,6 +33,7 @@ import { AppNode } from "..";import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";+import { ModelSelector } from "@/components/ModelSelector";function ValidationNode({ id, data }: NodeProps<ValidationNode>) {const { updateNodeData } = useReactFlow();@@ -45,6 +46,7 @@ function ValidationNode({ id, data }: NodeProps<ValidationNode>) {completeCriterion: data.completeCriterion,terminateCriterion: data.terminateCriterion,errorCodeMapping: data.errorCodeMapping,+ model: data.model,});const deleteNodeCallback = useDeleteNodeCallback();const nodes = useNodes<AppNode>();@@ -139,6 +141,13 @@ function ValidationNode({ id, data }: NodeProps<ValidationNode>) {<AccordionContent><div className="ml-6 mt-4 space-y-4"><div className="space-y-2">+ <ModelSelector+ className="nopan mr-[1px] w-52 text-xs"+ value={inputs.model}+ onChange={(value) => {+ handleChange("model", value);+ }}+ /><ParametersMultiSelectavailableOutputParameters={outputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.tsindex f1a3183c0..20c869cd0 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ValidationNode/types.ts@@ -18,6 +18,7 @@ export const validationNodeDefaultData: ValidationNodeData = {continueOnFailure: false,editable: true,parameterKeys: [],+ model: null,};export function isValidationNode(node: Node): node is ValidationNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WaitNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/WaitNode/types.tsindex 9063f75c9..8fe5c8336 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/WaitNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WaitNode/types.ts@@ -12,6 +12,7 @@ export const waitNodeDefaultData: WaitNodeData = {continueOnFailure: false,editable: true,waitInSeconds: "1",+ model: null,};export function isWaitNode(node: Node): node is WaitNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/types.tsindex e6ff06b80..7d772afc1 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/types.ts@@ -1,9 +1,11 @@import { WorkflowBlockType } from "../../types/workflowTypes";+import type { WorkflowModel } from "../../types/workflowTypes";export type NodeBaseData = {label: string;continueOnFailure: boolean;editable: boolean;+ model: WorkflowModel | null;};export const errorMappingExampleValue = {diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.tsindex 9f690608f..c3efcbe81 100644--- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts+++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts@@ -100,6 +100,7 @@ import { taskv2NodeDefaultData } from "./nodes/Taskv2Node/types";import { urlNodeDefaultData } from "./nodes/URLNode/types";import { fileUploadNodeDefaultData } from "./nodes/FileUploadNode/types";export const NEW_NODE_LABEL_PREFIX = "block_";+const DEFAULT_MODEL = { model: "Skyvern Optimized" };function layoutUtil(nodes: Array<AppNode>,@@ -208,6 +209,7 @@ function convertToNode(label: block.label,continueOnFailure: block.continue_on_failure,editable,+ model: block.model,};switch (block.block_type) {case "task": {@@ -660,6 +662,7 @@ function getElements(persistBrowserSession: settings.persistBrowserSession,proxyLocation: settings.proxyLocation ?? ProxyLocation.Residential,webhookCallbackUrl: settings.webhookCallbackUrl ?? "",+ model: settings.model ?? DEFAULT_MODEL,editable,}),);@@ -958,6 +961,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {const base = {label: node.data.label,continue_on_failure: node.data.continueOnFailure,+ model: node.data.model,};switch (node.type) {case "task": {@@ -1318,6 +1322,7 @@ function getWorkflowSettings(nodes: Array<AppNode>): WorkflowSettings {persistBrowserSession: false,proxyLocation: ProxyLocation.Residential,webhookCallbackUrl: null,+ model: DEFAULT_MODEL,};const startNodes = nodes.filter(isStartNode);const startNodeWithWorkflowSettings = startNodes.find(@@ -1332,6 +1337,7 @@ function getWorkflowSettings(nodes: Array<AppNode>): WorkflowSettings {persistBrowserSession: data.persistBrowserSession,proxyLocation: data.proxyLocation,webhookCallbackUrl: data.webhookCallbackUrl,+ model: data.model,};}return defaultSettings;@@ -1778,6 +1784,7 @@ function convertBlocksToBlockYAML(url: block.url,title: block.title,engine: block.engine,+ model: block.model,navigation_goal: block.navigation_goal,error_code_mapping: block.error_code_mapping,max_retries: block.max_retries,@@ -1973,8 +1980,9 @@ function convert(workflow: WorkflowApiResponse): WorkflowCreateYAMLRequest {description: workflow.description,proxy_location: workflow.proxy_location,webhook_callback_url: workflow.webhook_callback_url,- totp_verification_url: workflow.totp_verification_url,persist_browser_session: workflow.persist_browser_session,+ model: workflow.model,+ totp_verification_url: workflow.totp_verification_url,workflow_definition: {parameters: convertParametersToParameterYAML(userParameters),blocks: convertBlocksToBlockYAML(workflow.workflow_definition.blocks),diff --git a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowTypes.tsindex 21c504f00..dd656d371 100644--- a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts+++ b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts@@ -1,3 +1,4 @@+import { JsonObjectExtendable } from "@/types";import { ProxyLocation, RunEngine } from "@/api/types";export type WorkflowParameterBase = {@@ -231,6 +232,7 @@ export type WorkflowBlockBase = {block_type: WorkflowBlockType;output_parameter: OutputParameter;continue_on_failure: boolean;+ model: WorkflowModel | null;};export type TaskBlock = WorkflowBlockBase & {@@ -449,6 +451,7 @@ export type WorkflowApiResponse = {proxy_location: ProxyLocation | null;webhook_callback_url: string | null;persist_browser_session: boolean;+ model: WorkflowModel | null;totp_verification_url: string | null;totp_identifier: string | null;created_at: string;@@ -460,8 +463,11 @@ export type WorkflowSettings = {proxyLocation: ProxyLocation | null;webhookCallbackUrl: string | null;persistBrowserSession: boolean;+ model: WorkflowModel | null;};+export type WorkflowModel = JsonObjectExtendable<{ model: string }>;+export function isOutputParameter(parameter: Parameter,): parameter is OutputParameter {diff --git a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.tsindex 80f34e526..1c18920f3 100644--- a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts+++ b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts@@ -1,5 +1,6 @@import { RunEngine } from "@/api/types";import { WorkflowBlockType } from "./workflowTypes";+import { WorkflowModel } from "./workflowTypes";export type WorkflowCreateYAMLRequest = {title: string;@@ -7,6 +8,7 @@ export type WorkflowCreateYAMLRequest = {proxy_location?: string | null;webhook_callback_url?: string | null;persist_browser_session?: boolean;+ model?: WorkflowModel | null;totp_verification_url?: string | null;workflow_definition: WorkflowDefinitionYAML;is_saved_task?: boolean;@@ -189,6 +191,7 @@ export type NavigationBlockYAML = BlockYAMLBase & {complete_criterion: string | null;terminate_criterion: string | null;engine: RunEngine | null;+ model: WorkflowModel | null;include_action_history_in_verification: boolean;};diff --git a/skyvern-frontend/src/types.ts b/skyvern-frontend/src/types.tsindex c940f5490..070c3f34a 100644--- a/skyvern-frontend/src/types.ts+++ b/skyvern-frontend/src/types.ts@@ -1,3 +1,20 @@export type SubmitEvent = Event & {submitter: Element;};++export type JsonValue =+ | string+ | number+ | boolean+ | null+ | { [key: string]: JsonValue }+ | JsonValue[];++export type JsonObject = { [key: string]: JsonValue };++/**+ * Use when you know a part of the JSON object, but there may be more bits that+ * you don't know or care about (yet).+ */+export type JsonObjectExtendable<T extends { [key: string]: JsonValue }> =+ JsonObject & T;