Merge remote-tracking branch 'origin/main' into add-output-protocol

Author: davorrunje

.devcontainer/Dockerfile

@@ -9,9 +9,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
 # Update the OS and maybe install packages
 #
 ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
 RUN apt-get update \
    && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
    && apt-get autoremove -y \
    && apt-get clean -y \
    && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
@@ -22,6 +26,7 @@ ENV DEBIAN_FRONTEND=dialog
 
 # For docs
 RUN npm install --global yarn
+RUN pip install --upgrade pip
 RUN pip install pydoc-markdown
 RUN pip install pyyaml
 RUN pip install colored

.devcontainer/dev/Dockerfile

@@ -1,10 +1,13 @@
 # Basic setup
 FROM python:3.11-slim-bookworm
 
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
 # Update and install necessary packages
 RUN apt-get update && apt-get -y update
 # added vim and nano for convenience
-RUN apt-get install -y sudo git npm vim nano curl wget
+RUN apt-get install -y sudo git npm vim nano curl wget git-lfs
 
 # Setup a non-root user 'autogen' with sudo access
 RUN adduser --disabled-password --gecos '' autogen
@@ -44,6 +47,7 @@ ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.5.23/bin/"
 EXPOSE 3000
 
 # Pre-load popular Python packages
+RUN pip install --upgrade pip
 RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4
 
 # Set the default command to bash

.devcontainer/full/Dockerfile

@@ -1,9 +1,12 @@
 FROM python:3.11-slim-bookworm
 
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
 # Update and install dependencies
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        software-properties-common sudo\
+        software-properties-common sudo git-lfs \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

.devcontainer/studio/Dockerfile

@@ -9,14 +9,19 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
 # Update the OS and maybe install packages
 #
 ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
 RUN apt-get update \
    && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
    && apt-get autoremove -y \
    && apt-get clean -y \
    && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=dialog
 
 # For docs
 RUN npm install --global yarn
+RUN pip install --upgrade pip
 RUN pip install pydoc-markdown

.gitattributes

