Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
Replace file_suffix with file_name (but keep vairable name for backwards compatibility), Add path to Azure Blob, remove defaulted {workflow_run_id} (#3557)
Shuchang Zheng38a9ad2a6ba1
diff --git a/skyvern-frontend/src/routes/workflows/editor/helpContent.ts b/skyvern-frontend/src/routes/workflows/editor/helpContent.tsindex 373777404..08e39292d 100644--- a/skyvern-frontend/src/routes/workflows/editor/helpContent.ts+++ b/skyvern-frontend/src/routes/workflows/editor/helpContent.ts@@ -14,7 +14,7 @@ export const baseHelpTooltipContent = {completeOnDownload:"Allow Skyvern to auto-complete the block when it downloads a file.",fileSuffix:- "A file suffix that's automatically added to all downloaded files.",+ "The complete filename (without extension) for downloaded files. This replaces the entire filename instead of being appended to a random name.",errorCodeMapping:"Knowing about why a block terminated can be important, specify error messages here.",totpVerificationUrl:@@ -34,7 +34,7 @@ export const basePlaceholderContent = {dataExtractionGoal: "What data do you need to extract?",maxRetries: "Default: 3",maxStepsOverride: "Default: 10",- downloadSuffix: "Add an ID for downloaded files",+ downloadSuffix: "Enter the complete filename (without extension)",totpVerificationUrl: "Provide your 2FA endpoint",totpIdentifier: "Add an ID that links your TOTP to the block",};diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsxindex 95ebaa43d..59b89bba5 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx@@ -342,7 +342,7 @@ function ActionNode({ id, data, type }: NodeProps<ActionNode>) {<div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">- File Suffix+ File Name</Label><HelpTooltipcontent={helpTooltips["action"]["fileSuffix"]}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsxindex 7c1361e95..b6a97d349 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx@@ -316,7 +316,7 @@ function FileDownloadNode({ id, data }: NodeProps<FileDownloadNode>) {<div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">- File Suffix+ File Name</Label><HelpTooltipcontent={helpTooltips["download"]["fileSuffix"]}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/FileUploadNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/FileUploadNode.tsxindex 8578590fe..342f7d94a 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/FileUploadNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/FileUploadNode.tsx@@ -261,6 +261,22 @@ function FileUploadNode({ id, data }: NodeProps<FileUploadNode>) {className="nopan text-xs"/></div>+ <div className="space-y-2">+ <div className="flex items-center gap-2">+ <Label className="text-sm text-slate-400">+ (Optional) Folder Path+ </Label>+ <HelpTooltip content="Optional folder path within the blob container. Defaults to {{ workflow_run_id }} if not specified." />+ </div>+ <WorkflowBlockInputTextarea+ nodeId={id}+ onChange={(value) => {+ handleChange("path", value);+ }}+ value={inputs.path as string}+ className="nopan text-xs"+ />+ </div></>)}</div>diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.tsindex bd3ec1e8a..6dc6ea030 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileUploadNode/types.ts@@ -22,7 +22,7 @@ export const fileUploadNodeDefaultData: FileUploadNodeData = {editable: true,storageType: "s3",label: "",- path: "",+ path: "{{ workflow_run_id }}",s3Bucket: null,awsAccessKeyId: null,awsSecretAccessKey: null,diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsxindex 3cacc0e38..f3210423b 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx@@ -402,7 +402,7 @@ function NavigationNode({ id, data, type }: NodeProps<NavigationNode>) {<div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">- File Suffix+ File Name</Label><HelpTooltipcontent={helpTooltips["navigation"]["fileSuffix"]}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsxindex e1ce94aba..1749958a2 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx@@ -417,7 +417,7 @@ function TaskNode({ id, data, type }: NodeProps<TaskNode>) {<div className="flex items-center justify-between"><div className="flex gap-2"><Label className="text-xs font-normal text-slate-300">- File Suffix+ File Name</Label><HelpTooltipcontent={helpTooltips["task"]["fileSuffix"]}diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.pyindex 05c55345a..7ca9e6519 100644--- a/skyvern/forge/agent.py+++ b/skyvern/forge/agent.py@@ -538,11 +538,14 @@ class ForgeAgent:)continue- random_file_id = "".join(random.choices(string.ascii_uppercase + string.digits, k=4))- random_file_name = f"download-{datetime.now().strftime('%Y%m%d%H%M%S%f')}-{random_file_id}"if task_block.download_suffix:- random_file_name = f"{random_file_name}-{task_block.download_suffix}"- rename_file(os.path.join(workflow_download_directory, file), random_file_name + file_extension)+ # Use download_suffix as the complete filename (without extension)+ final_file_name = task_block.download_suffix+ else:+ # Fallback to random filename if no download_suffix provided+ random_file_id = "".join(random.choices(string.ascii_uppercase + string.digits, k=4))+ final_file_name = f"download-{datetime.now().strftime('%Y%m%d%H%M%S%f')}-{random_file_id}"+ rename_file(os.path.join(workflow_download_directory, file), final_file_name + file_extension)LOG.info("Task marked as completed due to download",diff --git a/skyvern/forge/sdk/workflow/context_manager.py b/skyvern/forge/sdk/workflow/context_manager.pyindex 4c2309cd4..a1a1b8a4f 100644--- a/skyvern/forge/sdk/workflow/context_manager.py+++ b/skyvern/forge/sdk/workflow/context_manager.py@@ -58,6 +58,10 @@ class WorkflowRunContext:cls,aws_client: AsyncAWSClient,organization: Organization,+ workflow_run_id: str,+ workflow_title: str,+ workflow_id: str,+ workflow_permanent_id: str,workflow_parameter_tuples: list[tuple[WorkflowParameter, "WorkflowRunParameter"]],workflow_output_parameters: list[OutputParameter],context_parameters: list[ContextParameter],@@ -71,7 +75,14 @@ class WorkflowRunContext:block_outputs: dict[str, Any] | None = None,) -> Self:# key is label name- workflow_run_context = cls(aws_client=aws_client)+ workflow_run_context = cls(+ workflow_title=workflow_title,+ workflow_id=workflow_id,+ workflow_permanent_id=workflow_permanent_id,+ workflow_run_id=workflow_run_id,+ aws_client=aws_client,+ )+for parameter, run_parameter in workflow_parameter_tuples:if parameter.workflow_parameter_type == WorkflowParameterType.CREDENTIAL_ID:await workflow_run_context.register_secret_workflow_parameter_value(@@ -133,7 +144,18 @@ class WorkflowRunContext:return workflow_run_context- def __init__(self, aws_client: AsyncAWSClient) -> None:+ def __init__(+ self,+ workflow_title: str,+ workflow_id: str,+ workflow_permanent_id: str,+ workflow_run_id: str,+ aws_client: AsyncAWSClient,+ ) -> None:+ self.workflow_title = workflow_title+ self.workflow_id = workflow_id+ self.workflow_permanent_id = workflow_permanent_id+ self.workflow_run_id = workflow_run_idself.blocks_metadata: dict[str, BlockMetadata] = {}self.parameters: dict[str, PARAMETER_TYPE] = {}self.values: dict[str, Any] = {}@@ -953,6 +975,9 @@ class WorkflowContextManager:self,organization: Organization,workflow_run_id: str,+ workflow_title: str,+ workflow_id: str,+ workflow_permanent_id: str,workflow_parameter_tuples: list[tuple[WorkflowParameter, "WorkflowRunParameter"]],workflow_output_parameters: list[OutputParameter],context_parameters: list[ContextParameter],@@ -967,6 +992,10 @@ class WorkflowContextManager:workflow_run_context = await WorkflowRunContext.init(self.aws_client,organization,+ workflow_run_id,+ workflow_title,+ workflow_id,+ workflow_permanent_id,workflow_parameter_tuples,workflow_output_parameters,context_parameters,diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.pyindex 9cbac9dd6..dcf9f5ef8 100644--- a/skyvern/forge/sdk/workflow/models/block.py+++ b/skyvern/forge/sdk/workflow/models/block.py@@ -196,6 +196,7 @@ class Block(BaseModel, abc.ABC):template_data[self.label] = block_reference_data+ # TODO (suchintan): This is pretty hacky - we should have a standard way to initialize the workflow run context# inject the forloop metadata as global variablesif "current_index" in block_reference_data:template_data["current_index"] = block_reference_data["current_index"]@@ -204,6 +205,16 @@ class Block(BaseModel, abc.ABC):if "current_value" in block_reference_data:template_data["current_value"] = block_reference_data["current_value"]+ # Initialize workflow-level parameters+ if "workflow_title" not in template_data:+ template_data["workflow_title"] = workflow_run_context.workflow_title+ if "workflow_id" not in template_data:+ template_data["workflow_id"] = workflow_run_context.workflow_id+ if "workflow_permanent_id" not in template_data:+ template_data["workflow_permanent_id"] = workflow_run_context.workflow_permanent_id+ if "workflow_run_id" not in template_data:+ template_data["workflow_run_id"] = workflow_run_context.workflow_run_id+return template.render(template_data)@classmethod@@ -1933,6 +1944,7 @@ class FileUploadBlock(Block):def format_potential_template_parameters(self, workflow_run_context: WorkflowRunContext) -> None:if self.path:self.path = self.format_block_parameter_template_from_workflow_run_context(self.path, workflow_run_context)+if self.s3_bucket:self.s3_bucket = self.format_block_parameter_template_from_workflow_run_context(self.s3_bucket, workflow_run_context@@ -1959,14 +1971,14 @@ class FileUploadBlock(Block):)def _get_s3_uri(self, workflow_run_id: str, path: str) -> str:- s3_suffix = f"{workflow_run_id}/{uuid.uuid4()}_{Path(path).name}"- if not self.path:- return f"s3://{self.s3_bucket}/{s3_suffix}"- return f"s3://{self.s3_bucket}/{self.path}/{s3_suffix}"+ folder_path = self.path or f"{workflow_run_id}"+ s3_suffix = f"{uuid.uuid4()}_{Path(path).name}"+ return f"s3://{self.s3_bucket}/{folder_path}/{s3_suffix}"def _get_azure_blob_uri(self, workflow_run_id: str, file_path: str) -> str:blob_name = Path(file_path).name- return f"https://{self.azure_storage_account_name}.blob.core.windows.net/{self.azure_blob_container_name}/{workflow_run_id}/{uuid.uuid4()}_{blob_name}"+ folder_path = self.path or workflow_run_id+ return f"https://{self.azure_storage_account_name}.blob.core.windows.net/{self.azure_blob_container_name}/{folder_path}/{uuid.uuid4()}_{blob_name}"async def execute(self,diff --git a/skyvern/forge/sdk/workflow/models/parameter.py b/skyvern/forge/sdk/workflow/models/parameter.pyindex db071cbc5..45939f994 100644--- a/skyvern/forge/sdk/workflow/models/parameter.py+++ b/skyvern/forge/sdk/workflow/models/parameter.py@@ -8,7 +8,15 @@ from pydantic import BaseModel, ConfigDict, Fieldfrom skyvern.exceptions import InvalidWorkflowParameter-RESERVED_PARAMETER_KEYS = ["current_item", "current_value", "current_index"]+RESERVED_PARAMETER_KEYS = [+ "current_item",+ "current_value",+ "current_index",+ "workflow_title",+ "workflow_id",+ "workflow_permanent_id",+ "workflow_run_id",+]class ParameterType(StrEnum):diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.pyindex 345bfda85..1a4041eed 100644--- a/skyvern/forge/sdk/workflow/service.py+++ b/skyvern/forge/sdk/workflow/service.py@@ -320,6 +320,9 @@ class WorkflowService:await app.WORKFLOW_CONTEXT_MANAGER.initialize_workflow_run_context(organization,workflow_run_id,+ workflow.title,+ workflow.workflow_id,+ workflow.workflow_permanent_id,wp_wps_tuples,workflow_output_parameters,context_parameters,diff --git a/skyvern/schemas/workflows.py b/skyvern/schemas/workflows.pyindex f63c396f3..e47f89a87 100644--- a/skyvern/schemas/workflows.py+++ b/skyvern/schemas/workflows.py@@ -210,7 +210,9 @@ class TaskBlockYAML(BlockYAML):max_steps_per_run: int | None = Noneparameter_keys: list[str] | None = Nonecomplete_on_download: bool = False- download_suffix: str | None = None+ download_suffix: str | None = (+ None # DEPRECATED: This field now sets the complete filename instead of appending to a random name+ )totp_verification_url: str | None = Nonetotp_identifier: str | None = Nonecache_actions: bool = False@@ -287,6 +289,7 @@ class FileUploadBlockYAML(BlockYAML):azure_storage_account_name: str | None = Noneazure_storage_account_key: str | None = Noneazure_blob_container_name: str | None = None+ azure_folder_path: str | None = Nonepath: str | None = None@@ -343,7 +346,9 @@ class ActionBlockYAML(BlockYAML):max_retries: int = 0parameter_keys: list[str] | None = Nonecomplete_on_download: bool = False- download_suffix: str | None = None+ download_suffix: str | None = (+ None # DEPRECATED: This field now sets the complete filename instead of appending to a random name+ )totp_verification_url: str | None = Nonetotp_identifier: str | None = Nonecache_actions: bool = False@@ -361,7 +366,9 @@ class NavigationBlockYAML(BlockYAML):max_steps_per_run: int | None = Noneparameter_keys: list[str] | None = Nonecomplete_on_download: bool = False- download_suffix: str | None = None+ download_suffix: str | None = (+ None # DEPRECATED: This field now sets the complete filename instead of appending to a random name+ )totp_verification_url: str | None = Nonetotp_identifier: str | None = Nonecache_actions: bool = False@@ -420,7 +427,9 @@ class FileDownloadBlockYAML(BlockYAML):max_retries: int = 0max_steps_per_run: int | None = Noneparameter_keys: list[str] | None = None- download_suffix: str | None = None+ download_suffix: str | None = (+ None # DEPRECATED: This field now sets the complete filename instead of appending to a random name+ )totp_verification_url: str | None = Nonetotp_identifier: str | None = Nonecache_actions: bool = Falsediff --git a/skyvern/services/task_v2_service.py b/skyvern/services/task_v2_service.pyindex b8bf2a51b..faa3ec85b 100644--- a/skyvern/services/task_v2_service.py+++ b/skyvern/services/task_v2_service.py@@ -489,7 +489,9 @@ async def run_task_v2_helper(task_v2_id=task_v2_id, organization_id=organization_id, status=TaskV2Status.running)await app.WORKFLOW_SERVICE.mark_workflow_run_as_running(workflow_run_id=workflow_run.workflow_run_id)- await _set_up_workflow_context(workflow_id, workflow_run_id, organization)++ workflow = await app.WORKFLOW_SERVICE.get_workflow(workflow_id=workflow_run.workflow_id)+ await _set_up_workflow_context(workflow, workflow_run_id, organization)url = str(task_v2.url)user_prompt = task_v2.prompt@@ -1010,16 +1012,21 @@ async def handle_block_result()-async def _set_up_workflow_context(workflow_id: str, workflow_run_id: str, organization: Organization) -> None:+async def _set_up_workflow_context(workflow: Workflow, workflow_run_id: str, organization: Organization) -> None:"""TODO: see if we could remove this function as we can just set an empty workflow context"""# Get all <workflow parameter, workflow run parameter> tupleswp_wps_tuples = await app.WORKFLOW_SERVICE.get_workflow_run_parameter_tuples(workflow_run_id=workflow_run_id)- workflow_output_parameters = await app.WORKFLOW_SERVICE.get_workflow_output_parameters(workflow_id=workflow_id)+ workflow_output_parameters = await app.WORKFLOW_SERVICE.get_workflow_output_parameters(+ workflow_id=workflow.workflow_id+ )await app.WORKFLOW_CONTEXT_MANAGER.initialize_workflow_run_context(organization,workflow_run_id,+ workflow.title,+ workflow.workflow_id,+ workflow.workflow_permanent_id,wp_wps_tuples,workflow_output_parameters,[],