ag2 0.9.5__tar.gz → 0.9.6__tar.gz

{ag2-0.9.5 → ag2-0.9.6}/.devcontainer/setup.sh

@@ -6,3 +6,6 @@ pip install -e ".[dev]"
 
 # install pre-commit hook if not installed already
 pre-commit install
+
+# install Claude Code CLI
+npm install --location=global @anthropic-ai/claude-code

{ag2-0.9.5 → ag2-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ag2
-Version: 0.9.5
+Version: 0.9.6
 Summary: A programming framework for agentic AI
 Project-URL: Homepage, https://ag2.ai/
 Project-URL: Documentation, https://docs.ag2.ai

{ag2-0.9.5 → ag2-0.9.6}/autogen/coding/docker_commandline_code_executor.py

@@ -71,6 +71,8 @@ class DockerCommandLineCodeExecutor(CodeExecutor):
         auto_remove: bool = True,
         stop_container: bool = True,
         execution_policies: Optional[dict[str, bool]] = None,
+        *,
+        container_create_kwargs: Optional[dict[str, Any]] = None,
     ):
         """(Experimental) A code executor class that executes code through
         a command line environment in a Docker container.
@@ -98,6 +100,11 @@ class DockerCommandLineCodeExecutor(CodeExecutor):
                 whether code in that language should be executed. True means code in that language
                 will be executed, False means it will only be saved to a file. This overrides the
                 default execution policies. Defaults to None.
+            container_create_kwargs: Optional dict forwarded verbatim to
+                "docker.client.containers.create". Use it to set advanced Docker
+                options (environment variables, GPU device_requests, port mappings, etc.).
+                Values here override the class defaults when keys collide. Defaults to None.
+
 
         Raises:
             ValueError: On argument error, or if the container fails to start.
@@ -128,16 +135,29 @@ class DockerCommandLineCodeExecutor(CodeExecutor):
         if container_name is None:
             container_name = f"autogen-code-exec-{uuid.uuid4()}"
 
+        # build kwargs for docker.create
+        base_kwargs: dict[str, Any] = {
+            "image": image,
+            "name": container_name,
+            "entrypoint": "/bin/sh",
+            "tty": True,
+            "auto_remove": auto_remove,
+            "volumes": {str(bind_dir.resolve()): {"bind": "/workspace", "mode": "rw"}},
+            "working_dir": "/workspace",
+        }
+
+        if container_create_kwargs:
+            for k in ("entrypoint", "volumes", "working_dir", "tty"):
+                if k in container_create_kwargs:
+                    logging.warning(
+                        "DockerCommandLineCodeExecutor: overriding default %s=%s",
+                        k,
+                        container_create_kwargs[k],
+                    )
+            base_kwargs.update(container_create_kwargs)
+
         # Start a container from the image, read to exec commands later
-        self._container = client.containers.create(
-            image,
-            name=container_name,
-            entrypoint="/bin/sh",
-            tty=True,
-            auto_remove=auto_remove,
-            volumes={str(bind_dir.resolve()): {"bind": "/workspace", "mode": "rw"}},
-            working_dir="/workspace",
-        )
+        self._container = client.containers.create(**base_kwargs)
         self._container.start()
 
         _wait_for_ready(self._container)

ag2-0.9.6/autogen/environments/__init__.py

@@ -0,0 +1,10 @@
+# Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from .docker_python_environment import DockerPythonEnvironment
+from .system_python_environment import SystemPythonEnvironment
+from .venv_python_environment import VenvPythonEnvironment
+from .working_directory import WorkingDirectory
+
+__all__ = ["DockerPythonEnvironment", "SystemPythonEnvironment", "VenvPythonEnvironment", "WorkingDirectory"]

ag2-0.9.6/autogen/environments/docker_python_environment.py

@@ -0,0 +1,375 @@
+# Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import os
+import shutil
+import subprocess
+import tempfile
+import uuid
+from typing import Any, Optional, Tuple
+
+from asyncer import asyncify
+
+from .python_environment import PythonEnvironment
+
+__all__ = ["DockerPythonEnvironment"]
+
+
+class DockerPythonEnvironment(PythonEnvironment):
+    """A Python environment using Docker containers for isolated execution."""
+
+    def __init__(
+        self,
+        image: str = "python:3.11-slim",
+        container_name_prefix: str = "ag2_docker_env_",
+        volumes: Optional[dict[str, str]] = None,
+        environment: Optional[dict[str, str]] = None,
+        network: Optional[str] = None,
+        pip_packages: Optional[list[str]] = None,
+        requirements_file: Optional[str] = None,
+        dockerfile: Optional[str] = None,
+        build_args: Optional[dict[str, str]] = None,
+        cleanup_container: bool = True,
+        keep_container_running: bool = False,
+        container_startup_timeout: int = 30,
+    ):
+        """
+        Initialize a Docker Python environment.
+
+        Args:
+            image: Docker image to use (ignored if dockerfile is provided)
+            container_name_prefix: Prefix for container names
+            volumes: Dictionary mapping host paths to container paths for mounting
+            environment: Dictionary of environment variables to set in the container
+            network: Docker network to attach the container to
+            pip_packages: List of pip packages to install in the container
+            requirements_file: Path to requirements.txt file to install in the container
+            dockerfile: Optional path to a Dockerfile to build and use instead of pulling an image
+            build_args: Optional build arguments for the Dockerfile
+            cleanup_container: Whether to remove the container after use
+            keep_container_running: Whether to keep the container running after execution
+            container_startup_timeout: Timeout in seconds for container startup
+        """
+        self.image = image
+        self.container_name_prefix = container_name_prefix
+        self.volumes = volumes or {}
+        self.environment = environment or {}
+        self.network = network
+        self.pip_packages = pip_packages or []
+        self.requirements_file = requirements_file
+        self.dockerfile = dockerfile
+        self.build_args = build_args or {}
+        self.cleanup_container = cleanup_container
+        self.keep_container_running = keep_container_running
+        self.container_startup_timeout = container_startup_timeout
+
+        # Internal state
+        self._container_id = None
+        self._container_name = None
+        self._custom_image_name = None
+        self._temp_dir = None
+
+        super().__init__()
+
+    def _setup_environment(self) -> None:
+        """Set up the Docker environment."""
+        # Verify Docker is installed and accessible
+        try:
+            result = subprocess.run(["docker", "--version"], capture_output=True, text=True, check=True)
+            logging.info(f"Docker version: {result.stdout.strip()}")
+        except (subprocess.SubprocessError, FileNotFoundError) as e:
+            raise RuntimeError(
+                "Docker not found or not accessible. Please ensure Docker is installed and running."
+            ) from e
+
+        # Create a temporary directory for file operations
+        self._temp_dir = tempfile.mkdtemp(prefix="ag2_docker_")
+
+        # Generate a unique container name
+        self._container_name = f"{self.container_name_prefix}{uuid.uuid4().hex[:8]}"
+
+        # Build custom image if Dockerfile is provided
+        if self.dockerfile:
+            self._build_custom_image()
+        else:
+            # Pull the specified image
+            try:
+                subprocess.run(
+                    ["docker", "pull", self.image],
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                )
+                logging.info(f"Pulled Docker image: {self.image}")
+            except subprocess.CalledProcessError as e:
+                raise RuntimeError(f"Failed to pull Docker image: {e.stderr}") from e
+
+        # Start the container
+        self._start_container()
+
+    def _build_custom_image(self) -> None:
+        """Build a custom Docker image from the provided Dockerfile."""
+        if not os.path.exists(self.dockerfile):
+            raise RuntimeError(f"Dockerfile not found at: {self.dockerfile}")
+
+        # Create a unique image name
+        self._custom_image_name = f"ag2-custom-python-{uuid.uuid4().hex[:8]}"
+
+        # Build command
+        build_cmd = ["docker", "build", "-t", self._custom_image_name]
+
+        # Add build args
+        for arg_name, arg_value in self.build_args.items():
+            build_cmd.extend(["--build-arg", f"{arg_name}={arg_value}"])
+
+        # Add Dockerfile path
+        build_cmd.extend(["-f", self.dockerfile, os.path.dirname(self.dockerfile)])
+
+        try:
+            logging.info(f"Building custom Docker image: {self._custom_image_name}")
+            _ = subprocess.run(
+                build_cmd,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+            logging.info(f"Built custom Docker image: {self._custom_image_name}")
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError(f"Failed to build Docker image: {e.stderr}") from e
+
+        # Use the custom image
+        self.image = self._custom_image_name
+
+    def _start_container(self) -> None:
+        """Start the Docker container."""
+        # Basic container run command
+        run_cmd = ["docker", "run", "--name", self._container_name]
+
+        # Add detached mode flag to run container in background
+        run_cmd.append("-d")
+
+        # Add network if specified
+        if self.network:
+            run_cmd.extend(["--network", self.network])
+
+        # Add environment variables
+        for env_name, env_value in self.environment.items():
+            run_cmd.extend(["-e", f"{env_name}={env_value}"])
+
+        # Add volume mounts including temp directory
+        work_dir_mount = f"{self._temp_dir}:/workspace"
+        run_cmd.extend(["-v", work_dir_mount])
+
+        for host_path, container_path in self.volumes.items():
+            run_cmd.extend(["-v", f"{host_path}:{container_path}"])
+
+        # Set workspace as working directory
+        run_cmd.extend(["-w", "/workspace"])
+
+        # Add tty to keep container running
+        run_cmd.append("-t")
+
+        # Add image name
+        run_cmd.append(self.image)
+
+        # Initial command to keep container running
+        run_cmd.extend(["tail", "-f", "/dev/null"])
+
+        try:
+            # Start the container
+            logging.info(f"Starting Docker container: {self._container_name}")
+            result = subprocess.run(
+                run_cmd,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+
+            # Get container ID
+            self._container_id = result.stdout.strip()
+            logging.info(f"Started Docker container: {self._container_name} ({self._container_id})")
+
+            # Install pip packages if specified
+            if self.pip_packages or self.requirements_file:
+                self._install_packages()
+
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError(f"Failed to start Docker container: {e.stderr}") from e
+
+    def _install_packages(self) -> None:
+        """Install Python packages in the running container."""
+        # Install pip packages
+        if self.pip_packages:
+            packages_str = " ".join(self.pip_packages)
+            try:
+                logging.info(f"Installing pip packages: {packages_str}")
+                _ = subprocess.run(
+                    ["docker", "exec", self._container_name, "pip", "install", "--no-cache-dir"] + self.pip_packages,
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                )
+                logging.info("Successfully installed pip packages")
+            except subprocess.CalledProcessError as e:
+                logging.warning(f"Failed to install pip packages: {e.stderr}")
+
+        # Install from requirements file
+        if self.requirements_file:
+            if os.path.exists(self.requirements_file):
+                # Copy requirements file to temp directory
+                req_filename = os.path.basename(self.requirements_file)
+                temp_req_path = os.path.join(self._temp_dir, req_filename)
+                shutil.copy(self.requirements_file, temp_req_path)
+
+                try:
+                    logging.info(f"Installing requirements from: {req_filename}")
+                    _ = subprocess.run(
+                        [
+                            "docker",
+                            "exec",
+                            self._container_name,
+                            "pip",
+                            "install",
+                            "--no-cache-dir",
+                            "-r",
+                            f"/workspace/{req_filename}",
+                        ],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                    logging.info("Successfully installed requirements")
+                except subprocess.CalledProcessError as e:
+                    logging.warning(f"Failed to install requirements: {e.stderr}")
+            else:
+                logging.warning(f"Requirements file not found: {self.requirements_file}")
+
+    def _cleanup_environment(self) -> None:
+        """Clean up the Docker environment."""
+        if self._container_id:
+            # Stop the container if it's running and we want to clean it up
+            if not self.keep_container_running:
+                try:
+                    logging.info(f"Stopping Docker container: {self._container_name}")
+                    subprocess.run(
+                        ["docker", "stop", self._container_name],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                except subprocess.CalledProcessError:
+                    logging.warning(f"Failed to stop Docker container: {self._container_name}")
+
+            # Remove the container if cleanup is enabled
+            if self.cleanup_container and not self.keep_container_running:
+                try:
+                    logging.info(f"Removing Docker container: {self._container_name}")
+                    subprocess.run(
+                        ["docker", "rm", "-f", self._container_name],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                except subprocess.CalledProcessError:
+                    logging.warning(f"Failed to remove Docker container: {self._container_name}")
+
+            # Remove the custom image if it was created
+            if self._custom_image_name and self.cleanup_container:
+                try:
+                    logging.info(f"Removing custom Docker image: {self._custom_image_name}")
+                    subprocess.run(
+                        ["docker", "rmi", self._custom_image_name],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                except subprocess.CalledProcessError:
+                    logging.warning(f"Failed to remove custom Docker image: {self._custom_image_name}")
+
+        # Clean up the temporary directory
+        if self._temp_dir and os.path.exists(self._temp_dir):
+            try:
+                shutil.rmtree(self._temp_dir)
+            except Exception as e:
+                logging.warning(f"Failed to remove temporary directory: {e}")
+
+    def get_executable(self) -> str:
+        """Get the path to the Python executable in the Docker container."""
+        # This is a virtual path in the container
+        return "python"
+
+    async def execute_code(self, code: str, script_path: str, timeout: int = 30) -> dict[str, Any]:
+        """Execute code in the Docker container."""
+        # Ensure the container is running
+        if not self._container_id:
+            return {"success": False, "error": "Docker container not started"}
+
+        try:
+            # Calculate the relative path within the temp directory
+            if os.path.isabs(script_path):
+                rel_path = os.path.basename(script_path)
+                host_script_path = os.path.join(self._temp_dir, rel_path)
+            else:
+                rel_path = script_path
+                host_script_path = os.path.join(self._temp_dir, rel_path)
+
+            # Ensure the directory for the script exists
+            script_dir = os.path.dirname(host_script_path)
+            if script_dir:
+                os.makedirs(script_dir, exist_ok=True)
+
+            # Write the code to the script file on the host
+            await asyncify(self._write_to_file)(host_script_path, code)
+
+            # Path to the script in the container
+            container_script_path = f"/workspace/{rel_path}"
+
+            # Execute the script in the container
+            exec_cmd = ["docker", "exec", self._container_name, "python", container_script_path]
+
+            # Run the command with a timeout
+            result = await asyncify(self._run_subprocess_with_timeout)(exec_cmd, timeout)
+
+            return {
+                "success": result[0],
+                "stdout": result[1],
+                "stderr": result[2],
+                "returncode": result[3] if result[0] else 1,
+            }
+
+        except Exception as e:
+            return {"success": False, "error": f"Execution error: {str(e)}"}
+
+    def _run_subprocess_with_timeout(self, cmd: list[str], timeout: int) -> Tuple[bool, str, str, int]:
+        """
+        Run a subprocess with timeout and return status, stdout, stderr, and return code.
+
+        Args:
+            cmd: Command to run as a list of strings
+            timeout: Maximum execution time in seconds
+
+        Returns:
+            Tuple of (success, stdout, stderr, return_code)
+        """
+        try:
+            result = subprocess.run(
+                cmd,
+                capture_output=True,
+                text=True,
+                timeout=timeout,
+            )
+            return (result.returncode == 0, result.stdout, result.stderr, result.returncode)
+        except subprocess.TimeoutExpired:
+            return (False, "", f"Execution timed out after {timeout} seconds", -1)
+        except Exception as e:
+            return (False, "", str(e), -1)

ag2-0.9.6/autogen/environments/python_environment.py

@@ -0,0 +1,134 @@
+# Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import subprocess
+from abc import ABC, abstractmethod
+from contextvars import ContextVar
+from typing import Any, Optional
+
+__all__ = ["PythonEnvironment"]
+
+
+class PythonEnvironment(ABC):
+    """Python execution environments base class"""
+
+    # Shared context variable for tracking the current environment
+    _current_python_environment: ContextVar["PythonEnvironment"] = ContextVar("_current_python_environment")
+
+    def __init__(self):
+        """
+        Initialize the Python environment.
+        """
+        self._token = None
+
+        # Set up the environment
+        self._setup_environment()
+
+    def __enter__(self):
+        """
+        Enter the environment context.
+        Sets this environment as the current one.
+        """
+        # Set this as the current Python environment in the context
+        self._token = PythonEnvironment._current_python_environment.set(self)
+
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """
+        Exit the environment context.
+        Resets the current environment and performs cleanup.
+        """
+        # Reset the context variable if this was the active environment
+        if self._token is not None:
+            PythonEnvironment._current_python_environment.reset(self._token)
+            self._token = None
+
+        # Clean up resources
+        self._cleanup_environment()
+
+    @abstractmethod
+    def _setup_environment(self) -> None:
+        """Set up the Python environment. Called by __enter__."""
+        pass
+
+    @abstractmethod
+    def _cleanup_environment(self) -> None:
+        """Clean up the Python environment. Called by __exit__."""
+        pass
+
+    @abstractmethod
+    def get_executable(self) -> str:
+        """
+        Get the path to the Python executable in this environment.
+
+        Returns:
+            The full path to the Python executable.
+        """
+        pass
+
+    @abstractmethod
+    async def execute_code(self, code: str, script_path: str, timeout: int = 30) -> dict[str, Any]:
+        """
+        Execute the given code in this environment.
+
+        Args:
+            code: The Python code to execute.
+            script_path: Path where the code should be saved before execution.
+            timeout: Maximum execution time in seconds.
+
+        Returns:
+            dict with execution results including stdout, stderr, and success status.
+        """
+        pass
+
+    # Utility method for subclasses to wrap (for async support)
+    def _write_to_file(self, script_path: str, content: str) -> None:
+        """
+        Write content to a file (blocking operation).
+
+        This is a helper method for use with asyncify in async contexts.
+
+        Args:
+            script_path: Path to the file to write.
+            content: Content to write to the file.
+        """
+        with open(script_path, "w") as f:
+            f.write(content)
+
+    # Utility method for subclasses to wrap (for async support)
+    def _run_subprocess(self, cmd: list[str], timeout: int) -> subprocess.CompletedProcess:
+        """
+        Run a subprocess (blocking operation).
+
+        This is a helper method for use with asyncify in async contexts.
+
+        Args:
+            cmd: Command to run as a list of strings.
+            timeout: Maximum execution time in seconds.
+
+        Returns:
+            CompletedProcess instance with results of the subprocess.
+        """
+        return subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+
+    @classmethod
+    def get_current_python_environment(
+        cls, python_environment: Optional["PythonEnvironment"] = None
+    ) -> Optional["PythonEnvironment"]:
+        """
+        Get the current Python environment or the specified one if provided.
+
+        Args:
+            python_environment: Optional environment to return if specified.
+
+        Returns:
+            The current Python environment or None if none is active.
+        """
+        if python_environment is not None:
+            return python_environment
+        try:
+            return cls._current_python_environment.get()
+        except LookupError:
+            return None

ag2-0.9.6/autogen/environments/system_python_environment.py

@@ -0,0 +1,86 @@
+# Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import os
+import subprocess
+import sys
+from typing import Any, Optional
+
+from asyncer import asyncify
+
+from .python_environment import PythonEnvironment
+
+__all__ = ["SystemPythonEnvironment"]
+
+
+class SystemPythonEnvironment(PythonEnvironment):
+    """A Python environment using the system's Python installation."""
+
+    def __init__(
+        self,
+        executable: Optional[str] = None,
+    ):
+        """
+        Initialize a system Python environment.
+
+        Args:
+            executable: Optional path to a specific Python executable. If None, uses the current Python executable.
+        """
+        self._executable = executable or sys.executable
+        super().__init__()
+
+    def _setup_environment(self) -> None:
+        """Set up the system Python environment."""
+        # Verify the Python executable exists
+        if not os.path.exists(self._executable):
+            raise RuntimeError(f"Python executable not found at: {self._executable}")
+
+        logging.info(f"Using system Python at: {self._executable}")
+
+    def _cleanup_environment(self) -> None:
+        """Clean up the system Python environment."""
+        # No cleanup needed for system Python
+        pass
+
+    def get_executable(self) -> str:
+        """Get the path to the Python executable."""
+        return self._executable
+
+    async def execute_code(self, code: str, script_path: str, timeout: int = 30) -> dict[str, Any]:
+        """Execute code using the system Python."""
+        try:
+            # Get the Python executable
+            python_executable = self.get_executable()
+
+            # Verify the executable exists
+            if not os.path.exists(python_executable):
+                return {"success": False, "error": f"Python executable not found at {python_executable}"}
+
+            # Ensure the directory for the script exists
+            script_dir = os.path.dirname(script_path)
+            if script_dir:
+                os.makedirs(script_dir, exist_ok=True)
+
+            # Write the code to the script file using asyncify (from base class)
+            await asyncify(self._write_to_file)(script_path, code)
+
+            logging.info(f"Wrote code to {script_path}")
+
+            try:
+                # Execute directly with subprocess using asyncify for better reliability
+                result = await asyncify(self._run_subprocess)([python_executable, script_path], timeout)
+
+                # Main execution result
+                return {
+                    "success": result.returncode == 0,
+                    "stdout": result.stdout,
+                    "stderr": result.stderr,
+                    "returncode": result.returncode,
+                }
+            except subprocess.TimeoutExpired:
+                return {"success": False, "error": f"Execution timed out after {timeout} seconds"}
+
+        except Exception as e:
+            return {"success": False, "error": f"Execution error: {str(e)}"}