🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
fix: terminal toolkit working_directory does not set in docker environment (#3181)
Xiaotian Jina19e4df20564
diff --git a/camel/toolkits/terminal_toolkit/terminal_toolkit.py b/camel/toolkits/terminal_toolkit/terminal_toolkit.pyindex 6839bc7f4..df603832d 100644--- a/camel/toolkits/terminal_toolkit/terminal_toolkit.py+++ b/camel/toolkits/terminal_toolkit/terminal_toolkit.py@@ -65,17 +65,27 @@ class TerminalToolkit(BaseToolkit):in either a local or a sandboxed Docker environment.Args:- use_docker_backend (bool): If True, all commands are executed in a- Docker container. Defaults to False.- docker_container_name (Optional[str]): The name of the Docker- container to use. Required if use_docker_backend is True.- working_dir (str): The base directory for all operations.- For the local backend, this acts as a security sandbox.- session_logs_dir (Optional[str]): The directory to store session- logs. Defaults to a 'terminal_logs' subfolder in the- working_dir.- timeout (int): The default timeout in seconds for blocking- commands. Defaults to 60.+ timeout (Optional[float]): The default timeout in seconds for blocking+ commands. Defaults to 20.0.+ working_directory (Optional[str]): The base directory for operations.+ For the local backend, this acts as a security sandbox.+ For the Docker backend, this sets the working directory inside+ the container.+ If not specified, defaults to "./workspace" for local and+ "/workspace" for Docker.+ use_docker_backend (bool): If True, all commands are executed in a+ Docker container. Defaults to False.+ docker_container_name (Optional[str]): The name of the Docker+ container to use. Required if use_docker_backend is True.+ session_logs_dir (Optional[str]): The directory to store session+ logs. Defaults to a 'terminal_logs' subfolder in the+ working directory.+ safe_mode (bool): Whether to apply security checks to commands.+ Defaults to True.+ allowed_commands (Optional[List[str]]): List of allowed commands+ when safe_mode is True. If None, uses default safety rules.+ clone_current_env (bool): Whether to clone the current Python+ environment for local execution. Defaults to False."""def __init__(@@ -95,15 +105,34 @@ class TerminalToolkit(BaseToolkit):# Thread-safe guard for concurrent access to# shell_sessions and session stateself._session_lock = threading.RLock()- if working_directory:- self.working_dir = os.path.abspath(working_directory)- else:++ # Initialize docker_workdir with proper type+ self.docker_workdir: Optional[str] = None++ if self.use_docker_backend:+ # For Docker backend, working_directory is path inside container+ if working_directory:+ self.docker_workdir = working_directory+ else:+ self.docker_workdir = "/workspace"+ # For logs and local file operations, use a local workspacecamel_workdir = os.environ.get("CAMEL_WORKDIR")if camel_workdir:self.working_dir = os.path.abspath(camel_workdir)else:self.working_dir = os.path.abspath("./workspace")+ else:+ # For local backend, working_directory is the local path+ if working_directory:+ self.working_dir = os.path.abspath(working_directory)+ else:+ camel_workdir = os.environ.get("CAMEL_WORKDIR")+ if camel_workdir:+ self.working_dir = os.path.abspath(camel_workdir)+ else:+ self.working_dir = os.path.abspath("./workspace")+ # Only create local directory for logs and local backend operationsif not os.path.exists(self.working_dir):os.makedirs(self.working_dir, exist_ok=True)self.safe_mode = safe_mode@@ -506,8 +535,11 @@ class TerminalToolkit(BaseToolkit):)else:# DOCKER BLOCKING+ assert (+ self.docker_workdir is not None+ ) # Docker backend always has workdirexec_instance = self.docker_api_client.exec_create(- self.container.id, command, workdir="/workspace"+ self.container.id, command, workdir=self.docker_workdir)exec_output = self.docker_api_client.exec_start(exec_instance['Id']@@ -574,12 +606,15 @@ class TerminalToolkit(BaseToolkit):with self._session_lock:self.shell_sessions[session_id]["process"] = processelse:+ assert (+ self.docker_workdir is not None+ ) # Docker backend always has workdirexec_instance = self.docker_api_client.exec_create(self.container.id,command,stdin=True,tty=True,- workdir="/workspace",+ workdir=self.docker_workdir,)exec_id = exec_instance['Id']exec_socket = self.docker_api_client.exec_start(