@@ -0,0 +1,69 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: dotnet-release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dotnet/release
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build:
+    name: Build and release
+    runs-on: ubuntu-latest
+    environment: dotnet
+    defaults:
+      run:
+        working-directory: dotnet
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: dotnet/global.json
+    - name: Restore dependencies
+      run: |
+        dotnet restore -bl
+    - name: Build
+      run: |
+        echo "Build AutoGen"
+        dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
+    - name: Unit Test
+      run: dotnet test --no-build -bl --configuration Release
+      env:
+        AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
+        AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
+        AZURE_GPT_35_MODEL_ID: ${{ secrets.AZURE_GPT_35_MODEL_ID }}
+        OEPNAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+    - name: Pack
+      run: |
+        echo "Create release build package"
+        dotnet pack --no-build --configuration Release --output './output/release' -bl
+
+        echo "ls output directory"
+        ls -R ./output
+    - name: Publish package to Nuget
+      run: |
+        echo "Publish package to Nuget"
+        echo "ls output directory"
+        ls -R ./output/release
+        dotnet nuget push --api-key AzureArtifacts ./output/release/*.nupkg --skip-duplicate --api-key ${{ secrets.AUTOGEN_NUGET_API_KEY }}
+    - name: Tag commit
+      run: |
+        Write-Host "Tag commit"
+        # version = eng/MetaInfo.props.Project.PropertyGroup.VersionPrefix
+        $metaInfoContent = cat ./eng/MetaInfo.props
+        $version = $metaInfoContent | Select-String -Pattern "<VersionPrefix>(.*)</VersionPrefix>" | ForEach-Object { $_.Matches.Groups[1].Value }
+        git tag -a "$version" -m "AutoGen.Net release $version"
+        git push origin --tags
+      shell: pwsh

.github/workflows/dotnet-release.yml

@@ -19,4 +19,7 @@ jobs:
       - uses: actions/setup-python@v4
       - run: pip install ".[jupyter-executor]" mypy
       # As more modules are type check clean, add them here
-      - run: mypy --install-types --non-interactive autogen/logger
+      - run: |
+          mypy --install-types --non-interactive \
+            autogen/logger \
+            autogen/exception_utils.py

.github/workflows/type-check.yml

@@ -178,5 +178,7 @@ test/agentchat/test_agent_scripts/*
 
 # test cache
 .cache_test
+.db
+
 
 notebook/result.png

.gitignore

@@ -35,7 +35,7 @@ repos:
     rev: v2.2.6
     hooks:
       - id: codespell
-        args: ["-L", "ans,linar,nam,"]
+        args: ["-L", "ans,linar,nam,tread,ot,"]
         exclude: |
             (?x)^(
               pyproject.toml |

.pre-commit-config.yaml

@@ -131,6 +131,12 @@ def __init__(
             description (str): a short description of the agent. This description is used by other agents
                 (e.g. the GroupChatManager) to decide when to call upon this agent. (Default: system_message)
         """
+        # we change code_execution_config below and we have to make sure we don't change the input
+        # in case of UserProxyAgent, without this we could even change the default value {}
+        code_execution_config = (
+            code_execution_config.copy() if hasattr(code_execution_config, "copy") else code_execution_config
+        )
+
         self._name = name
         # a dictionary of conversations, default value is list
         self._oai_messages = defaultdict(list)
@@ -265,13 +271,10 @@ def description(self, description: str):
         self._description = description
 
     @property
-    def code_executor(self) -> CodeExecutor:
-        """The code executor used by this agent. Raise if code execution is disabled."""
+    def code_executor(self) -> Optional[CodeExecutor]:
+        """The code executor used by this agent. Returns None if code execution is disabled."""
         if not hasattr(self, "_code_executor"):
-            raise ValueError(
-                "No code executor as code execution is disabled. "
-                "To enable code execution, set code_execution_config."
-            )
+            return None
         return self._code_executor
 
     def register_reply(

autogen/agentchat/conversable_agent.py

@@ -30,7 +30,7 @@ def __init__(
         max_consecutive_auto_reply: Optional[int] = None,
         human_input_mode: Literal["ALWAYS", "TERMINATE", "NEVER"] = "ALWAYS",
         function_map: Optional[Dict[str, Callable]] = None,
-        code_execution_config: Optional[Union[Dict, Literal[False]]] = None,
+        code_execution_config: Union[Dict, Literal[False]] = {},
         default_auto_reply: Optional[Union[str, Dict, None]] = "",
         llm_config: Optional[Union[Dict, Literal[False]]] = False,
         system_message: Optional[Union[str, List]] = "",

autogen/agentchat/user_proxy_agent.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Protocol, Union, runtime_checkable
+from typing import Any, Dict, List, Optional, Protocol, Union, runtime_checkable
 
 from pydantic import BaseModel, Field
 
@@ -77,3 +77,12 @@ class IPythonCodeResult(CodeResult):
         default_factory=list,
         description="The list of files that the executed code blocks generated.",
     )
+
+
+class CommandLineCodeResult(CodeResult):
+    """(Experimental) A code result class for command line code executor."""
+
+    code_file: Optional[str] = Field(
+        default=None,
+        description="The file that the executed code block was saved to.",
+    )

autogen/coding/base.py

@@ -11,7 +11,8 @@
 from docker.models.containers import Container
 from docker.errors import ImageNotFound
 
-from .local_commandline_code_executor import CommandLineCodeResult
+from .utils import _get_file_name_from_content
+from .base import CommandLineCodeResult
 
 from ..code_utils import TIMEOUT_MSG, _cmd
 from .base import CodeBlock, CodeExecutor, CodeExtractor
@@ -168,25 +169,15 @@ def execute_code_blocks(self, code_blocks: List[CodeBlock]) -> CommandLineCodeRe
             lang = code_block.language
             code = code_block.code
 
-            code_hash = md5(code.encode()).hexdigest()
-
-            # Check if there is a filename comment
-            # Get first line
-            first_line = code.split("\n")[0]
-            if first_line.startswith("# filename:"):
-                filename = first_line.split(":")[1].strip()
-
-                # Handle relative paths in the filename
-                path = Path(filename)
-                if not path.is_absolute():
-                    path = Path("/workspace") / path
-                path = path.resolve()
-                try:
-                    path.relative_to(Path("/workspace"))
-                except ValueError:
-                    return CommandLineCodeResult(exit_code=1, output="Filename is not in the workspace")
-            else:
-                # create a file with a automatically generated name
+            try:
+                # Check if there is a filename comment
+                filename = _get_file_name_from_content(code, Path("/workspace"))
+            except ValueError:
+                return CommandLineCodeResult(exit_code=1, output="Filename is not in the workspace")
+
+            if filename is None:
+                # create a file with an automatically generated name
+                code_hash = md5(code.encode()).hexdigest()
                 filename = f"tmp_code_{code_hash}.{'py' if lang.startswith('python') else lang}"
 
             code_path = self._work_dir / filename