Skip to content

Commit 5cb10b2

Browse files
rysweetrysweet
authored
Merge branch '0.2' into u/kinnym/multimodalwork
2 parents 774f105 + 11ef58b commit 5cb10b2

File tree

1,136 files changed

+126591
-26627
lines changed

Some content is hidden

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

1,136 files changed

+126591
-26627
lines changed

‎.devcontainer/Dockerfile

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
#-------------------------------------------------------------------------------------------------------------
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4-
#-------------------------------------------------------------------------------------------------------------
5-
6-
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7-
8-
#
9-
# Update the OS and maybe install packages
10-
#
11-
ENV DEBIAN_FRONTEND=noninteractive
12-
13-
# add git lhs to apt
14-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15-
16-
RUN apt-get update \
17-
&& apt-get upgrade -y \
18-
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19-
&& apt-get autoremove -y \
20-
&& apt-get clean -y \
21-
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
22-
&& wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
23-
&& dpkg -i quarto-1.5.23-linux-${arch}.deb \
24-
&& rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
25-
ENV DEBIAN_FRONTEND=dialog
26-
27-
# For docs
28-
RUN npm install --global yarn
29-
RUN pip install --upgrade pip
30-
RUN pip install pydoc-markdown
31-
RUN pip install pyyaml
32-
RUN pip install colored
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7+
8+
#
9+
# Update the OS and maybe install packages
10+
#
11+
ENV DEBIAN_FRONTEND=noninteractive
12+
13+
# add git lhs to apt
14+
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15+
16+
RUN apt-get update \
17+
&& apt-get upgrade -y \
18+
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19+
&& apt-get autoremove -y \
20+
&& apt-get clean -y \
21+
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
22+
&& wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
23+
&& dpkg -i quarto-1.5.23-linux-${arch}.deb \
24+
&& rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
25+
ENV DEBIAN_FRONTEND=dialog
26+
27+
# For docs
28+
RUN npm install --global yarn
29+
RUN pip install --upgrade pip
30+
RUN pip install pydoc-markdown
31+
RUN pip install pyyaml
32+
RUN pip install colored

‎.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Feel free to modify these Dockerfiles for your specific project needs. Here are
4949
- **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.
5050
`# ENV OPENAI_API_KEY="{OpenAI-API-Key}"` to `ENV OPENAI_API_KEY="{OpenAI-API-Key}"`
5151
- **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.
52-
`RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra` to install just what you need. `RUN pip install pyautogen[retrievechat,blendsearch] autogenra`
52+
`RUN pip install autogen-agentchat[teachable,lmm,retrievechat,mathchat,blendsearch]~=0.2 autogenra` to install just what you need. `RUN pip install autogen-agentchat[retrievechat,blendsearch]~=0.2 autogenra`
5353
- **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.
5454

