Merge branch 'main' into ollamaclient

microsoft · Aug 29, 2024 · 143def8 · 143def8
2 parents cc74546 + 5861bd9
commit 143def8
Show file tree

Hide file tree

Showing 246 changed files with 15,412 additions and 6,009 deletions.
diff --git a/.github/workflows/contrib-openai.yml b/.github/workflows/contrib-openai.yml
@@ -111,46 +111,7 @@ jobs:
         with:
           file: ./coverage.xml
           flags: unittests
-  CompressionTest:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.9"]
-    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 .
-          python -c "import autogen"
-          pip install pytest-cov>=5 pytest-asyncio
-      - name: Install packages for test when needed
-        run: |
-          pip install docker
-      - name: Coverage
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
-          AZURE_OPENAI_API_BASE: ${{ secrets.AZURE_OPENAI_API_BASE }}
-          OAI_CONFIG_LIST: ${{ secrets.OAI_CONFIG_LIST }}
-        run: |
-          pytest test/agentchat/contrib/test_compressible_agent.py
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-          flags: unittests
+
   GPTAssistantAgent:
     strategy:
       matrix:
@@ -306,44 +267,7 @@ jobs:
         with:
           file: ./coverage.xml
           flags: unittests
-  ContextHandling:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.11"]
-    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 .
-          python -c "import autogen"
-          pip install pytest-cov>=5
-      - name: Coverage
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
-          AZURE_OPENAI_API_BASE: ${{ secrets.AZURE_OPENAI_API_BASE }}
-          OAI_CONFIG_LIST: ${{ secrets.OAI_CONFIG_LIST }}
-          BING_API_KEY: ${{ secrets.BING_API_KEY }}
-        run: |
-          pytest test/agentchat/contrib/capabilities/test_context_handling.py
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-          flags: unittests
+
   ImageGen:
     strategy:
       matrix:

diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml
@@ -163,41 +163,6 @@ jobs:
           file: ./coverage.xml
           flags: unittests
 
-  CompressionTest:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-2019]
-        python-version: ["3.10"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install packages and dependencies for all tests
-        run: |
-          python -m pip install --upgrade pip wheel
-          pip install pytest-cov>=5
-      - name: Install packages and dependencies for Compression
-        run: |
-          pip install -e .
-      - name: Set AUTOGEN_USE_DOCKER based on OS
-        shell: bash
-        run: |
-          if [[ ${{ matrix.os }} != ubuntu-latest ]]; then
-            echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
-          fi
-      - name: Coverage
-        run: |
-          pytest test/agentchat/contrib/test_compressible_agent.py --skip-openai
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-          flags: unittests
-
   GPTAssistantAgent:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -384,41 +349,6 @@ jobs:
           file: ./coverage.xml
           flags: unittests
 
-  ContextHandling:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-2019]
-        python-version: ["3.11"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install packages and dependencies for all tests
-        run: |
-          python -m pip install --upgrade pip wheel
-          pip install pytest-cov>=5
-      - name: Install packages and dependencies for Context Handling
-        run: |
-          pip install -e .
-      - name: Set AUTOGEN_USE_DOCKER based on OS
-        shell: bash
-        run: |
-          if [[ ${{ matrix.os }} != ubuntu-latest ]]; then
-            echo "AUTOGEN_USE_DOCKER=False" >> $GITHUB_ENV
-          fi
-      - name: Coverage
-        run: |
-          pytest test/agentchat/contrib/capabilities/test_context_handling.py --skip-openai
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.xml
-          flags: unittests
-
   TransformMessages:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -485,7 +415,6 @@ jobs:
           file: ./coverage.xml
           flags: unittests
 
-
   AnthropicTest:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -684,7 +613,7 @@ jobs:
           file: ./coverage.xml
           flags: unittests
 
-  OllamaTest:
+  BedrockTest:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -706,9 +635,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel
           pip install pytest-cov>=5
-      - name: Install packages and dependencies for Ollama
+      - name: Install packages and dependencies for Amazon Bedrock
         run: |
-          pip install -e .[ollama,test]
+          pip install -e .[boto3,test]
       - name: Set AUTOGEN_USE_DOCKER based on OS
         shell: bash
         run: |
@@ -717,9 +646,41 @@ jobs:
           fi
       - name: Coverage
         run: |
-          pytest test/oai/test_ollama.py --skip-openai
+          pytest test/oai/test_bedrock.py --skip-openai
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
           flags: unittests
+
+  OllamaTest:
+      runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-2019]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        exclude:
+          - os: macos-latest
+            python-version: "3.9"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install packages and dependencies for all tests
+        run: |
+          python -m pip install --upgrade pip wheel
+          pip install pytest-cov>=5
+      - name: Install packages and dependencies for Ollama
+        run: |
+          pip install -e .[ollama,test]
+          pytest test/oai/test_ollama.py --skip-openai
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+          flags: unittests
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -51,12 +51,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-latest ]
+        python-version: ["3.11"]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
       with:
         lfs: true
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install jupyter and ipykernel
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install jupyter
+        python -m pip install ipykernel
+    - name: list available kernels
+      run: |
+        python -m jupyter kernelspec list
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
@@ -114,6 +128,18 @@ jobs:
     - uses: actions/checkout@v4
       with:
         lfs: true
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.11
+    - name: Install jupyter and ipykernel
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install jupyter
+        python -m pip install ipykernel
+    - name: list available kernels
+      run: |
+        python -m jupyter kernelspec list
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:

diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -29,6 +29,18 @@ jobs:
     - uses: actions/checkout@v4
       with:
         lfs: true
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.11
+    - name: Install jupyter and ipykernel
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install jupyter
+        python -m pip install ipykernel
+    - name: list available kernels
+      run: |
+        python -m jupyter kernelspec list
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:

