cleanup

.devcontainer/devcontainer.json

@@ -9,5 +9,5 @@
         },
         "terminal.integrated.defaultProfile.linux": "bash"
     },
-    "updateContentCommand": "pip install -e .[notebook,openai] pre-commit && pre-commit install"
+    "updateContentCommand": "pip install -e . pre-commit && pre-commit install"
 }

.github/workflows/openai.yml

@@ -7,8 +7,11 @@ on:
   pull_request:
     branches: ['main']
     paths:
-      - 'flaml/autogen/**'
-      - 'test/autogen/**'
+      - 'autogen/**'
+      - 'test/**'
+      - 'notebook/autogen_agentchat_auto_feedback_from_code_execution.ipynb'
+      - 'notebook/autogen_agentchat_function_call.ipynb'
+      - 'notebook/autogen_agentchat_MathChat.ipynb'
       - 'notebook/autogen_openai_completion.ipynb'
       - 'notebook/autogen_chatgpt_gpt4.ipynb'
       - '.github/workflows/openai.yml'
@@ -31,8 +34,8 @@ jobs:
         run: |
           docker --version
           python -m pip install --upgrade pip wheel
-          pip install -e .[autogen,blendsearch]
-          python -c "import flaml"
+          pip install -e .[tune]
+          python -c "import autogen"
           pip install coverage pytest datasets
       - name: Install packages for test when needed
         if: matrix.python-version == '3.9'
@@ -54,7 +57,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/autogen
+          coverage run -a -m pytest test
           coverage xml
       - name: Coverage and check notebook outputs
         if: matrix.python-version != '3.9'
@@ -66,9 +69,9 @@ jobs:
           OAI_CONFIG_LIST: ${{ secrets.OAI_CONFIG_LIST }}
         run: |
           pip install nbconvert nbformat ipykernel
-          coverage run -a -m pytest test/autogen/test_notebook.py
+          coverage run -a -m pytest test/test_notebook.py
           coverage xml
-          cat "$(pwd)/test/autogen/executed_openai_notebook_output.txt"
+          cat "$(pwd)/test/executed_openai_notebook_output.txt"
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:

.github/workflows/python-package.yml

@@ -36,51 +36,12 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: On mac + python 3.10, install libomp to facilitate lgbm and xgboost install
-        if: matrix.os == 'macOS-latest' && matrix.python-version == '3.10'
-        run: |
-          # remove libomp version constraint after xgboost works with libomp>11.1.0 on python 3.10
-          wget https://raw.githubusercontent.com/Homebrew/homebrew-core/679923b4eb48a8dc7ecc1f05d06063cd79b3fc00/Formula/libomp.rb -O $(find $(brew --repository) -name libomp.rb)
-          brew unlink libomp
-          brew install libomp
-          export CC=/usr/bin/clang
-          export CXX=/usr/bin/clang++
-          export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp"
-          export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include"
-          export CXXFLAGS="$CXXFLAGS -I/usr/local/opt/libomp/include"
-          export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp"
       - name: Install packages and dependencies
         run: |
           python -m pip install --upgrade pip wheel
           pip install -e .
-          python -c "import flaml"
+          python -c "import autogen"
           pip install -e .[test]
-      - name: On Ubuntu python 3.8, install pyspark 3.2.3
-        if: matrix.python-version == '3.8' && matrix.os == 'ubuntu-latest'
-        run: |
-          pip install pyspark==3.2.3
-          pip list | grep "pyspark"
-      - name: If linux, install ray 2
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          pip install "ray[tune]<2.5.0"
-      - name: If mac, install ray
-        if: matrix.os == 'macOS-latest'
-        run: |
-          pip install -e .[ray]
-      - name: If linux or mac, install prophet on python < 3.9
-        if: (matrix.os == 'macOS-latest' || matrix.os == 'ubuntu-latest') && matrix.python-version != '3.9' && matrix.python-version != '3.10'
-        run: |
-          pip install -e .[forecast]
-      - name: Install vw on python < 3.10
-        if: matrix.python-version != '3.10'
-        run: |
-          pip install -e .[vw]
-      - name: Uninstall pyspark on (python 3.9) or (python 3.8 + windows)
-        if: matrix.python-version == '3.9' || (matrix.python-version == '3.8' && matrix.os == 'windows-2019')
-        run: |
-          # Uninstall pyspark to test env without pyspark
-          pip uninstall -y pyspark
       - name: Test with pytest
         if: matrix.python-version != '3.10'
         run: |
