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

Misc loop block changes (#1494)

Browse Source
This commit is contained in:
Shuchang Zheng
2025-01-05 22:58:24 -08:00
committed by GitHub
parent a241b09701
commit 74c8dd45f5
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
View File

@@ -1574,7 +1574,7 @@ function convertBlocksToBlockYAML(
const blockYaml: ForLoopBlockYAML = { const blockYaml: ForLoopBlockYAML = {
...base, ...base,
block_type: "for_loop", block_type: "for_loop",
loop_over_parameter_key: block.loop_over.key, loop_over_parameter_key: block.loop_over?.key ?? "",
loop_blocks: convertBlocksToBlockYAML(block.loop_blocks), loop_blocks: convertBlocksToBlockYAML(block.loop_blocks),
loop_variable_reference: block.loop_variable_reference, loop_variable_reference: block.loop_variable_reference,
}; };

2
skyvern/forge/agent.py
View File

@@ -572,7 +572,7 @@ class ForgeAgent:
failure_reason = "unexpected exception" failure_reason = "unexpected exception"
if isinstance(e, SkyvernException): if isinstance(e, SkyvernException):
failure_reason = f"unexpected SkyvernException({e.__class__.__name__})" failure_reason = f"unexpected SkyvernException({e.__class__.__name__}): {str(e)}"
is_task_marked_as_failed = await self.fail_task(task, step, failure_reason) is_task_marked_as_failed = await self.fail_task(task, step, failure_reason)
if is_task_marked_as_failed: if is_task_marked_as_failed:

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

@@ -263,6 +263,10 @@ class Block(BaseModel, abc.ABC):
artifact_type=ArtifactType.SCREENSHOT_LLM, artifact_type=ArtifactType.SCREENSHOT_LLM,
data=screenshot, data=screenshot,
) )
LOG.info(
"Executing block", workflow_run_id=workflow_run_id, block_label=self.label, block_type=self.block_type
)
return await self.execute(workflow_run_id, workflow_run_block_id, organization_id=organization_id, **kwargs) return await self.execute(workflow_run_id, workflow_run_block_id, organization_id=organization_id, **kwargs)
except Exception as e: except Exception as e:
LOG.exception( LOG.exception(
@@ -278,7 +282,7 @@ class Block(BaseModel, abc.ABC):
failure_reason = "unexpected exception" failure_reason = "unexpected exception"
if isinstance(e, SkyvernException): if isinstance(e, SkyvernException):
failure_reason = f"unexpected SkyvernException({e.__class__.__name__})" failure_reason = f"unexpected SkyvernException({e.__class__.__name__}): {str(e)}"
return await self.build_block_result( return await self.build_block_result(
success=False, success=False,
@@ -843,13 +847,17 @@ class ForLoopBlock(Block):
parent_workflow_run_block_id=workflow_run_block_id, parent_workflow_run_block_id=workflow_run_block_id,
organization_id=organization_id, organization_id=organization_id,
) )
output_value = (
workflow_run_context.get_value(block_output.output_parameter.key)
if workflow_run_context.has_value(block_output.output_parameter.key)
else None
)
each_loop_output_values.append( each_loop_output_values.append(
{ {
"loop_value": loop_over_value, "loop_value": loop_over_value,
"output_parameter": block_output.output_parameter, "output_parameter": block_output.output_parameter,
"output_value": workflow_run_context.get_value(block_output.output_parameter.key) "output_value": output_value,
if workflow_run_context.has_value(block_output.output_parameter.key)
else None,
} }
) )
try: try:
@@ -886,12 +894,13 @@ class ForLoopBlock(Block):
if not block_output.success and not loop_block.continue_on_failure: if not block_output.success and not loop_block.continue_on_failure:
LOG.info( LOG.info(
f"ForLoopBlock: Encountered an failure processing block {block_idx} during loop {loop_idx}, terminating early", f"ForLoopBlock: Encountered a failure processing block {block_idx} during loop {loop_idx}, terminating early",
block_outputs=block_outputs, block_outputs=block_outputs,
loop_idx=loop_idx, loop_idx=loop_idx,
block_idx=block_idx, block_idx=block_idx,
loop_over_value=loop_over_value, loop_over_value=loop_over_value,
loop_block_continue_on_failure=loop_block.continue_on_failure, loop_block_continue_on_failure=loop_block.continue_on_failure,
failure_reason=block_output.failure_reason,
) )
outputs_with_loop_values.append(each_loop_output_values) outputs_with_loop_values.append(each_loop_output_values)
return LoopBlockExecutedResult( return LoopBlockExecutedResult(

4
skyvern/forge/sdk/workflow/service.py
View File

@@ -351,7 +351,7 @@ class WorkflowService:
exception_message = "unexpected exception" exception_message = "unexpected exception"
if isinstance(e, SkyvernException): if isinstance(e, SkyvernException):
exception_message = f"unexpected SkyvernException({e.__class__.__name__})" exception_message = f"unexpected SkyvernException({e.__class__.__name__}): {str(e)}"
failure_reason = f"Block with type {block.block_type} at index {block_idx}/{blocks_cnt -1} failed. failure reason: {exception_message}" failure_reason = f"Block with type {block.block_type} at index {block_idx}/{blocks_cnt -1} failed. failure reason: {exception_message}"
await self.mark_workflow_run_as_failed( await self.mark_workflow_run_as_failed(
@@ -1371,7 +1371,7 @@ class WorkflowService:
loop_over_parameter = parameters[trimmed_key] loop_over_parameter = parameters[trimmed_key]
if loop_over_parameter is None and not block_yaml.loop_variable_reference: if loop_over_parameter is None and not block_yaml.loop_variable_reference:
raise Exception("empty loop value parameter") raise Exception("Loop value parameter is required for for loop block")
return ForLoopBlock( return ForLoopBlock(
label=block_yaml.label, label=block_yaml.label,