Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set use_docker to default to True #1147

Merged
merged 25 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4c88375
set use_docker to default to true
olgavrou Jan 4, 2024
5455e71
Merge branch 'main' into use_docker_true
olgavrou Jan 4, 2024
a21e800
black formatting
olgavrou Jan 4, 2024
28cbd5a
centralize checking and add env variable option
olgavrou Jan 5, 2024
5fa3666
merge from main
olgavrou Jan 11, 2024
8bc1257
set docker env flag for contrib tests
olgavrou Jan 11, 2024
1216e9d
set docker env flag for contrib tests
olgavrou Jan 11, 2024
5dedb51
better error message and cleanup
olgavrou Jan 16, 2024
1defc62
merge from main
olgavrou Jan 16, 2024
86ca7b3
disable explicit docker tests
olgavrou Jan 16, 2024
ebaff8f
docker is installed so can't check for that in test
olgavrou Jan 16, 2024
1ba722b
Merge branch 'main' into use_docker_true
olgavrou Jan 17, 2024
ba982ac
pr comments and fix test
olgavrou Jan 17, 2024
9b9e89f
Merge branch 'main' into use_docker_true
olgavrou Jan 17, 2024
00ec55f
rename and fix function descriptions
olgavrou Jan 17, 2024
636e928
documentation
olgavrou Jan 17, 2024
39c18d3
update notebooks so that they can be run with change in default
olgavrou Jan 17, 2024
ee2f0c5
Merge branch 'main' into use_docker_true
olgavrou Jan 17, 2024
fb424c9
add unit tests for new code
olgavrou Jan 17, 2024
eff47ea
cache and restore env var
olgavrou Jan 17, 2024
185840b
skip on windows because docker is running in the CI but there are pro…
olgavrou Jan 17, 2024
9bb3187
update documentation
olgavrou Jan 17, 2024
f902577
move header
olgavrou Jan 17, 2024
d69464e
update contrib tests
olgavrou Jan 17, 2024
f1455a6
Merge branch 'main' into use_docker_true
olgavrou Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
qingyun-wu marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ jobs:
pip install -e .
python -c "import autogen"
pip install -e. pytest mock
- name: Set AUTOGEN_USE_DOCKER based on OS
shell: bash
run: |
if [[ ${{ matrix.os }} == windows-2019 ]]; then
davorrunje marked this conversation as resolved.
Show resolved Hide resolved
echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
elif [[ ${{ matrix.os }} == macos-latest ]]; then
echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
fi
- name: Test with pytest
if: matrix.python-version != '3.10'
run: |
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/contrib-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,14 @@ jobs:
- name: Install packages and dependencies for LMM
run: |
pip install -e .[lmm]
- name: Set AUTOGEN_USE_DOCKER based on OS
shell: bash
run: |
if [[ ${{ matrix.os }} == windows-2019 ]]; then
echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
elif [[ ${{ matrix.os }} == macos-latest ]]; then
echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
fi
- name: Test LMM and LLaVA
run: |
pytest test/agentchat/contrib/test_img_utils.py test/agentchat/contrib/test_lmm.py test/agentchat/contrib/test_llava.py --skip-openai
Expand Down
19 changes: 18 additions & 1 deletion autogen/agentchat/conversable_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@
from typing import Any, Awaitable, Callable, Dict, List, Literal, Optional, Tuple, Type, TypeVar, Union

from .. import OpenAIWrapper
from ..code_utils import DEFAULT_MODEL, UNKNOWN, content_str, execute_code, extract_code, infer_lang
from ..code_utils import (
DEFAULT_MODEL,
UNKNOWN,
content_str,
check_use_docker,
decide_use_docker,
execute_code,
extract_code,
infer_lang,
)

