Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into add-tool-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
davorrunje committed Dec 19, 2024
2 parents 6d2ee6e + f866f1f commit 391cdbd
Show file tree
Hide file tree
Showing 48 changed files with 1,034 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

### Environment
- AutoGen version: <!-- Specify the AutoGen version (e.g., v0.2.0) -->
- Python version: <!-- Specify the Python version (e.g., 3.8) -->
- Python version: <!-- Specify the Python version (e.g., 3.9) -->
- Operating System: <!-- Specify the OS (e.g., Windows 10, Ubuntu 20.04) -->

### Steps to Reproduce (for bugs)
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body:
description: |
- AutoGen Version: <!-- Specify the AutoGen version (e.g., v0.2.0) -->
- Operating System: <!-- Specify the OS (e.g., Windows 10, Ubuntu 20.04) -->
- Python Version: <!-- Specify the Python version (e.g., 3.8) -->
- Python Version: <!-- Specify the Python version (e.g., 3.9) -->
- Related Issues: <!-- Link to any related issues here (e.g., #1) -->
- Any other relevant information.
placeholder: Any additional details
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/general_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ body:
description: |
- AutoGen Version: <!-- Specify the AutoGen version (e.g., v0.2.0) -->
- Operating System: <!-- Specify the OS (e.g., Windows 10, Ubuntu 20.04) -->
- Python Version: <!-- Specify the Python version (e.g., 3.8) -->
- Python Version: <!-- Specify the Python version (e.g., 3.9) -->
- Related Issues: <!-- Link to any related issues here (e.g., #1) -->
- Any other relevant information.
placeholder: Any additional details
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
exclude:
- os: macos-latest
python-version: "3.8"
- os: macos-latest
python-version: "3.9"
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"
- name: pydoc-markdown install
run: |
python -m pip install --upgrade pip
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"
- name: pydoc-markdown install
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: true
matrix:
version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![Pypi Downloads](https://img.shields.io/pypi/dm/pyautogen?label=PyPI%20downloads)
[![PyPI version](https://badge.fury.io/py/autogen.svg)](https://badge.fury.io/py/autogen)
[![Build](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml/badge.svg)](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml)
![Python Version](https://img.shields.io/badge/3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
![Python Version](https://img.shields.io/badge/3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
[![Discord](https://img.shields.io/discord/1153072414184452236?logo=discord&style=flat)](https://discord.gg/pAbnFJrkgZ)
[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/ag2ai)

Expand Down Expand Up @@ -125,7 +125,7 @@ Find detailed instructions for users [here](https://ag2ai.github.io/ag2/docs/ins

### Option 2. Install AG2 Locally

AG2 requires **Python version >= 3.8, < 3.14**. It can be installed from pip:
AG2 requires **Python version >= 3.9, < 3.14**. It can be installed from pip:

```bash
pip install ag2
Expand Down
2 changes: 1 addition & 1 deletion notebook/JSON_mode_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"\n",
"## Requirements\n",
"JSON mode is a feature of OpenAI API, however strong models (such as Claude 3 Opus), can generate appropriate json as well.\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"```bash\n",
"pip install autogen\n",
"```"
Expand Down
4 changes: 2 additions & 2 deletions notebook/agentchat_RetrieveChat_qdrant.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"Context is: [![PyPI version](https://badge.fury.io/py/FLAML.svg)](https://badge.fury.io/py/FLAML)\n",
"![Conda version](https://img.shields.io/conda/vn/conda-forge/flaml)\n",
"[![Build](https://github.com/microsoft/FLAML/actions/workflows/python-package.yml/badge.svg)](https://github.com/microsoft/FLAML/actions/workflows/python-package.yml)\n",
"![Python Version](https://img.shields.io/badge/3.8%20%7C%203.9%20%7C%203.10-blue)\n",
"![Python Version](https://img.shields.io/badge/3.9%20%7C%203.9%20%7C%203.10-blue)\n",
"[![Downloads](https://pepy.tech/badge/flaml)](https://pepy.tech/project/flaml)\n",
"[![](https://img.shields.io/discord/1025786666260111483?logo=discord&style=flat)](https://discord.gg/Cppx2vSPVP)\n",
"\n",
Expand Down Expand Up @@ -302,7 +302,7 @@
"\n",
"## Installation\n",
"\n",
"FLAML requires **Python version >= 3.8**. It can be installed from pip:\n",
"FLAML requires **Python version >= 3.9**. It can be installed from pip:\n",
"\n",
"```bash\n",
"pip install flaml\n",
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_cost_token_tracking.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`:\n",
"AutoGen requires `Python>=3.9`:\n",
"```bash\n",
"pip install \"pyautogen\"\n",
"```"
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_databricks_dbrx.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"This notebook will demonstrate a few basic examples of Autogen with DBRX, including the use of `AssistantAgent`, `UserProxyAgent`, and `ConversableAgent`. These demos are not intended to be exhaustive - feel free to use them as a base to build upon!\n",
"\n",
"## Requirements\n",
"AutoGen must be installed on your Databricks cluster, and requires `Python>=3.8`. This example includes the `%pip` magic command to install: `%pip install pyautogen`, as well as other necessary libraries. \n",
"AutoGen must be installed on your Databricks cluster, and requires `Python>=3.9`. This example includes the `%pip` magic command to install: `%pip install pyautogen`, as well as other necessary libraries. \n",
"\n",
"This code has been tested on: \n",
"* [Serverless Notebooks](https://docs.databricks.com/en/compute/serverless.html) (in public preview as of Apr 18, 2024)\n",
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_function_call.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install `pyautogen`:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install `pyautogen`:\n",
"```bash\n",
"pip install pyautogen\n",
"```"
Expand Down
4 changes: 2 additions & 2 deletions notebook/agentchat_function_call_currency_calculator.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install `pyautogen`:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install `pyautogen`:\n",
"```bash\n",
"pip install pyautogen\n",
"```"
Expand Down Expand Up @@ -622,7 +622,7 @@
]
},
"kernelspec": {
"display_name": "flaml_dev",
"display_name": ".venv",
"language": "python",
"name": "python3"
},
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_human_feedback.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"```bash\n",
"pip install pyautogen\n",
"```"
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_inception_function.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`."
"AutoGen requires `Python>=3.9`."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_langchain.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install `pyautogen` and `Langchain`:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install `pyautogen` and `Langchain`:\n",
"```bash\n",
"pip install pyautogen Langchain\n",
"```"
Expand Down
4 changes: 2 additions & 2 deletions notebook/agentchat_microsoft_fabric.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion notebook/agentchat_oai_assistant_function_call.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"````{=mdx}\n",
":::info Requirements\n",
"Install `pyautogen`:\n",
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_oai_assistant_groupchat.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"````{=mdx}\n",
":::info Requirements\n",
"Install `autogen`:\n",
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_oai_code_interpreter.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"````{=mdx}\n",
":::info Requirements\n",
"Install `autogen`:\n",
Expand Down
4 changes: 2 additions & 2 deletions notebook/agentchat_openlit.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Collecting diskcache (from ag2)\n",
" Downloading diskcache-5.6.3-py3-none-any.whl.metadata (20 kB)\n",
"Collecting docker (from ag2)\n",
" Downloading docker-7.1.0-py3-none-any.whl.metadata (3.8 kB)\n",
" Downloading docker-7.1.0-py3-none-any.whl.metadata (3.9 kB)\n",
"Collecting flaml (from ag2)\n",
" Downloading FLAML-2.3.2-py3-none-any.whl.metadata (16 kB)\n",
"Requirement already satisfied: openai>=1.3 in /usr/local/lib/python3.10/dist-packages (from ag2) (1.54.4)\n",
Expand All @@ -95,7 +95,7 @@
"Requirement already satisfied: opentelemetry-sdk<2.0.0,>=1.27.0 in /usr/local/lib/python3.10/dist-packages (from openlit) (1.28.2)\n",
"Requirement already satisfied: requests<3.0.0,>=2.26.0 in /usr/local/lib/python3.10/dist-packages (from openlit) (2.32.3)\n",
"Collecting schedule<2.0.0,>=1.2.2 (from openlit)\n",
" Downloading schedule-1.2.2-py3-none-any.whl.metadata (3.8 kB)\n",
" Downloading schedule-1.2.2-py3-none-any.whl.metadata (3.9 kB)\n",
"Collecting tiktoken (from ag2)\n",
" Downloading tiktoken-0.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)\n",
"Collecting xmltodict<0.14.0,>=0.13.0 (from openlit)\n",
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_planning.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install autogen and docker:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install autogen and docker:\n",
"```bash\n",
"pip install autogen docker\n",
"```"
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_stream.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install:\n",
"```bash\n",
"pip install autogen\n",
"```"
Expand Down
2 changes: 1 addition & 1 deletion notebook/agentchat_surfer.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"\n",
"## Requirements\n",
"\n",
"AutoGen requires `Python>=3.8`. To run this notebook example, please install AutoGen with the optional `websurfer` dependencies:\n",
"AutoGen requires `Python>=3.9`. To run this notebook example, please install AutoGen with the optional `websurfer` dependencies:\n",
"```bash\n",
"pip install \"autogen[websurfer]\"\n",
"```"
Expand Down
4 changes: 3 additions & 1 deletion notebook/agentchat_swarm.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"\n",
"AG2 offers conversable agents, powered by LLMs, tools or a human, that can perform tasks collectively via an automated chat. Recently, OpenAI released a [Swarm](https://github.com/openai/swarm) framework that focuses on making agent coordination and execution lightweight. \n",
"\n",
"Now, AG2 offers a simple programming interface to build and orchestrate a swarm of agents. Please check the [Documentation](https://ag2ai.github.io/ag2/docs/topics/swarm) and [Blog](https://ag2ai.github.io/ag2/blog/2024/11/17/Swarm) for more details.\n",
"In AG2 we offer a simple programming interface to build and orchestrate a swarm of agents. Please check the [Documentation](https://ag2ai.github.io/ag2/docs/topics/swarm) and [Blog](https://ag2ai.github.io/ag2/blog/2024/11/17/Swarm) for more details.\n",
"\n",
"After learning the fundamentals of AG2's swarm in this notebook, check out [this notebook](https://ag2ai.github.io/ag2/docs/notebooks/agentchat_swarm) where we take on some more advanced techniques that provide greater control and predicability for your swarms.\n",
"\n",
"In this notebook, we implement OpenAI's [airline customer service example](https://github.com/openai/swarm/tree/main/examples/airline) in AG2."
]
Expand Down
Loading

0 comments on commit 391cdbd

Please sign in to comment.