Skip to content

Commit

Permalink
Merge branch 'main' into fix-autogen
Browse files Browse the repository at this point in the history
  • Loading branch information
sonichi authored Sep 6, 2024
2 parents 3a1953f + 6ef974a commit e953a87
Show file tree
Hide file tree
Showing 284 changed files with 98 additions and 23,272 deletions.
11 changes: 1 addition & 10 deletions .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,6 @@ These configurations can be used with Codespaces and locally.
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://autogen-ai.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.


### studio

- **Purpose**: Tailored for AutoGen project developers, this Dockerfile, i.e., `./studio/Dockerfile`, includes tools and configurations aiding in development and contribution.
- **Usage**: Recommended for developers who are contributing to the AutoGen project.
- **Building the Image**: Run `docker build -f studio/Dockerfile -t autogen_studio_img .`.
- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "studio" as devcontainer configuration`.
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://autogen-ai.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.


## Customizing Dockerfiles

Feel free to modify these Dockerfiles for your specific project needs. Here are some common customizations:
Expand All @@ -49,7 +40,7 @@ Feel free to modify these Dockerfiles for your specific project needs. Here are
- **Setting Environment Variables**: Add environment variables using the `ENV` command for any application-specific configurations. We have prestaged the line needed to inject your OpenAI_key into the docker environment as a environmental variable. Others can be staged in the same way. Just uncomment the line.
`# ENV OPENAI_API_KEY="{OpenAI-API-Key}"` to `ENV OPENAI_API_KEY="{OpenAI-API-Key}"`
- **Need a less "Advanced" Autogen build**: If the `./full/Dockerfile` is to much but you need more than advanced then update this line in the Dockerfile file.
`RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra` to install just what you need. `RUN pip install pyautogen[retrievechat,blendsearch] autogenra`
`RUN pip install autogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra` to install just what you need. `RUN pip install autogen[retrievechat,blendsearch] autogenra`
- **Can't Dev without your favorite CLI tool**: if you need particular OS tools to be installed in your Docker container you can add those packages here right after the sudo for the `./base/Dockerfile` and `./full/Dockerfile` files. In the example below we are installing net-tools and vim to the environment.

```code
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ WORKDIR /home/autogen-ai

# Install Python packages
RUN pip install --upgrade pip
RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
RUN pip install autogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4

# Expose port
Expand Down
33 changes: 0 additions & 33 deletions .devcontainer/studio/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions .devcontainer/studio/devcontainer.json

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/samples-tools-tests.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,5 @@ local_cache


notebook/result.png
samples/apps/autogen-studio/autogenstudio/models/test/

notebook/coding
29 changes: 23 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
<a name="readme-top"></a>

[![PyPI version](https://badge.fury.io/py/pyautogen.svg)](https://badge.fury.io/py/pyautogen)
[![PyPI version](https://badge.fury.io/py/autogen.svg)](https://badge.fury.io/py/autogen)
[![Build](https://github.com/autogen-ai/autogen/actions/workflows/python-package.yml/badge.svg)](https://github.com/autogen-ai/autogen/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)
[![Downloads](https://static.pepy.tech/badge/pyautogen/month)](https://pepy.tech/project/pyautogen)
[![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%40Chi_Wang_)](https://x.com/Chi_Wang_)

[![NuGet version](https://badge.fury.io/nu/AutoGen.Core.svg)](https://badge.fury.io/nu/AutoGen.Core)

# AutoGen
# [AutoGen](https://github.com/autogen-ai/autogen)

[📚 Cite paper](#related-papers).
<!-- <p align="center">
<img src="https://github.com/autogen-ai/autogen/blob/main/website/static/img/flaml.svg" width=200>
<br>
</p> -->
:fire: :tada: Sep 06, 2024: AutoGen now available as `autogen` on PyPI! We're excited to announce a more convenient package name for AutoGen: Starting with version 0.3.0, you can now install AutoGen using:
```
pip install autogen
```
We extend our sincere gratitude to the original owner of `autogen` pypi package for generously transferring it to us.

**Note:** The previous package name `pyautogen` will remain valid for a transitional period. However, we encourage users to switch to the new, more intuitive `autogen` package name, as `pyautogen` will eventually be deprecated.

📄 **License Change:**
With this new release and package name, we are officially switching to the Apache 2.0 license. This enhances our commitment to open-source collaboration while providing additional protections for contributors and users alike.

:fire: Aug 24, 2024: A new organization [autogen-ai](https://github.com/autogen-ai) is created to host the development of AutoGen and related projects with open governance. We invite collaborators from all organizations and individuals.

:tada: May 29, 2024: DeepLearning.ai launched a new short course [AI Agentic Design Patterns with AutoGen](https://www.deeplearning.ai/short-courses/ai-agentic-design-patterns-with-autogen), made in collaboration with Microsoft and Penn State University, and taught by AutoGen creators [Chi Wang](https://github.com/sonichi) and [Qingyun Wu](https://github.com/qingyun-wu).
Expand Down Expand Up @@ -117,14 +128,14 @@ Find detailed instructions for users [here](https://autogen-ai.github.io/autogen
AutoGen requires **Python version >= 3.8, < 3.13**. It can be installed from pip:

```bash
pip install pyautogen
pip install autogen
```

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 "pyautogen[blendsearch]"
pip install "autogen[blendsearch]"
``` -->

