A programming framework for agentic AI
Allow Docker-out-of-docker in AGBench (#6047)
afourneyeaef7bab7c93
diff --git a/python/packages/agbench/src/agbench/cli.py b/python/packages/agbench/src/agbench/cli.pyindex 059c02783..687c71600 100644--- a/python/packages/agbench/src/agbench/cli.py+++ b/python/packages/agbench/src/agbench/cli.py@@ -3,11 +3,11 @@ from typing import Callable, List, Optional, Sequencefrom typing_extensions import TypedDict+from .linter.cli import lint_clifrom .remove_missing_cmd import remove_missing_clifrom .run_cmd import run_clifrom .tabulate_cmd import tabulate_clifrom .version import __version__-from .linter.cli import lint_cliclass CommandSpec(TypedDict):diff --git a/python/packages/agbench/src/agbench/run_cmd.py b/python/packages/agbench/src/agbench/run_cmd.pyindex a8a781229..55f181360 100644--- a/python/packages/agbench/src/agbench/run_cmd.py+++ b/python/packages/agbench/src/agbench/run_cmd.py@@ -7,12 +7,13 @@ import pathlibimport randomimport reimport shutil+import statimport subprocessimport sysimport timeimport tracebackfrom multiprocessing import Pool-from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Tuple, Union, cast+from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union, castimport dockerimport yaml@@ -375,7 +376,7 @@ def substitute_env_variables(json_data: Any) -> None:replace_in_list(cast(List[Any], json_data)) # type: ignore-def run_scenario_natively(work_dir: str, env: Mapping[str, str], timeout: int = TASK_TIMEOUT) -> None:+def run_scenario_natively(work_dir: str, env: Dict[str, str], timeout: int = TASK_TIMEOUT) -> None:"""Run a scenario in the native environment.@@ -479,7 +480,7 @@ echo RUN.SH COMPLETE !#!#def run_scenario_in_docker(- work_dir: str, env: Mapping[str, str], timeout: int = TASK_TIMEOUT, docker_image: Optional[str] = None+ work_dir: str, env: Dict[str, str], timeout: int = TASK_TIMEOUT, docker_image: Optional[str] = None) -> None:"""Run a scenario in a Docker environment.@@ -594,8 +595,26 @@ echo RUN.SH COMPLETE !#!#autogen_repo_base = os.path.join(autogen_repo_base, "python")volumes[str(pathlib.Path(autogen_repo_base).absolute())] = {"bind": "/autogen_python", "mode": "rw"}+ # Add the Docker socket if we are running on Linux+ # This allows docker-out-of-docker to work, but provides access to the Docker daemon on the host.+ # This maintains good isolation for experiment purposes (e.g., ensuring consistent initial conditions),+ # but deminishes the security benefits of using Docker (e.g., when facing a deliberately malicious agent).+ # since it would allow clients to mount privalaged images, volumes, etc.+ docker_host = os.environ.get("DOCKER_HOST", "unix:///var/run/docker.sock")+ if docker_host.startswith("unix://"):+ docker_socket = os.path.abspath(docker_host[7:])+ if os.path.exists(docker_socket):+ st_mode = os.stat(docker_socket).st_mode+ if stat.S_ISSOCK(st_mode):+ volumes[docker_socket] = {"bind": "/var/run/docker.sock", "mode": "rw"}++ # Update the environment variables so that the inner docker client can+ # mount the workspace+ env = {k: v for k, v in env.items()}+ env["HOST_WORKSPACE"] = str(pathlib.Path(work_dir).absolute())+print("Mounting:")- for k in volumes:+ for k in volumes.keys():bind = volumes[k]["bind"]mode = volumes[k]["mode"].upper()if bind == "/workspace":@@ -609,7 +628,7 @@ echo RUN.SH COMPLETE !#!#image,command=["sh", "run.sh"],working_dir="/workspace",- environment=dict(env),+ environment=env,detach=True,remove=True,auto_remove=True,