Skip to content

Commit

Permalink
Merge branch 'main' into mm_func_call
Browse files Browse the repository at this point in the history
  • Loading branch information
qingyun-wu authored Oct 20, 2024
2 parents 1191497 + 2be5b4b commit f0d8800
Show file tree
Hide file tree
Showing 563 changed files with 1,132 additions and 1,085 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
# Copyright (c) 2023 - 2024, Owners of https://github.com/autogenhub
# SPDX-License-Identifier: Apache-2.0
# Contributions to this project, i.e., https://github.com/autogen-ai/autogen, are licensed under the Apache License, Version 2.0 (Apache-2.0).
# Contributions to this project, i.e., https://github.com/autogenhub/autogen, are licensed under the Apache License, Version 2.0 (Apache-2.0).

# Portions derived from https://github.com/microsoft/autogen under the MIT License.
# SPDX-License-Identifier: MIT
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ These configurations can be used with Codespaces and locally.
- **Usage**: Recommended for developers who are contributing to the AutoGen project.
- **Building the Image**: Run `docker build -f dev/Dockerfile -t autogen_ai_dev_img .`.
- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "dev" as devcontainer configuration`. This image may require a Codespace with at least 64GB of disk space.
- **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.
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://autogenhub.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.


## Customizing Dockerfiles
Expand Down
14 changes: 7 additions & 7 deletions .devcontainer/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ RUN apt-get update && apt-get -y update
RUN apt-get install -y sudo git npm vim nano curl wget git-lfs

# Setup a non-root user 'autogen' with sudo access
RUN adduser --home /home/autogen-ai --disabled-password --gecos '' autogen
RUN adduser --home /home/autogenhub --disabled-password --gecos '' autogen
RUN adduser autogen sudo
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER autogen
WORKDIR /home/autogen-ai
WORKDIR /home/autogenhub

# Set environment variable
# ENV OPENAI_API_KEY="{OpenAI-API-Key}"

# Clone the AutoGen repository
RUN git clone https://github.com/autogen-ai/autogen.git /home/autogen-ai/autogen
WORKDIR /home/autogen-ai/autogen
RUN git clone https://github.com/autogenhub/autogen.git /home/autogenhub/autogen
WORKDIR /home/autogenhub/autogen

# Install AutoGen in editable mode with extra components
RUN sudo pip install --upgrade pip && \
Expand All @@ -39,11 +39,11 @@ RUN yarn install --frozen-lockfile --ignore-engines

RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \
mkdir -p /home/autogen-ai/quarto/ && \
tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogen-ai/quarto/ && \
mkdir -p /home/autogenhub/quarto/ && \
tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogenhub/quarto/ && \
rm quarto-1.5.23-linux-${arch}.tar.gz

ENV PATH="${PATH}:/home/autogen-ai/quarto/quarto-1.5.23/bin/"
ENV PATH="${PATH}:/home/autogenhub/quarto/quarto-1.5.23/bin/"

# Exposes the Yarn port for Docusaurus
EXPOSE 3000
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Setup a non-root user 'autogen' with sudo access
RUN adduser --home /home/autogen-ai --disabled-password --gecos '' autogen
RUN adduser --home /home/autogenhub --disabled-password --gecos '' autogen
RUN adduser autogen sudo
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER autogen
WORKDIR /home/autogen-ai
WORKDIR /home/autogenhub

# Set environment variable if needed
# ENV OPENAI_API_KEY="{OpenAI-API-Key}"
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Thank you for your contribution! Please review https://autogen-ai.github.io/autogen/docs/Contribute before opening a pull request. -->
<!-- Thank you for your contribution! Please review https://autogenhub.github.io/autogen/docs/Contribute before opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR. If you don't have the access to it, we will shortly find a reviewer and assign them to your PR. -->

Expand All @@ -12,6 +12,6 @@

## Checks

- [ ] I've included any doc changes needed for https://autogen-ai.github.io/autogen/. See https://autogen-ai.github.io/autogen/docs/Contribute#documentation to build and test documentation locally.
- [ ] I've included any doc changes needed for https://autogenhub.github.io/autogen/. See https://autogenhub.github.io/autogen/docs/Contribute#documentation to build and test documentation locally.
- [ ] I've added tests (if relevant) corresponding to the changes introduced in this PR.
- [ ] I've made sure all auto checks have passed.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright AutoGen-AI organization, i.e., https://github.com/autogen-ai, owners.
Copyright autogenhub organization, i.e., https://github.com/autogenhub, owners.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
36 changes: 36 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Maintainers

## Here is a list of maintainers for the AutoGen project.

| Name | GitHub Handle | Organization | Features |
|-----------------|------------------------------------------------------------|------------------------|-----------------------------------------|
| Qingyun Wu | [qingyun-wu](https://github.com/qingyun-wu) | Penn State University | all, alt-models, autobuilder |
| Chi Wang | [sonichi](https://github.com/sonichi) | - | all |
| Mark Sze | [marklysze](https://github.com/marklysze) | - | alt-models, group chat |
| Hrushikesh Dokala | [Hk669](https://github.com/Hk669) | - | alt-models, swebench, logging, rag |
| Jiale Liu | [LeoLjl](https://github.com/LeoLjl) | Penn State University | autobuild, group chat |
| Shaokun Zhang | [skzhang1](https://github.com/skzhang1) | Penn State University | AgentOptimizer, Teachability |
| Yixuan Zhai | [randombet](https://github.com/randombet) | Meta | group chat, sequential_chats, rag |
| Yiran Wu | [yiranwu0](https://github.com/yiranwu0) | Penn State University | alt-models, group chat, logging, infra |
| Beibin Li | [BeibinLi](https://github.com/BeibinLi) | Microsoft Research | alt-models |
| Linxin Song | [LinxinS97](https://github.com/LinxinS97) | University of Southern California | autobuild, group chat |
| Jieyu Zhang | [JieyuZ2](https://jieyuz2.github.io/) | University of Washington | autobuild, group chat |
| Justin Trugman | [jtrugman](https://github.com/jtrugman) | BetterFutureLabs | GPTAssistantAgent, Tool overwrite, Instruction Overwrite |

**Pending Maintainers list (Marked with \*, Waiting for explicit approval from the maintainers)**
| Name | GitHub Handle | Organization | Features |
|-----------------|------------------------------------------------------------|------------------------|-----------------------------------------|
| Davor Runje * | [davorrunje](https://github.com/davorrunje) | airt.ai | Tool calling, IO |
| Olaoluwa Ademola Salami * | [olaoluwasalami](https://github.com/olaoluwasalami) | DevOps Engineer | |
| Li Jiang * | [thinkall](https://github.com/thinkall) | Microsoft | rag, autobuilder, group chat |
| Rajan Chari * | [rajan-chari](https://github.com/rajan-chari) | Microsoft Research | CAP |

## 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://autogenhub.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).
4 changes: 2 additions & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
## NOTICE

Copyright (c) 2023-2024, Owners of https://github.com/autogen-ai
Copyright (c) 2023-2024, Owners of https://github.com/autogenhub

This project is a fork of https://github.com/microsoft/autogen.

The [original project](https://github.com/microsoft/autogen) is licensed under the MIT License as detailed in [LICENSE_original_MIT](./license_original/LICENSE_original_MIT). The fork was created from version v0.2.35 of the original project.


This project, i.e., https://github.com/autogen-ai/autogen, is licensed under the Apache License, Version 2.0 as detailed in [LICENSE](./LICENSE)
This project, i.e., https://github.com/autogenhub/autogen, is licensed under the Apache License, Version 2.0 as detailed in [LICENSE](./LICENSE)


Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Expand Down
Loading

0 comments on commit f0d8800

Please sign in to comment.