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

fix the script deletion problem when the workflow runs with agent and already has a cached script (#4092)

Browse Source
This commit is contained in:
Shuchang Zheng
2025-11-25 10:28:24 -08:00
committed by GitHub
parent c132c53f05
commit 55fd95edb5
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -646,10 +646,6 @@ class WorkflowService:
current_context.generate_script = False current_context.generate_script = False
if workflow_run.code_gen: if workflow_run.code_gen:
current_context.generate_script = True current_context.generate_script = True
is_script_run = self.should_run_script(workflow, workflow_run)
# Unified execution: execute blocks one by one, using script code when available
if is_script_run is False:
workflow_script = None
workflow_run, blocks_to_update = await self._execute_workflow_blocks( workflow_run, blocks_to_update = await self._execute_workflow_blocks(
workflow=workflow, workflow=workflow,
workflow_run=workflow_run, workflow_run=workflow_run,
@@ -719,6 +715,8 @@ class WorkflowService:
loaded_script_module = None loaded_script_module = None
blocks_to_update: set[str] = set() blocks_to_update: set[str] = set()
is_script_run = self.should_run_script(workflow, workflow_run)
if workflow_script: if workflow_script:
LOG.info( LOG.info(
"Loading script blocks for workflow execution", "Loading script blocks for workflow execution",
@@ -732,12 +730,6 @@ class WorkflowService:
organization_id=organization_id, organization_id=organization_id,
) )
if script: if script:
script_files = await app.DATABASE.get_script_files(
script_revision_id=script.script_revision_id,
organization_id=organization_id,
)
await script_service.load_scripts(script, script_files)
script_blocks = await app.DATABASE.get_script_blocks_by_script_revision_id( script_blocks = await app.DATABASE.get_script_blocks_by_script_revision_id(
script_revision_id=script.script_revision_id, script_revision_id=script.script_revision_id,
organization_id=organization_id, organization_id=organization_id,
@@ -748,33 +740,43 @@ class WorkflowService:
if script_block.run_signature: if script_block.run_signature:
script_blocks_by_label[script_block.script_block_label] = script_block script_blocks_by_label[script_block.script_block_label] = script_block
script_path = os.path.join(settings.TEMP_PATH, workflow_script.script_id, "main.py") if is_script_run:
if os.path.exists(script_path): # load the script files
# setup script run script_files = await app.DATABASE.get_script_files(
parameter_tuples = await app.DATABASE.get_workflow_run_parameters( script_revision_id=script.script_revision_id,
workflow_run_id=workflow_run.workflow_run_id organization_id=organization_id,
) )
script_parameters = {wf_param.key: run_param.value for wf_param, run_param in parameter_tuples} await script_service.load_scripts(script, script_files)
spec = importlib.util.spec_from_file_location("user_script", script_path) script_path = os.path.join(settings.TEMP_PATH, workflow_script.script_id, "main.py")
if spec and spec.loader: if os.path.exists(script_path):
loaded_script_module = importlib.util.module_from_spec(spec) # setup script run
spec.loader.exec_module(loaded_script_module) parameter_tuples = await app.DATABASE.get_workflow_run_parameters(
await skyvern.setup( workflow_run_id=workflow_run.workflow_run_id
script_parameters,
generated_parameter_cls=loaded_script_module.GeneratedWorkflowParameters,
) )
LOG.info( script_parameters = {
"Successfully loaded script module", wf_param.key: run_param.value for wf_param, run_param in parameter_tuples
}
spec = importlib.util.spec_from_file_location("user_script", script_path)
if spec and spec.loader:
loaded_script_module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(loaded_script_module)
await skyvern.setup(
script_parameters,
generated_parameter_cls=loaded_script_module.GeneratedWorkflowParameters,
)
LOG.info(
"Successfully loaded script module",
script_id=workflow_script.script_id,
block_count=len(script_blocks_by_label),
)
else:
LOG.warning(
"Script file not found at path",
script_path=script_path,
script_id=workflow_script.script_id, script_id=workflow_script.script_id,
block_count=len(script_blocks_by_label),
) )
else:
LOG.warning(
"Script file not found at path",
script_path=script_path,
script_id=workflow_script.script_id,
)
except Exception as e: except Exception as e:
LOG.warning( LOG.warning(
"Failed to load script blocks, will fallback to normal execution", "Failed to load script blocks, will fallback to normal execution",
@@ -860,7 +862,9 @@ class WorkflowService:
# Try executing with script code if available # Try executing with script code if available
block_executed_with_code = False block_executed_with_code = False
valid_to_run_code = block.label and block.label in script_blocks_by_label and not block.disable_cache valid_to_run_code = (
is_script_run and block.label and block.label in script_blocks_by_label and not block.disable_cache
)
if valid_to_run_code: if valid_to_run_code:
script_block = script_blocks_by_label[block.label] script_block = script_blocks_by_label[block.label]
LOG.info( LOG.info(