5555
```code

‎.devcontainer/devcontainer.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{
2-
"customizations": {
3-
"vscode": {
4-
"extensions": [
5-
"ms-python.python",
6-
"ms-toolsai.jupyter",
7-
"visualstudioexptteam.vscodeintellicode",
8-
"GitHub.copilot"
9-
],
10-
"settings": {
11-
"terminal.integrated.profiles.linux": {
12-
"bash": {
13-
"path": "/bin/bash"
14-
}
15-
},
16-
"terminal.integrated.defaultProfile.linux": "bash"
17-
}
18-
}
19-
},
20-
"dockerFile": "Dockerfile",
21-
"updateContentCommand": "pip install -e . pre-commit && pre-commit install"
22-
}
1+
{
2+
"customizations": {
3+
"vscode": {
4+
"extensions": [
5+
"ms-python.python",
6+
"ms-toolsai.jupyter",
7+
"visualstudioexptteam.vscodeintellicode",
8+
"GitHub.copilot"
9+
],
10+
"settings": {
11+
"terminal.integrated.profiles.linux": {
12+
"bash": {
13+
"path": "/bin/bash"
14+
}
15+
},
16+
"terminal.integrated.defaultProfile.linux": "bash"
17+
}
18+
}
19+
},
20+
"dockerFile": "Dockerfile",
21+
"updateContentCommand": "pip install -e . pre-commit && pre-commit install"
22+
}

‎.devcontainer/full/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ WORKDIR /home/autogen
2222

2323
# Install Python packages
2424
RUN pip install --upgrade pip
25-
RUN pip install pyautogen[teachable,lmm,retrievechat,mathchat,blendsearch] autogenra
25+
RUN pip install autogen-agentchat[teachable,lmm,retrievechat,mathchat,blendsearch]~=0.2 autogenra
2626
RUN pip install numpy pandas matplotlib seaborn scikit-learn requests urllib3 nltk pillow pytest beautifulsoup4
2727

2828
# Expose port

‎.devcontainer/studio/Dockerfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
#-------------------------------------------------------------------------------------------------------------
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4-
#-------------------------------------------------------------------------------------------------------------
5-
6-
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7-
8-
#
9-
# Update the OS and maybe install packages
10-
#
11-
ENV DEBIAN_FRONTEND=noninteractive
12-
13-
# add git lhs to apt
14-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15-
16-
RUN apt-get update \
17-
&& apt-get upgrade -y \
18-
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19-
&& apt-get autoremove -y \
20-
&& apt-get clean -y \
21-
&& rm -rf /var/lib/apt/lists/*
22-
ENV DEBIAN_FRONTEND=dialog
23-
24-
# For docs
25-
RUN npm install --global yarn
26-
RUN pip install --upgrade pip
27-
RUN pip install pydoc-markdown
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See LICENSE file in the project root for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
7+
8+
#
9+
# Update the OS and maybe install packages
10+
#
11+
ENV DEBIAN_FRONTEND=noninteractive
12+
13+
# add git lhs to apt
14+
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
15+
16+
RUN apt-get update \
17+
&& apt-get upgrade -y \
18+
&& apt-get -y install --no-install-recommends build-essential npm git-lfs \
19+
&& apt-get autoremove -y \
20+
&& apt-get clean -y \
21+
&& rm -rf /var/lib/apt/lists/*
22+
ENV DEBIAN_FRONTEND=dialog
23+
24+
# For docs
25+
RUN npm install --global yarn
26+
RUN pip install --upgrade pip
27+
RUN pip install pydoc-markdown

‎.devcontainer/studio/devcontainer.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{
2-
"customizations": {
3-
"vscode": {
4-
"extensions": [
5-
"ms-python.python",
6-
"ms-toolsai.jupyter",
7-
"visualstudioexptteam.vscodeintellicode"
8-
],
9-
"settings": {
10-
"terminal.integrated.profiles.linux": {
11-
"bash": {
12-
"path": "/bin/bash"
13-
}
14-
},
15-
"terminal.integrated.defaultProfile.linux": "bash"
16-
}
17-
}
18-
},
19-
"dockerFile": "Dockerfile",
20-
"updateContentCommand": "cd samples/apps/autogen-studio && pip install -e . && sudo npm install -g gatsby-cli && cd frontend && yarn install && yarn build"
21-
}
1+
{
2+
"customizations": {
3+
"vscode": {
4+
"extensions": [
5+
"ms-python.python",
6+
"ms-toolsai.jupyter",
7+
"visualstudioexptteam.vscodeintellicode"
8+
],
9+
"settings": {
10+
"terminal.integrated.profiles.linux": {
11+
"bash": {
12+
"path": "/bin/bash"
13+
}
14+
},
15+
"terminal.integrated.defaultProfile.linux": "bash"
16+
}
17+
}
18+
},
19+
"dockerFile": "Dockerfile",
20+
"updateContentCommand": "cd samples/apps/autogen-studio && pip install -e . && sudo npm install -g gatsby-cli && cd frontend && yarn install && yarn build"
21+
}

‎.gitattributes

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Source code
2+
*.bash text eol=lf
3+
*.bat text eol=crlf
4+
*.cmd text eol=crlf
5+
*.coffee text
6+
*.css text diff=css eol=lf
7+
*.htm text diff=html eol=lf
8+
*.html text diff=html eol=lf
9+
*.inc text
10+
*.ini text
11+
*.js text
12+
*.json text eol=lf
13+
*.jsx text
14+
*.less text
15+
*.ls text
16+
*.map text -diff
17+
*.od text
18+
*.onlydata text
19+
*.php text diff=php
20+
*.pl text
21+
*.ps1 text eol=crlf
22+
*.py text diff=python eol=lf
23+
*.rb text diff=ruby eol=lf
24+
*.sass text
25+
*.scm text
26+
*.scss text diff=css
27+
*.sh text eol=lf
28+
.husky/* text eol=lf
29+
*.sql text
30+
*.styl text
31+
*.tag text
32+
*.ts text
33+
*.tsx text
34+
*.xml text
35+
*.xhtml text diff=html
36+
37+
# Docker
38+
Dockerfile text eol=lf
39+
40+
# Documentation
41+
*.ipynb text
42+
*.markdown text diff=markdown eol=lf
43+
*.md text diff=markdown eol=lf
44+
*.mdwn text diff=markdown eol=lf
45+
*.mdown text diff=markdown eol=lf
46+
*.mkd text diff=markdown eol=lf
47+
*.mkdn text diff=markdown eol=lf
48+
*.mdtxt text eol=lf
49+
*.mdtext text eol=lf
50+
*.txt text eol=lf
51+
AUTHORS text eol=lf
52+
CHANGELOG text eol=lf
53+
CHANGES text eol=lf
54+
CONTRIBUTING text eol=lf
55+
COPYING text eol=lf
56+
copyright text eol=lf
57+
*COPYRIGHT* text eol=lf
58+
INSTALL text eol=lf
59+
license text eol=lf
60+
LICENSE text eol=lf
61+
NEWS text eol=lf
62+
readme text eol=lf
63+
*README* text eol=lf
64+
TODO text
65+
66+
# Configs
67+
*.cnf text eol=lf
68+
*.conf text eol=lf
69+
*.config text eol=lf
70+
.editorconfig text
71+
.env text eol=lf
72+
.gitattributes text eol=lf
73+
.gitconfig text eol=lf
74+
.htaccess text
75+
*.lock text -diff
76+
package.json text eol=lf
77+
package-lock.json text eol=lf -diff
78+
pnpm-lock.yaml text eol=lf -diff
79+
.prettierrc text
80+
yarn.lock text -diff
81+
*.toml text eol=lf
82+
*.yaml text eol=lf
83+
*.yml text eol=lf
84+
browserslist text
85+
Makefile text eol=lf
86+
makefile text eol=lf
87+
88+
# Images
89+
*.png filter=lfs diff=lfs merge=lfs -text
90+
*.jpg filter=lfs diff=lfs merge=lfs -text
91+
*.jpeg filter=lfs diff=lfs merge=lfs -text

‎.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)