vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix prepend scheme for workflow url (#1436)

Browse Source
This commit is contained in:
LawyZheng
2024-12-30 16:53:06 +08:00
committed by GitHub
parent 4962dbe325
commit 12da878eb2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
skyvern/forge/agent.py
View File

@@ -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.artifact.models import ArtifactType
from skyvern.forge.sdk.core import skyvern_context from skyvern.forge.sdk.core import skyvern_context
from skyvern.forge.sdk.core.security import generate_skyvern_signature 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.db.enums import TaskType
from skyvern.forge.sdk.log_artifacts import save_step_logs, save_task_logs from skyvern.forge.sdk.log_artifacts import save_step_logs, save_task_logs
from skyvern.forge.sdk.models import Step, StepStatus from skyvern.forge.sdk.models import Step, StepStatus
@@ -141,11 +140,6 @@ class ForgeAgent:
task_url = working_page.url 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( task = await app.DATABASE.create_task(
url=task_url, url=task_url,
task_type=task_block.task_type, task_type=task_block.task_type,
@@ -153,7 +147,7 @@ class ForgeAgent:
terminate_criterion=task_block.terminate_criterion, terminate_criterion=task_block.terminate_criterion,
title=task_block.title or task_block.label, title=task_block.title or task_block.label,
webhook_callback_url=None, webhook_callback_url=None,
totp_verification_url=totp_verification_url, totp_verification_url=task_block.totp_verification_url,
totp_identifier=task_block.totp_identifier, totp_identifier=task_block.totp_identifier,
navigation_goal=task_block.navigation_goal, navigation_goal=task_block.navigation_goal,
data_extraction_goal=task_block.data_extraction_goal, data_extraction_goal=task_block.data_extraction_goal,

3
skyvern/forge/sdk/workflow/models/block.py
View File

@@ -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.api.llm.api_handler_factory import LLMAPIHandlerFactory
from skyvern.forge.sdk.artifact.models import ArtifactType 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.db.enums import TaskType
from skyvern.forge.sdk.schemas.tasks import Task, TaskOutput, TaskStatus from skyvern.forge.sdk.schemas.tasks import Task, TaskOutput, TaskStatus
from skyvern.forge.sdk.workflow.context_manager import BlockMetadata, WorkflowRunContext from skyvern.forge.sdk.workflow.context_manager import BlockMetadata, WorkflowRunContext
@@ -290,6 +291,7 @@ class BaseTaskBlock(Block):
if self.url: if self.url:
self.url = self.format_block_parameter_template_from_workflow_run_context(self.url, workflow_run_context) 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: if self.totp_identifier:
self.totp_identifier = self.format_block_parameter_template_from_workflow_run_context( 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 = self.format_block_parameter_template_from_workflow_run_context(
self.totp_verification_url, 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: if self.download_suffix:
self.download_suffix = self.format_block_parameter_template_from_workflow_run_context( self.download_suffix = self.format_block_parameter_template_from_workflow_run_context(