diff --git a/CITATION.cff b/CITATION.cff
@@ -5,7 +5,7 @@ preferred-citation:
     given-names: "Qingyun"
     affiliation: "Penn State University, University Park PA USA"
   - family-names: "Bansal"
-    given-names: "Gargan"
+    given-names: "Gagan"
     affiliation: "Microsoft Research, Redmond WA USA"
   - family-names: "Zhang"
     given-names: "Jieyu"
@@ -43,6 +43,7 @@ preferred-citation:
   - family-names: "Wang"
     given-names: "Chi"
     affiliation: "Microsoft Research, Redmond WA USA"
-  booktitle: "ArXiv preprint arXiv:2308.08155"
+  booktitle: "COLM"
   title: "AutoGen: Enabling Next-Gen LLM Applications via Multi-Agent Conversation Framework"
-  year: 2023
+  year: 2024
+  url: "https://aka.ms/autogen-pdf"
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,43 @@
+# Contributors
+
+## Special thanks to all the people who help this project:
+> These individuals dedicate their time and expertise to improve this project. We are deeply grateful for their contributions.
+
+| Name | GitHub Handle | Organization | Features | Roadmap Lead | Additional  Information |
+|---|---|---|---|---|---|
+| Qingyun Wu | [qingyun-wu](https://github.com/qingyun-wu) | Penn State University | all, alt-models, autobuilder | Yes | Available most of the time (US Eastern Time) |
+| Chi Wang | [sonichi](https://github.com/sonichi) | - | all | Yes | |
+| Li Jiang | [thinkall](https://github.com/thinkall) | Microsoft | rag, autobuilder, group chat | Yes | [Issue #1657](https://github.com/microsoft/autogen/issues/1657) - Beijing, GMT+8 |
+| Mark Sze | [marklysze](https://github.com/marklysze) | - | alt-models, group chat | No | Generally available (Sydney, AU time) - Group Chat "auto" speaker selection |
+| Hrushikesh Dokala | [Hk669](https://github.com/Hk669) | - | alt-models, swebench, logging, rag | No | [Issue #2946](https://github.com/microsoft/autogen/issues/2946), [Pull Request #2933](https://github.com/microsoft/autogen/pull/2933) - Available most of the time (India, GMT+5:30) |
+| Jiale Liu | [LeoLjl](https://github.com/LeoLjl) | Penn State University | autobuild, group chat | No | |
+| Shaokun Zhang | [skzhang1](https://github.com/skzhang1) | Penn State University | AgentOptimizer, Teachability            | Yes | [Issue #521](https://github.com/microsoft/autogen/issues/521)                         |
+| Rajan Chari | [rajan-chari](https://github.com/rajan-chari) | Microsoft Research | CAP, Survey of other frameworks | No | |
+| Victor Dibia | [victordibia](https://github.com/victordibia) | Microsoft Research | autogenstudio | Yes | [Issue #737](https://github.com/microsoft/autogen/issues/737) |
+| Yixuan Zhai | [randombet](https://github.com/randombet) | Meta | group chat, sequential_chats, rag       | No | |
+| Xiaoyun Zhang | [LittleLittleCloud](https://github.com/LittleLittleCloud) | Microsoft | AutoGen.Net, group chat | Yes | [Backlog - AutoGen.Net](https://github.com/microsoft/autogen/issues) - Available most of the time (PST) |
+| Yiran Wu | [yiranwu0](https://github.com/yiranwu0) | Penn State University | alt-models, group chat, logging | Yes | |
+| Beibin Li | [BeibinLi](https://github.com/BeibinLi) | Microsoft Research | alt-models | Yes | |
+| Gagan Bansal | [gagb](https://github.com/gagb) | Microsoft Research |  All | | |
+| Adam Fourney | [afourney](https://github.com/afourney) | Microsoft Research |  Complex Tasks | | |
+| Ricky Loynd | [rickyloynd-microsoft](https://github.com/rickyloynd-microsoft) | Microsoft Research | Teachability | | |
+| Eric Zhu | [ekzhu](https://github.com/ekzhu) | Microsoft Research |  All, Infra | | |
+| Jack Gerrits | [jackgerrits](https://github.com/jackgerrits) | Microsoft Research |  All, Infra | | |
+| David Luong | [DavidLuong98](https://github.com/DavidLuong98) | Microsoft | AutoGen.Net | | |
+| Davor Runje | [davorrunje](https://github.com/davorrunje) | airt.ai | Tool calling, IO | | Available most of the time (Central European Time) |
+| Friederike Niedtner | [Friderike](https://www.microsoft.com/en-us/research/people/fniedtner/) | Microsoft Research | PM | | |
+| Rafah Hosn | [Rafah](https://www.microsoft.com/en-us/research/people/raaboulh/) | Microsoft Research | PM | | |
+| Robin Moeur | [Robin](https://www.linkedin.com/in/rmoeur/) | Microsoft Research | PM | | |
+| Jingya Chen | [jingyachen](https://github.com/JingyaChen) | Microsoft | UX Design, AutoGen Studio | | |
+| Suff Syed | [suffsyed](https://github.com/suffsyed) | Microsoft | UX Design, AutoGen Studio | | |
+
+## I would like to join this list. How can I help the project?
+> We're always looking for new contributors to join our team and help improve the project. For more information, please refer to our [CONTRIBUTING](https://microsoft.github.io/autogen/docs/contributor-guide/contributing) guide.
+
+
+## Are you missing from this list?
+> Please open a PR to help us fix this.
+
+
+## Acknowledgements
+This template was adapted from [GitHub Template Guide](https://github.com/cezaraugusto/github-template-guidelines/blob/master/.github/CONTRIBUTORS.md) by [cezaraugusto](https://github.com/cezaraugusto).