Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
PrintPage Block - add parameters in advanced settings and enable debugging (#4491)
Marc Kelechavaa795254f45a8
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/PrintPageNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/PrintPageNode.tsxindex a9a7a17c1..33305f21a 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/PrintPageNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/PrintPageNode.tsx@@ -1,6 +1,6 @@import { HelpTooltip } from "@/components/HelpTooltip";import { Label } from "@/components/ui/label";-import { Handle, NodeProps, Position } from "@xyflow/react";+import { Handle, NodeProps, Position, useNodes, useEdges } from "@xyflow/react";import type { PrintPageNode } from "./types";import { Input } from "@/components/ui/input";import { Switch } from "@/components/ui/switch";@@ -24,6 +24,9 @@ import { useParams } from "react-router-dom";import { statusIsRunningOrQueued } from "@/routes/tasks/types";import { useWorkflowRunQuery } from "@/routes/workflows/hooks/useWorkflowRunQuery";import { useUpdate } from "@/routes/workflows/editor/useUpdate";+import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";+import { AppNode } from "..";+import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";function PrintPageNode({ id, data }: NodeProps<PrintPageNode>) {const { editable, label } = data;@@ -36,6 +39,9 @@ function PrintPageNode({ id, data }: NodeProps<PrintPageNode>) {const thisBlockIsPlaying =workflowRunIsRunningOrQueued && thisBlockIsTargetted;+ const nodes = useNodes<AppNode>();+ const edges = useEdges();+ const outputParameterKeys = getAvailableOutputParameterKeys(nodes, edges, id);const update = useUpdate<PrintPageNode["data"]>({ id, editable });return (@@ -126,6 +132,13 @@ function PrintPageNode({ id, data }: NodeProps<PrintPageNode>) {</AccordionTrigger><AccordionContent className="pl-6 pr-1 pt-1"><div className="space-y-4">+ <ParametersMultiSelect+ availableOutputParameters={outputParameterKeys}+ parameters={data.parameterKeys}+ onParametersChange={(parameterKeys) => {+ update({ parameterKeys });+ }}+ /><div className="space-y-2"><Label className="text-xs text-slate-300">Custom Filenamediff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/types.tsindex 97bb52956..354d883b5 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/PrintPageNode/types.ts@@ -8,6 +8,7 @@ export type PrintPageNodeData = NodeBaseData & {format: string;landscape: boolean;printBackground: boolean;+ parameterKeys: Array<string>;};export type PrintPageNode = Node<PrintPageNodeData, "printPage">;@@ -23,6 +24,7 @@ export const printPageNodeDefaultData: PrintPageNodeData = {format: "A4",landscape: false,printBackground: true,+ parameterKeys: [],};export function isPrintPageNode(node: Node): node is PrintPageNode {diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsxindex a244d36b3..bef5bee42 100644--- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx@@ -207,7 +207,8 @@ function WorkflowParametersPanel({ onMouseDownCapture }: Props) {node.type === "action" ||node.type === "http_request" ||node.type === "validation" ||- node.type === "codeBlock"+ node.type === "codeBlock" ||+ node.type === "printPage") {const parameterKeys = node.data.parameterKeys as Array<string> | null;@@ -313,7 +314,8 @@ function WorkflowParametersPanel({ onMouseDownCapture }: Props) {node.type === "action" ||node.type === "http_request" ||node.type === "validation" ||- node.type === "codeBlock"+ node.type === "codeBlock" ||+ node.type === "printPage") {const parameterKeys = node.data.parameterKeys as Array<string> | null;diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.tsindex 02ec34c54..fee0911e0 100644--- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts+++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts@@ -853,6 +853,7 @@ function convertToNode(format: block.format ?? "A4",landscape: block.landscape ?? false,printBackground: block.print_background ?? true,+ parameterKeys: block.parameters.map((p) => p.key),},};}@@ -2369,6 +2370,7 @@ function getWorkflowBlock(format: node.data.format,landscape: node.data.landscape,print_background: node.data.printBackground,+ parameter_keys: node.data.parameterKeys,};}case "conditional": {@@ -3386,6 +3388,7 @@ function convertBlocksToBlockYAML(format: block.format,landscape: block.landscape,print_background: block.print_background,+ parameter_keys: block.parameters.map((p) => p.key),};return blockYaml;}diff --git a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowTypes.tsindex bffdd878e..5b615a948 100644--- a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts+++ b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts@@ -563,6 +563,7 @@ export type PrintPageBlock = WorkflowBlockBase & {format: string;landscape: boolean;print_background: boolean;+ parameters: Array<WorkflowParameter>;};export type WorkflowDefinition = {diff --git a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.tsindex 3cbd37501..81ced5740 100644--- a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts+++ b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts@@ -413,4 +413,5 @@ export type PrintPageBlockYAML = BlockYAMLBase & {format: string;landscape: boolean;print_background: boolean;+ parameter_keys?: Array<string> | null;};diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.pyindex 4954c3e76..2dddbcbe9 100644--- a/skyvern/forge/sdk/workflow/models/block.py+++ b/skyvern/forge/sdk/workflow/models/block.py@@ -244,6 +244,57 @@ class Block(BaseModel, abc.ABC):workflow_run_block_id=workflow_run_block_id,)+ async def get_or_create_browser_state(+ self,+ workflow_run_id: str,+ organization_id: str | None = None,+ browser_session_id: str | None = None,+ ) -> BrowserState | None:+ """+ Acquire or create browser state for block execution.++ Checks persistent sessions first (debugger use case), then falls back to+ workflow run browser manager. If no state exists, creates a new one.++ Returns BrowserState if successful, None if creation failed.+ """+ browser_state: BrowserState | None = None++ if browser_session_id and organization_id:+ browser_state = await app.PERSISTENT_SESSIONS_MANAGER.get_browser_state(browser_session_id, organization_id)+ else:+ browser_state = app.BROWSER_MANAGER.get_for_workflow_run(workflow_run_id)++ if not browser_state:+ workflow_run = await app.WORKFLOW_SERVICE.get_workflow_run(+ workflow_run_id=workflow_run_id,+ organization_id=organization_id,+ )+ try:+ browser_state = await app.BROWSER_MANAGER.get_or_create_for_workflow_run(+ workflow_run=workflow_run,+ url=None,+ browser_session_id=browser_session_id,+ browser_profile_id=workflow_run.browser_profile_id,+ )+ await browser_state.check_and_fix_state(+ url=None,+ proxy_location=workflow_run.proxy_location,+ workflow_run_id=workflow_run_id,+ organization_id=workflow_run.organization_id,+ extra_http_headers=workflow_run.extra_http_headers,+ browser_address=workflow_run.browser_address,+ browser_profile_id=workflow_run.browser_profile_id,+ )+ except Exception:+ LOG.exception(+ "Failed to create browser state",+ workflow_run_id=workflow_run_id,+ )+ return None++ return browser_state+def format_block_parameter_template_from_workflow_run_context(self,potential_template: str,@@ -1905,63 +1956,11 @@ async def wrapper():) -> BlockResult:await app.AGENT_FUNCTION.validate_code_block(organization_id=organization_id)- # TODO: only support to use code block to manupilate the browser page- # support browser context in the future- browser_state: BrowserState | None = None- if browser_session_id and organization_id:- LOG.info(- "Getting browser state for workflow run from persistent sessions manager",- browser_session_id=browser_session_id,- )- browser_state = await app.PERSISTENT_SESSIONS_MANAGER.get_browser_state(browser_session_id, organization_id)- if browser_state:- LOG.info("Was occupying session here, but no longer.", browser_session_id=browser_session_id)- else:- browser_state = app.BROWSER_MANAGER.get_for_workflow_run(workflow_run_id)-- # If no browser state exists, create one (e.g., when code block is the first block)- if not browser_state:- LOG.info(- "No browser state found, creating one for code block execution",- workflow_run_id=workflow_run_id,- browser_session_id=browser_session_id,- )- workflow_run = await app.WORKFLOW_SERVICE.get_workflow_run(- workflow_run_id=workflow_run_id,- organization_id=organization_id,- )- try:- browser_state = await app.BROWSER_MANAGER.get_or_create_for_workflow_run(- workflow_run=workflow_run,- url=None, # Code block doesn't need to navigate to a URL initially- browser_session_id=browser_session_id,- browser_profile_id=workflow_run.browser_profile_id,- )- # Ensure the browser state has a working page- await browser_state.check_and_fix_state(- url=None, # Don't navigate to any URL, just ensure a page exists- proxy_location=workflow_run.proxy_location,- workflow_run_id=workflow_run_id,- organization_id=workflow_run.organization_id,- extra_http_headers=workflow_run.extra_http_headers,- browser_address=workflow_run.browser_address,- browser_profile_id=workflow_run.browser_profile_id,- )- except Exception as e:- LOG.exception(- "Failed to create browser state for code block",- workflow_run_id=workflow_run_id,- error=str(e),- )- return await self.build_block_result(- success=False,- failure_reason=f"Failed to create browser for code block: {str(e)}",- output_parameter_value=None,- status=BlockStatus.failed,- workflow_run_block_id=workflow_run_block_id,- organization_id=organization_id,- )-+ browser_state = await self.get_or_create_browser_state(+ workflow_run_id=workflow_run_id,+ organization_id=organization_id,+ browser_session_id=browser_session_id,+ )if not browser_state:return await self.build_block_result(success=False,@@ -4484,11 +4483,12 @@ class PrintPageBlock(Block):format: str = "A4"landscape: bool = Falseprint_background: bool = True+ parameters: list[PARAMETER_TYPE] = []VALID_FORMATS: ClassVar[set[str]] = {"A4", "Letter", "Legal", "Tabloid"}def get_all_parameters(self, workflow_run_id: str) -> list[PARAMETER_TYPE]:- return []+ return self.parameters@staticmethoddef _sanitize_filename(filename: str) -> str:@@ -4577,8 +4577,12 @@ class PrintPageBlock(Block):**kwargs: dict,) -> BlockResult:workflow_run_context = self.get_workflow_run_context(workflow_run_id)- browser_state = app.BROWSER_MANAGER.get_for_workflow_run(workflow_run_id)+ browser_state = await self.get_or_create_browser_state(+ workflow_run_id=workflow_run_id,+ organization_id=organization_id,+ browser_session_id=browser_session_id,+ )if not browser_state:return await self.build_block_result(success=False,diff --git a/skyvern/forge/sdk/workflow/workflow_definition_converter.py b/skyvern/forge/sdk/workflow/workflow_definition_converter.pyindex 329d8a04f..30602c2fb 100644--- a/skyvern/forge/sdk/workflow/workflow_definition_converter.py+++ b/skyvern/forge/sdk/workflow/workflow_definition_converter.py@@ -693,6 +693,7 @@ def block_yaml_to_block(complete_verification=False,)elif block_yaml.block_type == BlockType.PRINT_PAGE:+ print_page_block_parameters = _resolve_block_parameters(block_yaml, parameters)return PrintPageBlock(**base_kwargs,include_timestamp=block_yaml.include_timestamp,@@ -700,6 +701,7 @@ def block_yaml_to_block(format=block_yaml.format,landscape=block_yaml.landscape,print_background=block_yaml.print_background,+ parameters=print_page_block_parameters,)raise ValueError(f"Invalid block type {block_yaml.block_type}")diff --git a/skyvern/schemas/workflows.py b/skyvern/schemas/workflows.pyindex 43c08df82..8f8faf2ef 100644--- a/skyvern/schemas/workflows.py+++ b/skyvern/schemas/workflows.py@@ -561,6 +561,7 @@ class PrintPageBlockYAML(BlockYAML):format: PDFFormat = PDFFormat.A4landscape: bool = Falseprint_background: bool = True+ parameter_keys: list[str] | None = NonePARAMETER_YAML_SUBCLASSES = (