Merge branch 'cleanup'

hiunlink · Sep 25, 2023 · 5d209d0 · 5d209d0
2 parents 2eddcf8 + 23ceac0
commit 5d209d0
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 1,622 deletions.
diff --git a/notebook/agentchat_RetrieveChat.ipynb b/notebook/agentchat_RetrieveChat.ipynb
@@ -79,7 +79,7 @@
     "import autogen\n",
     "\n",
     "config_list = autogen.config_list_from_json(\n",
-    "    env_or_file=\".config.local\",\n",
+    "    env_or_file=\"OAI_CONFIG_LIST\",\n",
     "    file_location=\".\",\n",
     "    filter_dict={\n",
     "        \"model\": {\n",

diff --git a/notebook/agentchat_groupchat_research.ipynb b/notebook/agentchat_groupchat_research.ipynb
@@ -43,7 +43,7 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file."
+    "The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file."
    ]
   },
   {
@@ -67,7 +67,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "It first looks for environment variable \"OAI_CONFIG_LIST\" which needs to be a valid json string. If that variable is not found, it then looks for a json file named \"OAI_CONFIG_LIST\". It filters the configs by models (you can filter by other keys as well). Only the gpt-4-32k models are kept in the list based on the filter condition.\n",
+    "It first looks for environment variable \"OAI_CONFIG_LIST\" which needs to be a valid json string. If that variable is not found, it then looks for a json file named \"OAI_CONFIG_LIST\". It filters the configs by models (you can filter by other keys as well).\n",
     "\n",
     "The config list looks like the following:\n",
     "```python\n",

diff --git a/notebook/agentchat_human_feedback.ipynb b/notebook/agentchat_human_feedback.ipynb
@@ -55,7 +55,7 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file."
+    "The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file."
    ]
   },
   {

diff --git a/notebook/agentchat_planning.ipynb b/notebook/agentchat_planning.ipynb
@@ -55,11 +55,11 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "* The [`config_list_openai_aoai`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_openai_aoai) function tries to create a list of configurations using Azure OpenAI endpoints and OpenAI endpoints. It assumes the api keys and api bases are stored in the corresponding environment variables or local txt files:\n",
+    "* The [`config_list_openai_aoai`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_openai_aoai) function tries to create a list of configurations using Azure OpenAI endpoints and OpenAI endpoints. It assumes the api keys and api bases are stored in the corresponding environment variables or local txt files:\n",
     "  - OpenAI API key: os.environ[\"OPENAI_API_KEY\"] or `openai_api_key_file=\"key_openai.txt\"`.\n",
     "  - Azure OpenAI API key: os.environ[\"AZURE_OPENAI_API_KEY\"] or `aoai_api_key_file=\"key_aoai.txt\"`. Multiple keys can be stored, one per line.\n",
     "  - Azure OpenAI API base: os.environ[\"AZURE_OPENAI_API_BASE\"] or `aoai_api_base_file=\"base_aoai.txt\"`. Multiple bases can be stored, one per line.\n",
-    "* The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file. It first looks for environment variable `env_or_file` which needs to be a valid json string. If that variable is not found, it then looks for a json file with the same name. It filters the configs by filter_dict.\n",
+    "* The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file. It first looks for an environment variable with a specified name. The value of the environment variable needs to be a valid json string. If that variable is not found, it then looks for a json file with the same name. It filters the configs by filter_dict.\n",
     "\n",
     "It's OK to have only the OpenAI API key, or only the Azure OpenAI API key + base. If you open this notebook in colab, you can upload your files by clicking the file icon on the left panel and then choose \"upload file\" icon.\n"
    ]

diff --git a/notebook/agentchat_stream.ipynb b/notebook/agentchat_stream.ipynb
@@ -55,7 +55,7 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file.\n"
+    "The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file.\n"
    ]
   },
   {

diff --git a/notebook/agentchat_two_users.ipynb b/notebook/agentchat_two_users.ipynb
@@ -5,7 +5,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "<a href=\"https://colab.research.google.com/github/microsoft/FLAML/blob/main/notebook/agentchat_two_users.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
+    "<a href=\"https://colab.research.google.com/github/microsoft/autogen/blob/main/notebook/agentchat_two_users.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
    ]
   },
   {
@@ -19,15 +19,15 @@
    "source": [
     "# Auto Generated Agent Chat: Collaborative Task Solving with Multiple Agents and Human Users\n",
     "\n",
-    "`flaml.autogen` offers conversable agents powered by LLM, tool or human, which can be used to perform tasks collectively via automated chat. This framwork allows tool use and human participance through multi-agent conversation. Please find documentation about this feature [here](https://microsoft.github.io/autogen/docs/Use-Cases/agent_chat).\n",
+    "AutoGen offers conversable agents powered by LLM, tool or human, which can be used to perform tasks collectively via automated chat. This framwork allows tool use and human participance through multi-agent conversation. Please find documentation about this feature [here](https://microsoft.github.io/autogen/docs/Use-Cases/agent_chat).\n",
     "\n",
     "In this notebook, we demonstrate an application involving multiple agents and human users to work together and accomplish a task. `AssistantAgent` is an LLM-based agent that can write Python code (in a Python coding block) for a user to execute for a given task. `UserProxyAgent` is an agent which serves as a proxy for a user to execute the code written by `AssistantAgent`. We create multiple `UserProxyAgent` instances which can represent different human users.\n",
     "\n",
     "## Requirements\n",
     "\n",
-    "FLAML requires `Python>=3.8`. To run this notebook example, please install flaml with the [autogen] option:\n",
+    "AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
     "```bash\n",
-    "pip install flaml[autogen]\n",
+    "pip install pyautogen\n",
     "```"
    ]
   },
