mirror of
https://github.com/langgenius/dify.git
synced 2026-01-19 11:45:05 +08:00
fix(command-node): improve working directory handling in CommandNode
- Added checks to verify the existence of the specified working directory before executing commands. - Updated command execution logic to conditionally change the working directory if provided. - Included FIXME comments to address future enhancements for native cwd support in VirtualEnvironment.run_command.
This commit is contained in:
@ -79,15 +79,29 @@ class CommandNode(Node[CommandNodeData]):
|
||||
error_type="CommandNodeError",
|
||||
)
|
||||
|
||||
shell_command = raw_command
|
||||
if working_directory:
|
||||
shell_command = f"cd {shlex.quote(working_directory)} && {raw_command}"
|
||||
|
||||
command = ["sh", "-lc", shell_command]
|
||||
timeout = COMMAND_NODE_TIMEOUT_SECONDS if COMMAND_NODE_TIMEOUT_SECONDS > 0 else None
|
||||
|
||||
connection_handle = self.sandbox.establish_connection()
|
||||
|
||||
try:
|
||||
# FIXME: VirtualEnvironment.run_command lacks native cwd support.
|
||||
# Once the interface adds a `cwd` parameter, remove this shell hack
|
||||
# and pass working_directory directly to run_command.
|
||||
if working_directory:
|
||||
check_cmd = ["sh", "-c", f"test -d {shlex.quote(working_directory)}"]
|
||||
check_future = self.sandbox.run_command(connection_handle, check_cmd)
|
||||
check_result = check_future.result(timeout=timeout)
|
||||
|
||||
if check_result.exit_code != 0:
|
||||
return NodeRunResult(
|
||||
status=WorkflowNodeExecutionStatus.FAILED,
|
||||
error=f"Working directory does not exist: {working_directory}",
|
||||
error_type="WorkingDirectoryNotFoundError",
|
||||
)
|
||||
|
||||
command = ["sh", "-lc", f"cd {shlex.quote(working_directory)} && {raw_command}"]
|
||||
else:
|
||||
command = ["sh", "-lc", raw_command]
|
||||
|
||||
future = self.sandbox.run_command(connection_handle, command)
|
||||
result = future.result(timeout=timeout)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user