Merge remote-tracking branch 'origin/main' into tinyra2

.devcontainer/Dockerfile

@@ -9,18 +9,24 @@ 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 \
- && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.deb \
- && dpkg -i quarto-1.4.549-linux-amd64.deb \
- && rm -rf /var/lib/apt/lists/* quarto-1.4.549-linux-amd64.deb
+ && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
+ && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
+ && dpkg -i quarto-1.5.23-linux-${arch}.deb \
+ && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
 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
+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
@@ -33,17 +36,18 @@ RUN cd website
 RUN yarn install --frozen-lockfile --ignore-engines
 
 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
- wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-${arch}.tar.gz && \
+ wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \
  mkdir -p /home/autogen/quarto/ && \
- tar -xzf quarto-1.4.549-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \
- rm quarto-1.4.549-linux-${arch}.tar.gz
+ tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \
+ rm quarto-1.5.23-linux-${arch}.tar.gz
 
-ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.4.549/bin/"
+ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.5.23/bin/"
 
 # Exposes the Yarn port for Docusaurus
 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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,6 +22,12 @@ body:
  3. ...
  4. See error
  placeholder: How can we replicate the issue?
+ - type: textarea
+ id: modelused
+ attributes:
+ label: Model Used
+ description: A description of the model that was used when the error was encountered
+ placeholder: gpt-4, mistral-7B etc
  - type: textarea
  id: expected_behavior
  attributes:

.github/workflows/build.yml

@@ -31,9 +31,9 @@ jobs:
  os: [ubuntu-latest, macos-latest, windows-latest]
  python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -43,12 +43,11 @@ jobs:
  python -c "import autogen"
  pip install pytest mock
  - name: Install optional dependencies for code executors
- # code executors auto skip without deps, so only run for python 3.11
+ # code executors and udfs auto skip without deps, so only run for python 3.11
  if: matrix.python-version == '3.11'
  run: |
- pip install jupyter-client ipykernel
+ pip install -e ".[jupyter-executor,test]"
  python -m ipykernel install --user --name python3
- pip install -e ".[local-jupyter-exec]"
  - name: Set AUTOGEN_USE_DOCKER based on OS
  shell: bash
  run: |
@@ -58,16 +57,16 @@ jobs:
  - name: Test with pytest skipping openai tests
  if: matrix.python-version != '3.10' && matrix.os == 'ubuntu-latest'
  run: |
- pytest test --skip-openai
+ pytest test --skip-openai --durations=10 --durations-min=1.0
  - name: Test with pytest skipping openai and docker tests
  if: matrix.python-version != '3.10' && matrix.os != 'ubuntu-latest'
  run: |
- pytest test --skip-openai --skip-docker
+ pytest test --skip-openai --skip-docker --durations=10 --durations-min=1.0
  - name: Coverage
  if: matrix.python-version == '3.10'
  run: |
- pip install -e .[test,redis]
- coverage run -a -m pytest test --ignore=test/agentchat/contrib --skip-openai
+ pip install -e .[test,redis,websockets]
+ coverage run -a -m pytest test --ignore=test/agentchat/contrib --skip-openai --durations=10 --durations-min=1.0
  coverage xml
  - name: Upload coverage to Codecov
  if: matrix.python-version == '3.10'

.github/workflows/contrib-openai.yml

@@ -4,7 +4,7 @@
 name: OpenAI4ContribTests
 
 on:
- pull_request_target:
+ pull_request:
  branches: ['main']
  paths:
  - 'autogen/**'
@@ -27,11 +27,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -70,11 +70,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -111,11 +111,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -152,11 +152,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -173,7 +173,7 @@ jobs:
  AZURE_OPENAI_API_BASE: ${{ secrets.AZURE_OPENAI_API_BASE }}
  OAI_CONFIG_LIST: ${{ secrets.OAI_CONFIG_LIST }}
  run: |
- coverage run -a -m pytest test/agentchat/contrib/test_teachable_agent.py
+ coverage run -a -m pytest test/agentchat/contrib/capabilities/test_teachable_agent.py
  coverage xml
  - name: Upload coverage to Codecov
  uses: codecov/codecov-action@v3
@@ -190,11 +190,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -231,11 +231,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -270,11 +270,11 @@ jobs:
  steps:
  # checkout to pr branch
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install packages and dependencies
@@ -299,3 +299,38 @@ jobs:
  with:
  file: ./coverage.xml
  flags: unittests
+ ImageGen:
+ strategy:
+ matrix:
+ os: [ubuntu-latest]
+ python-version: ["3.12"]
+ runs-on: ${{ matrix.os }}
+ environment: openai1
+ steps:
+ # checkout to pr branch
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install packages and dependencies
+ run: |
+ docker --version
+ python -m pip install --upgrade pip wheel
+ pip install -e .[lmm]
+ python -c "import autogen"
+ pip install coverage pytest
+ - name: Coverage
+ env:
+ OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+ run: |
+ coverage run -a -m pytest test/agentchat/contrib/capabilities/test_image_generation_capability.py
+ coverage xml
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ file: ./coverage.xml
+ flags: unittests