from ..function_utils import get_function_schema, load_basemodels_if_needed, serialize_to_str
from .agent import Agent
from .._pydantic import model_dump
Expand Down Expand Up @@ -128,6 +138,13 @@ def __init__(
self._code_execution_config: Union[Dict, Literal[False]] = (
{} if code_execution_config is None else code_execution_config
)

if isinstance(self._code_execution_config, Dict):
davorrunje marked this conversation as resolved.
Show resolved Hide resolved
use_docker = self._code_execution_config.get("use_docker", None)
use_docker = decide_use_docker(use_docker)
check_use_docker(use_docker)
self._code_execution_config["use_docker"] = use_docker

self.human_input_mode = human_input_mode
self._max_consecutive_auto_reply = (
max_consecutive_auto_reply if max_consecutive_auto_reply is not None else self.MAX_CONSECUTIVE_AUTO_REPLY
Expand Down
111 changes: 86 additions & 25 deletions autogen/code_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
except ImportError:
docker = None

SENTINEL = object()
DEFAULT_MODEL = "gpt-4"
FAST_MODEL = "gpt-3.5-turbo"
# Regular expression for finding a code block
Expand Down Expand Up @@ -224,12 +225,76 @@ def _cmd(lang):
raise NotImplementedError(f"{lang} not recognized in code execution")


def is_docker_running():
"""Check if docker is running.

Returns:
bool: True if docker is running; False otherwise.
"""
if docker is None:
return False
try:
client = docker.from_env()
client.ping()
return True
except docker.errors.DockerException:
return False


def in_docker_container():
"""Check if the code is running in a docker container.

Returns:
bool: True if the code is running in a docker container; False otherwise.
"""
return os.path.exists("/.dockerenv")


def decide_use_docker(use_docker) -> bool:
if use_docker is None:
env_var_use_docker = os.environ.get("AUTOGEN_USE_DOCKER", "True")

truthy_values = {"1", "true", "yes", "t"}
falsy_values = {"0", "false", "no", "f"}

# Convert the value to lowercase for case-insensitive comparison
env_var_use_docker_lower = env_var_use_docker.lower()

# Determine the boolean value based on the environment variable
if env_var_use_docker_lower in truthy_values:
use_docker = True
elif env_var_use_docker_lower in falsy_values:
use_docker = False
elif env_var_use_docker_lower == "none": # Special case for 'None' as a string
use_docker = None
else:
# Raise an error for any unrecognized value
raise ValueError(
f'Invalid value for AUTOGEN_USE_DOCKER: {env_var_use_docker}. Please set AUTOGEN_USE_DOCKER to "1/True/yes", "0/False/no", or "None".'
)
return use_docker


def check_use_docker(use_docker) -> None:
if use_docker is not None:
inside_docker = in_docker_container()
docker_installed_and_running = is_docker_running()
if use_docker and not inside_docker and not docker_installed_and_running:
raise RuntimeError(
'Docker is not running, please make sure docker is running (advised approach for code execution) or set "use_docker":False.'
)
if not use_docker:
logger.warning(
'use_docker was set to False. Any code execution will be run natively but we strongly advise to set "use_docker":True. Set "use_docker":None to silence this message.'
)


def execute_code(
code: Optional[str] = None,
timeout: Optional[int] = None,
filename: Optional[str] = None,
work_dir: Optional[str] = None,
use_docker: Optional[Union[List[str], str, bool]] = None,
use_docker: Union[List[str], str, bool] = SENTINEL,
lang: Optional[str] = "python",
) -> Tuple[int, str, str]:
"""Execute code in a docker container.
Expand All @@ -249,15 +314,15 @@ def execute_code(
If None, a default working directory will be used.
The default working directory is the "extensions" directory under
"path_to_autogen".
use_docker (Optional, list, str or bool): The docker image to use for code execution.
use_docker (list, str or bool): The docker image to use for code execution.
If a list or a str of image name(s) is provided, the code will be executed in a docker container
with the first image successfully pulled.
If None, False or empty, the code will be executed in the current environment.
Default is None, which will be converted into an empty list when docker package is available.
Default is True.
Expected behaviour:
- If `use_docker` is explicitly set to True and the docker package is available, the code will run in a Docker container.
- If `use_docker` is explicitly set to True but the Docker package is missing, an error will be raised.
- If `use_docker` is not set (i.e., left default to None) and the Docker package is not available, a warning will be displayed, but the code will run natively.
- If `use_docker` is not set (i.e. left default to True) or is explicitly set to True and the docker package is available, the code will run in a Docker container.
- If `use_docker` is not set (i.e. left default to True) or is explicitly set to True but the Docker package is missing, an error will be raised.
- If `use_docker` is explicitly set to False, a warning will be displayed, but the code will run natively.
If the code is executed in the current environment,
the code must be trusted.
lang (Optional, str): The language of the code. Default is "python".
Expand All @@ -272,23 +337,12 @@ def execute_code(
logger.error(error_msg)
raise AssertionError(error_msg)

if use_docker and docker is None:
error_msg = "Cannot use docker because the python docker package is not available."
logger.error(error_msg)
raise AssertionError(error_msg)
running_inside_docker = in_docker_container()
docker_running = is_docker_running()

# Warn if use_docker was unspecified (or None), and cannot be provided (the default).
# In this case the current behavior is to fall back to run natively, but this behavior
# is subject to change.
if use_docker is None:
if docker is None:
use_docker = False
logger.warning(
"execute_code was called without specifying a value for use_docker. Since the python docker package is not available, code will be run natively. Note: this fallback behavior is subject to change"
)
else:
# Default to true
use_docker = True
if use_docker is SENTINEL:
use_docker = decide_use_docker(use_docker=None)
check_use_docker(use_docker)

timeout = timeout or DEFAULT_TIMEOUT
original_filename = filename
Expand All @@ -300,15 +354,16 @@ def execute_code(
filename = f"tmp_code_{code_hash}.{'py' if lang.startswith('python') else lang}"
if work_dir is None:
work_dir = WORKING_DIR

filepath = os.path.join(work_dir, filename)
file_dir = os.path.dirname(filepath)
os.makedirs(file_dir, exist_ok=True)

if code is not None:
with open(filepath, "w", encoding="utf-8") as fout:
fout.write(code)
# check if already running in a docker container
in_docker_container = os.path.exists("/.dockerenv")
if not use_docker or in_docker_container:

if not use_docker or running_inside_docker:
# already running in a docker container
cmd = [
sys.executable if lang.startswith("python") else _cmd(lang),
Expand Down Expand Up @@ -352,7 +407,13 @@ def execute_code(
return result.returncode, logs, None

# create a docker client
if use_docker and not docker_running:
raise RuntimeError(
"Docker package is missing or docker is not running. Please make sure docker is running or set use_docker=False."
)

client = docker.from_env()

image_list = (
["python:3-alpine", "python:3", "python:3-windowsservercore"]
if use_docker is True
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"python-dotenv",
"tiktoken",
"pydantic>=1.10,<3", # could be both V1 and V2
"docker",
sonichi marked this conversation as resolved.
Show resolved Hide resolved
]

setuptools.setup(
Expand Down
4 changes: 2 additions & 2 deletions test/test_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ def scrape(url):


@pytest.mark.skipif(
sys.platform in ["darwin"],
reason="do not run on MacOS",
sys.platform in ["darwin", "win32"],
reason="do not run on MacOS or Windows",
)
def test_execute_code(use_docker=None):
try:
Expand Down
Loading