Find more options in [Installation](https://autogen-ai.github.io/autogen/docs/Installation#option-2-install-autogen-locally-using-virtual-environment).
Expand Down Expand Up @@ -177,7 +188,7 @@ After the repo is cloned.
The figure below shows an example conversation flow with AutoGen.
![Agent Chat Example](https://github.com/autogen-ai/autogen/blob/main/website/static/img/chat_example.png)

Alternatively, the [sample code](https://github.com/autogen-ai/autogen/blob/main/samples/simple_chat.py) here allows a user to chat with an AutoGen agent in ChatGPT style.
Alternatively, the [sample code](https://github.com/autogen-ai/build-with-autogen/blob/main/samples/simple_chat.py) here allows a user to chat with an AutoGen agent in ChatGPT style.
Please find more [code examples](https://autogen-ai.github.io/autogen/docs/Examples#automated-multi-agent-chat) for this feature.

<p align="right" style="font-size: 14px; color: #555; margin-top: 20px;">
Expand Down Expand Up @@ -233,6 +244,12 @@ In addition, you can find:
</a>
</p>

## CookBook

Explore detailed implementations with sample code and applications to help you get started with AutoGen.
[Cookbook](https://github.com/autogen-ai/build-with-autogen)


## Related Papers

[AutoGen](https://arxiv.org/abs/2308.08155)
Expand Down
4 changes: 1 addition & 3 deletions autogen/agentchat/contrib/capabilities/text_compressors.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
try:
import llmlingua
except ImportError:
IMPORT_ERROR = ImportError(
"LLMLingua is not installed. Please install it with `pip install pyautogen[long-context]`"
)
IMPORT_ERROR = ImportError("LLMLingua is not installed. Please install it with `pip install autogen[long-context]`")
PromptCompressor = object
else:
from llmlingua import PromptCompressor
Expand Down
2 changes: 1 addition & 1 deletion autogen/agentchat/contrib/retrieve_user_proxy_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
try:
import chromadb
except ImportError as e:
raise ImportError(f"{e}. You can try `pip install pyautogen[retrievechat]`, or install `chromadb` manually.")
raise ImportError(f"{e}. You can try `pip install autogen[retrievechat]`, or install `chromadb` manually.")
from autogen.agentchat import UserProxyAgent
from autogen.agentchat.agent import Agent
from autogen.agentchat.contrib.vectordb.base import Document, QueryResults, VectorDB, VectorDBFactory
Expand Down
6 changes: 3 additions & 3 deletions autogen/oai/completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ def eval_func(responses, **data):
tune.ExperimentAnalysis: The tuning results.
"""
logger.warning(
"tuning via Completion.tune is deprecated in pyautogen v0.2 and openai>=1. "
"tuning via Completion.tune is deprecated in autogen, pyautogen v0.2 and openai>=1. "
"flaml.tune supports tuning more generically."
)
if ERROR:
Expand Down Expand Up @@ -792,7 +792,7 @@ def yes_or_no_filter(context, config, response):
- `pass_filter`: whether the response passes the filter function. None if no filter is provided.
"""
logger.warning(
"Completion.create is deprecated in pyautogen v0.2 and openai>=1. "
"Completion.create is deprecated in autogen, pyautogen v0.2 and openai>=1. "
"The new openai requires initiating a client for inference. "
"Please refer to https://autogen-ai.github.io/autogen/docs/Use-Cases/enhanced_inference#api-unification"
)
Expand Down Expand Up @@ -1183,7 +1183,7 @@ def start_logging(
reset_counter (bool): whether to reset the counter of the number of API calls.
"""
logger.warning(
"logging via Completion.start_logging is deprecated in pyautogen v0.2. "
"logging via Completion.start_logging is deprecated in autogen and pyautogen v0.2. "
"logging via OpenAIWrapper will be added back in a future release."
)
if ERROR:
Expand Down
2 changes: 1 addition & 1 deletion autogen/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# Portions derived from https://github.com/microsoft/autogen are under the MIT License.
# SPDX-License-Identifier: MIT
__version__ = "0.3.0b4"
__version__ = "0.3.0"
6 changes: 3 additions & 3 deletions notebook/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ You don't need to explain in depth how to install AutoGen. Unless there are spec
``````
````{=mdx}
:::info Requirements
Install `pyautogen`:
Install `autogen`:
```bash
pip install pyautogen
pip install autogen
```
For more information, please refer to the [installation guide](/docs/installation/).
Expand All @@ -54,7 +54,7 @@ Or if extras are needed:
Some extra dependencies are needed for this notebook, which can be installed via pip:
```bash
pip install pyautogen[retrievechat] flaml[automl]
pip install autogen[retrievechat] flaml[automl]
```
For more information, please refer to the [installation guide](/docs/installation/).
Expand Down
43 changes: 0 additions & 43 deletions samples/apps/auto-anny/README.md

This file was deleted.

42 changes: 0 additions & 42 deletions samples/apps/auto-anny/agent_utils.py

This file was deleted.

Loading

0 comments on commit e953a87

Please sign in to comment.