@@ -44,7 +44,7 @@
    },
    "outputs": [],
    "source": [
-    "# %pip install flaml[autogen]~=2.0.2"
+    "# %pip install pyautogen~=0.1.1"
    ]
   },
   {
@@ -54,13 +54,35 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "* The [`config_list_openai_aoai`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_openai_aoai) function tries to create a list of configurations using Azure OpenAI endpoints and OpenAI endpoints. It assumes the api keys and api bases are stored in the corresponding environment variables or local txt files:\n",
-    "  - OpenAI API key: os.environ[\"OPENAI_API_KEY\"] or `openai_api_key_file=\"key_openai.txt\"`.\n",
-    "  - Azure OpenAI API key: os.environ[\"AZURE_OPENAI_API_KEY\"] or `aoai_api_key_file=\"key_aoai.txt\"`. Multiple keys can be stored, one per line.\n",
-    "  - Azure OpenAI API base: os.environ[\"AZURE_OPENAI_API_BASE\"] or `aoai_api_base_file=\"base_aoai.txt\"`. Multiple bases can be stored, one per line.\n",
-    "* The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file. It first looks for environment variable `env_or_file` which needs to be a valid json string. If that variable is not found, it then looks for a json file with the same name. It filters the configs by filter_dict.\n",
+    "The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file.\n",
     "\n",
-    "It's OK to have only the OpenAI API key, or only the Azure OpenAI API key + base. If you open this notebook in colab, you can upload your files by clicking the file icon on the left panel and then choose \"upload file\" icon.\n"
+    "It first looks for an environment variable of a specified name (\"OAI_CONFIG_LIST\" in this example) which needs to be a valid json string. If that variable is not found, it then looks for a json file with the same name. It filters the configs by models (you can filter by other keys as well).\n",
+    "\n",
+    "The json looks like the following:\n",
+    "```json\n",
+    "[\n",
+    "    {\n",
+    "        \"model\": \"gpt-4\",\n",
+    "        \"api_key\": \"<your OpenAI API key here>\"\n",
+    "    },\n",
+    "    {\n",
+    "        \"model\": \"gpt-4\",\n",
+    "        \"api_key\": \"<your Azure OpenAI API key here>\",\n",
+    "        \"api_base\": \"<your Azure OpenAI API base here>\",\n",
+    "        \"api_type\": \"azure\",\n",
+    "        \"api_version\": \"2023-06-01-preview\"\n",
+    "    },\n",
+    "    {\n",
+    "        \"model\": \"gpt-4-32k\",\n",
+    "        \"api_key\": \"<your Azure OpenAI API key here>\",\n",
+    "        \"api_base\": \"<your Azure OpenAI API base here>\",\n",
+    "        \"api_type\": \"azure\",\n",
+    "        \"api_version\": \"2023-06-01-preview\"\n",
+    "    }\n",
+    "]\n",
+    "```\n",
+    "\n",
+    "If you open this notebook in colab, you can upload your files by clicking the file icon on the left panel and then choose \"upload file\" icon.\n"
    ]
   },
   {
@@ -69,7 +91,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from flaml import autogen\n",
+    "import autogen\n",
     "\n",
     "config_list = autogen.config_list_from_json(\n",
     "    \"OAI_CONFIG_LIST\",\n",
@@ -84,34 +106,6 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The config list looks like the following:\n",
-    "```python\n",
-    "config_list = [\n",
-    "    {\n",
-    "        'model': 'gpt-4',\n",
-    "        'api_key': '<your OpenAI API key here>',\n",
-    "    },  # OpenAI API endpoint for gpt-4\n",
-    "    {\n",
-    "        'model': 'gpt-4',\n",
-    "        'api_key': '<your Azure OpenAI API key here>',\n",
-    "        'api_base': '<your Azure OpenAI API base here>',\n",
-    "        'api_type': 'azure',\n",
-    "        'api_version': '2023-06-01-preview',\n",
-    "    },  # Azure OpenAI API endpoint for gpt-4\n",
-    "    {\n",
-    "        'model': 'gpt-4-32k',\n",
-    "        'api_key': '<your Azure OpenAI API key here>',\n",
-    "        'api_base': '<your Azure OpenAI API base here>',\n",
-    "        'api_type': 'azure',\n",
-    "        'api_version': '2023-06-01-preview',\n",
-    "    },  # Azure OpenAI API endpoint for gpt-4-32k\n",
-    "]\n",
-    "```\n",
-    "\n",
-    "If you open this notebook in colab, you can upload your files by clicking the file icon on the left panel and then choose \"upload file\" icon.\n",
-    "\n",
-    "You can set the value of config_list in other ways you prefer, e.g., loading from a YAML file.\n",
-    "\n",
     "## Construct Agents\n",
     "\n",
     "We define `ask_expert` function to start a conversation between two agents and return a summary of the result. We construct an assistant agent named \"assistant_for_expert\" and a user proxy agent named \"expert\". We specify `human_input_mode` as \"ALWAYS\" in the user proxy agent, which will always ask for feedback from the expert user."

diff --git a/notebook/agentchat_web_info.ipynb b/notebook/agentchat_web_info.ipynb
@@ -59,7 +59,7 @@
    "source": [
     "## Set your API Endpoint\n",
     "\n",
-    "The [`config_list_from_json`](https://microsoft.github.io/FLAML/docs/reference/autogen/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file.\n"
+    "The [`config_list_from_json`](https://microsoft.github.io/autogen/docs/reference/oai/openai_utils#config_list_from_json) function loads a list of configurations from an environment variable or a json file.\n"
    ]
   },
   {