From 12da878eb2b20c6a6f44deb51982efff76f7f5a8 Mon Sep 17 00:00:00 2001 From: LawyZheng Date: Mon, 30 Dec 2024 16:53:06 +0800 Subject: [PATCH] fix prepend scheme for workflow url (#1436) --- skyvern/forge/agent.py | 8 +------- skyvern/forge/sdk/workflow/models/block.py | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.py index 80411177..e1789fcd 100644 --- a/skyvern/forge/agent.py +++ b/skyvern/forge/agent.py @@ -48,7 +48,6 @@ from skyvern.forge.sdk.api.files import get_path_for_workflow_download_directory from skyvern.forge.sdk.artifact.models import ArtifactType from skyvern.forge.sdk.core import skyvern_context from skyvern.forge.sdk.core.security import generate_skyvern_signature -from skyvern.forge.sdk.core.validators import prepend_scheme_and_validate_url from skyvern.forge.sdk.db.enums import TaskType from skyvern.forge.sdk.log_artifacts import save_step_logs, save_task_logs from skyvern.forge.sdk.models import Step, StepStatus @@ -141,11 +140,6 @@ class ForgeAgent: task_url = working_page.url - task_url = prepend_scheme_and_validate_url(task_url) - totp_verification_url = task_block.totp_verification_url - if totp_verification_url: - totp_verification_url = prepend_scheme_and_validate_url(totp_verification_url) - task = await app.DATABASE.create_task( url=task_url, task_type=task_block.task_type, @@ -153,7 +147,7 @@ class ForgeAgent: terminate_criterion=task_block.terminate_criterion, title=task_block.title or task_block.label, webhook_callback_url=None, - totp_verification_url=totp_verification_url, + totp_verification_url=task_block.totp_verification_url, totp_identifier=task_block.totp_identifier, navigation_goal=task_block.navigation_goal, data_extraction_goal=task_block.data_extraction_goal, diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.py index b156c6fd..f9ce8a58 100644 --- a/skyvern/forge/sdk/workflow/models/block.py +++ b/skyvern/forge/sdk/workflow/models/block.py @@ -44,6 +44,7 @@ from skyvern.forge.sdk.api.files import ( ) from skyvern.forge.sdk.api.llm.api_handler_factory import LLMAPIHandlerFactory from skyvern.forge.sdk.artifact.models import ArtifactType +from skyvern.forge.sdk.core.validators import prepend_scheme_and_validate_url from skyvern.forge.sdk.db.enums import TaskType from skyvern.forge.sdk.schemas.tasks import Task, TaskOutput, TaskStatus from skyvern.forge.sdk.workflow.context_manager import BlockMetadata, WorkflowRunContext @@ -290,6 +291,7 @@ class BaseTaskBlock(Block): if self.url: self.url = self.format_block_parameter_template_from_workflow_run_context(self.url, workflow_run_context) + self.url = prepend_scheme_and_validate_url(self.url) if self.totp_identifier: self.totp_identifier = self.format_block_parameter_template_from_workflow_run_context( @@ -300,6 +302,7 @@ class BaseTaskBlock(Block): self.totp_verification_url = self.format_block_parameter_template_from_workflow_run_context( self.totp_verification_url, workflow_run_context ) + self.totp_verification_url = prepend_scheme_and_validate_url(self.totp_verification_url) if self.download_suffix: self.download_suffix = self.format_block_parameter_template_from_workflow_run_context(