Skip to content

Commit df4fd91

Browse files
authored
Merge branch 'main' into aws-bedrock
2 parents 5a59e9a + 20d83bb commit df4fd91

File tree

176 files changed

+2505
-1114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+2505
-1114
lines changed

.devcontainer/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ These configurations can be used with Codespaces and locally.
1010

1111
- **Purpose**: This Dockerfile, i.e., `./Dockerfile`, is designed for basic setups. It includes common Python libraries and essential dependencies required for general usage of AutoGen.
1212
- **Usage**: Ideal for those just starting with AutoGen or for general-purpose applications.
13-
- **Building the Image**: Run `docker build -f ./Dockerfile -t autogen_base_img .` in this directory.
13+
- **Building the Image**: Run `docker build -f ./Dockerfile -t autogen_ai_base_img .` in this directory.
1414
- **Using with Codespaces**: `Code > Codespaces > Click on +` By default + creates a Codespace on the current branch.
1515

1616
### full
1717

1818
- **Purpose**: This Dockerfile, i.e., `./full/Dockerfile` is for advanced features. It includes additional dependencies and is configured for more complex or feature-rich AutoGen applications.
1919
- **Usage**: Suited for advanced users who need the full range of AutoGen's capabilities.
20-
- **Building the Image**: Execute `docker build -f full/Dockerfile -t autogen_full_img .`.
20+
- **Building the Image**: Execute `docker build -f full/Dockerfile -t autogen_ai_full_img .`.
2121
- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "full" as devcontainer configuration`. This image may require a Codespace with at least 64GB of disk space.
2222

2323
### dev
2424

2525
- **Purpose**: Tailored for AutoGen project developers, this Dockerfile, i.e., `./dev/Dockerfile` includes tools and configurations aiding in development and contribution.
2626
- **Usage**: Recommended for developers who are contributing to the AutoGen project.
27-
- **Building the Image**: Run `docker build -f dev/Dockerfile -t autogen_dev_img .`.
27+
- **Building the Image**: Run `docker build -f dev/Dockerfile -t autogen_ai_dev_img .`.
2828
- **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.
29-
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://microsoft.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.
29+
- **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.
3030

3131

3232
### studio
@@ -35,7 +35,7 @@ These configurations can be used with Codespaces and locally.
3535
- **Usage**: Recommended for developers who are contributing to the AutoGen project.
3636
- **Building the Image**: Run `docker build -f studio/Dockerfile -t autogen_studio_img .`.
3737
- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "studio" as devcontainer configuration`.
38-
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://microsoft.github.io/autogen/docs/Contribute) page prior to submitting any pull requests.
38+
- **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.
3939

4040

4141
## Customizing Dockerfiles

.devcontainer/dev/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Basic setup
22
FROM python:3.11-slim-bookworm
33

4-
# add git lhs to apt
4+
# add git lfs to apt
55
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
66

77
# Update and install necessary packages
@@ -10,18 +10,18 @@ RUN apt-get update && apt-get -y update
1010
RUN apt-get install -y sudo git npm vim nano curl wget git-lfs
1111

1212
# Setup a non-root user 'autogen' with sudo access
13-
RUN adduser --disabled-password --gecos '' autogen
13+
RUN adduser --home /home/autogen-ai --disabled-password --gecos '' autogen
1414
RUN adduser autogen sudo
1515
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
1616
USER autogen
17-
WORKDIR /home/autogen
17+
WORKDIR /home/autogen-ai
1818

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

2222
# Clone the AutoGen repository
23-
RUN git clone https://github.com/microsoft/autogen.git /home/autogen/autogen
24-
WORKDIR /home/autogen/autogen
23+
RUN git clone https://github.com/autogen-ai/autogen.git /home/autogen-ai/autogen
24+
WORKDIR /home/autogen-ai/autogen
2525

2626
# Install AutoGen in editable mode with extra components
2727
RUN sudo pip install -e .[test,teachable,lmm,retrievechat,mathchat,blendsearch]
@@ -37,11 +37,11 @@ RUN yarn install --frozen-lockfile --ignore-engines
3737

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

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

4646
# Exposes the Yarn port for Docusaurus
4747
EXPOSE 3000

.devcontainer/full/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ RUN apt-get update \
1111
&& rm -rf /var/lib/apt/lists/*
1212

1313
# Setup a non-root user 'autogen' with sudo access
14-
RUN adduser --disabled-password --gecos '' autogen
14+
RUN adduser --home /home/autogen-ai --disabled-password --gecos '' autogen
1515
RUN adduser autogen sudo
1616
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
1717
USER autogen
18-
WORKDIR /home/autogen
18+
WORKDIR /home/autogen-ai
1919

2020
# Set environment variable if needed
2121
# ENV OPENAI_API_KEY="{OpenAI-API-Key}"

.devcontainer/studio/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
1010
#
1111
ENV DEBIAN_FRONTEND=noninteractive
1212

13-
# add git lhs to apt
13+
# add git lfs to apt
1414
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
1515

1616
RUN apt-get update \

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Thank you for your contribution! Please review https://microsoft.github.io/autogen/docs/Contribute before opening a pull request. -->
1+
<!-- Thank you for your contribution! Please review https://autogen-ai.github.io/autogen/docs/Contribute before opening a pull request. -->
22

33
<!-- 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. -->
44

@@ -12,6 +12,6 @@
1212

1313
## Checks
1414

15-
- [ ] I've included any doc changes needed for https://microsoft.github.io/autogen/. See https://microsoft.github.io/autogen/docs/Contribute#documentation to build and test documentation locally.
15+
- [ ] 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.
1616
- [ ] I've added tests (if relevant) corresponding to the changes introduced in this PR.
1717
- [ ] I've made sure all auto checks have passed.

.github/workflows/dotnet-build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
os: [ ubuntu-latest, macos-latest, windows-latest ]
54+
os: [ ubuntu-latest, macos-latest ]
5555
python-version: ["3.11"]
5656
runs-on: ${{ matrix.os }}
57+
timeout-minutes: 30
5758
steps:
5859
- uses: actions/checkout@v4
5960
with:

CODE_OF_CONDUCT.md

-9
This file was deleted.

0 commit comments

Comments
 (0)