@@ -97,28 +58,3 @@ jobs:
         with:
           file: ./coverage.xml
           flags: unittests
-
-  # docs:
-
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Setup Python
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.8'
-  #     - name: Compile documentation
-  #       run: |
-  #           pip install -e .
-  #           python -m pip install sphinx sphinx_rtd_theme
-  #           cd docs
-  #           make html
-  #     - name: Deploy to GitHub pages
-  #       if: ${{ github.ref == 'refs/heads/main' }}
-  #       uses: JamesIves/github-pages-deploy-action@3.6.2
-  #       with:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #         BRANCH: gh-pages
-  #         FOLDER: docs/_build/html
-  #         CLEAN: true

README.md

@@ -5,25 +5,24 @@ This project welcomes contributions and suggestions.  Most contributions require
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
 the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
 [![PyPI version](https://badge.fury.io/py/pyautogen.svg)](https://badge.fury.io/py/pyautogen)
-<!-- ![Conda version](https://img.shields.io/conda/vn/conda-forge/flaml) -->
+<!-- ![Conda version](https://img.shields.io/conda/vn/conda-forge/pyautogen) -->
 [![Build](https://github.com/microsoft/autogen/actions/workflows/python-package.yml/badge.svg)](https://github.com/microsoft/autogen/actions/workflows/python-package.yml)
 ![Python Version](https://img.shields.io/badge/3.8%20%7C%203.9%20%7C%203.10-blue)
-<!-- [![Downloads](https://pepy.tech/badge/flaml)](https://pepy.tech/project/flaml) -->
+<!-- [![Downloads](https://pepy.tech/badge/pyautogen)](https://pepy.tech/project/pyautogen) -->
 [![](https://img.shields.io/discord/1025786666260111483?logo=discord&style=flat)](https://discord.gg/Cppx2vSPVP)
-<!-- [![Join the chat at https://gitter.im/FLAMLer/community](https://badges.gitter.im/FLAMLer/community.svg)](https://gitter.im/FLAMLer/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -->
 
 This project is a spinoff from [FLAML](https://github.com/microsoft/FLAML).
 
 # AutoGen
 
 <!-- <p align="center">
-    <img src="https://github.com/microsoft/FLAML/blob/main/website/static/img/flaml.svg"  width=200>
+    <img src="https://github.com/microsoft/autogen/blob/main/website/static/img/flaml.svg"  width=200>
     <br>
 </p> -->
 
-<!-- :fire: Heads-up: We're preparing to migrate [autogen](https://microsoft.github.io/FLAML/docs/Use-Cases/Autogen) into a dedicated github repository. Alongside this move, we'll also launch a dedicated Discord server and a website for comprehensive documentation.
+:fire: autogen has graduated from [FLAML](https://github.com/microsoft/FLAML) into a new project.
 
-:fire: The automated multi-agent chat framework in [autogen](https://microsoft.github.io/FLAML/docs/Use-Cases/Autogen) is in preview from v2.0.0.
+<!-- :fire: Heads-up: We're preparing to migrate [autogen](https://microsoft.github.io/FLAML/docs/Use-Cases/Autogen) into a dedicated github repository. Alongside this move, we'll also launch a dedicated Discord server and a website for comprehensive documentation.
 
 :fire: FLAML is highlighted in OpenAI's [cookbook](https://github.com/openai/openai-cookbook#related-resources-from-around-the-web).
 
@@ -54,14 +53,14 @@ AutoGen requires **Python version >= 3.8**. It can be installed from pip:
 pip install pyautogen
 ```
 
-<!-- Minimal dependencies are installed without extra options. You can install extra options based on the feature you need.
-For example, use the following to install the dependencies needed by the [`autogen`](https://microsoft.github.io/FLAML/docs/Use-Cases/Autogen) package.
+Minimal dependencies are installed without extra options. You can install extra options based on the feature you need.
+For example, use the following to install the dependencies needed by the [`blendsearch`](https://microsoft.github.io/FLAML/docs/Use-Cases/Tune-User-Defined-Function#blendsearch-economical-hyperparameter-optimization-with-blended-search-strategy) option.
 ```bash
-pip install "flaml[autogen]"
+pip install "pyautogen[blendsearch]"
 ```
 
 Find more options in [Installation](https://microsoft.github.io/autogen/docs/Installation).
-Each of the [`notebook examples`](https://github.com/microsoft/FLAML/tree/main/notebook) may require a specific option to be installed. -->
+<!-- Each of the [`notebook examples`](https://github.com/microsoft/autogen/tree/main/notebook) may require a specific option to be installed. -->
 
 ## Quickstart
 

autogen/__init__.py

@@ -0,0 +1,10 @@
+import logging
+from .version import __version__
+from .oai import *
+from .agentchat import *
+from .code_utils import DEFAULT_MODEL, FAST_MODEL
+
+
+# Set the root logger.
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)

flaml/autogen/agentchat/contrib/math_user_proxy_agent.py → autogen/agentchat/contrib/math_user_proxy_agent.py

@@ -4,9 +4,9 @@
 from typing import Any, Callable, Dict, List, Optional, Union
 from time import sleep
 
-from flaml.autogen.agentchat import Agent, UserProxyAgent
-from flaml.autogen.code_utils import UNKNOWN, extract_code, execute_code, infer_lang
-from flaml.autogen.math_utils import get_answer
+from autogen.agentchat import Agent, UserProxyAgent
+from autogen.code_utils import UNKNOWN, extract_code, execute_code, infer_lang
+from autogen.math_utils import get_answer
 
 
 PROMPTS = {

flaml/autogen/agentchat/contrib/retrieve_assistant_agent.py → autogen/agentchat/contrib/retrieve_assistant_agent.py

@@ -1,5 +1,5 @@
-from flaml.autogen.agentchat.agent import Agent
-from flaml.autogen.agentchat.assistant_agent import AssistantAgent
+from agentchat.agent import Agent
+from agentchat.assistant_agent import AssistantAgent
 from typing import Callable, Dict, Optional, Union, List, Tuple, Any
 
 

flaml/autogen/agentchat/contrib/retrieve_user_proxy_agent.py → autogen/agentchat/contrib/retrieve_user_proxy_agent.py

@@ -1,8 +1,8 @@
 import chromadb
-from flaml.autogen.agentchat.agent import Agent
-from flaml.autogen.agentchat import UserProxyAgent
-from flaml.autogen.retrieve_utils import create_vector_db_from_dir, query_vector_db, num_tokens_from_text
-from flaml.autogen.code_utils import extract_code
+from autogen.agentchat.agent import Agent
+from autogen.agentchat import UserProxyAgent
+from autogen.retrieve_utils import create_vector_db_from_dir, query_vector_db, num_tokens_from_text
+from autogen.code_utils import extract_code
 
 from typing import Callable, Dict, Optional, Union, List, Tuple, Any
 from IPython import get_ipython
@@ -106,7 +106,7 @@ def __init__(
                 - docs_path (Optional, str): the path to the docs directory. It can also be the path to a single file,
                     or the url to a single file. If key not provided, a default path `./docs` will be used.
                 - collection_name (Optional, str): the name of the collection.
-                    If key not provided, a default name `flaml-docs` will be used.
+                    If key not provided, a default name `autogen-docs` will be used.
                 - model (Optional, str): the model to use for the retrieve chat.
                     If key not provided, a default model `gpt-4` will be used.
                 - chunk_token_size (Optional, int): the chunk token size for the retrieve chat.
@@ -135,7 +135,7 @@ def __init__(
         self._task = self._retrieve_config.get("task", "default")
         self._client = self._retrieve_config.get("client", chromadb.Client())
         self._docs_path = self._retrieve_config.get("docs_path", "./docs")
-        self._collection_name = self._retrieve_config.get("collection_name", "flaml-docs")
+        self._collection_name = self._retrieve_config.get("collection_name", "autogen-docs")
         self._model = self._retrieve_config.get("model", "gpt-4")
         self._max_tokens = self.get_max_tokens(self._model)
         self._chunk_token_size = int(self._retrieve_config.get("chunk_token_size", self._max_tokens * 0.4))

flaml/autogen/agentchat/conversable_agent.py → autogen/agentchat/conversable_agent.py

@@ -3,9 +3,9 @@
 import copy
 import json
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
-from flaml.autogen import oai
+from autogen import oai
 from .agent import Agent
-from flaml.autogen.code_utils import (
+from autogen.code_utils import (
     DEFAULT_MODEL,
     UNKNOWN,
     execute_code,
@@ -78,7 +78,7 @@ def __init__(
                 - work_dir (Optional, str): The working directory for the code execution.
                     If None, a default working directory will be used.
                     The default working directory is the "extensions" directory under
-                    "path_to_flaml/autogen".
+                    "path_to_autogen".
                 - use_docker (Optional, 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.

flaml/autogen/agentchat/user_proxy_agent.py → autogen/agentchat/user_proxy_agent.py

@@ -51,7 +51,7 @@ def __init__(
                 - work_dir (Optional, str): The working directory for the code execution.
                     If None, a default working directory will be used.
                     The default working directory is the "extensions" directory under
-                    "path_to_flaml/autogen".
+                    "path_to_autogen".
                 - use_docker (Optional, 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.

flaml/autogen/code_utils.py → autogen/code_utils.py

@@ -8,7 +8,7 @@
 import time
 from hashlib import md5
 import logging
-from flaml.autogen import oai
+from autogen import oai
 
 try:
     import docker
@@ -205,7 +205,7 @@ def execute_code(
         work_dir (Optional, str): The working directory for the code execution.
             If None, a default working directory will be used.
             The default working directory is the "extensions" directory under
-            "path_to_flaml/autogen".
+            "path_to_autogen".
         use_docker (Optional, 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.

flaml/autogen/math_utils.py → autogen/math_utils.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from flaml.autogen import oai, DEFAULT_MODEL
+from autogen import oai, DEFAULT_MODEL
 
 _MATH_PROMPT = "{problem} Solve the problem carefully. Simplify your answer as much as possible. Put the final answer in \\boxed{{}}."
 _MATH_CONFIG = {

flaml/autogen/oai/__init__.py → autogen/oai/__init__.py

@@ -1,5 +1,5 @@
-from flaml.autogen.oai.completion import Completion, ChatCompletion
-from flaml.autogen.oai.openai_utils import (
+from autogen.oai.completion import Completion, ChatCompletion
+from autogen.oai.openai_utils import (
     get_config_list,
     config_list_gpt4_gpt35,
     config_list_openai_aoai,

flaml/autogen/oai/completion.py → autogen/oai/completion.py

@@ -26,7 +26,7 @@
 
     ERROR = None
 except ImportError:
-    ERROR = ImportError("please install flaml[openai] option to use the flaml.autogen.oai subpackage.")
+    ERROR = ImportError("please install openai and diskcache to use the autogen.oai subpackage.")
     openai_Completion = object
 logger = logging.getLogger(__name__)
 if not logger.handlers:

autogen/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.0"