Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into dotnet-signed
Browse files Browse the repository at this point in the history
  • Loading branch information
bassmang committed Jan 16, 2025
2 parents c01a568 + 1a3ac62 commit 1618f9d
Show file tree
Hide file tree
Showing 23 changed files with 1,252 additions and 1,237 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -36,6 +37,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -65,6 +67,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -94,6 +97,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -121,6 +125,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -151,6 +156,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -184,6 +190,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -205,6 +212,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -223,6 +231,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -241,6 +250,7 @@ jobs:
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -259,6 +269,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- run: uv sync --locked --all-extras
working-directory: ./python
- name: Prepare python venv
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
[
# For main use the workflow target
{ ref: "${{github.ref}}", dest-dir: dev, uv-version: "0.5.13", sphinx-release-override: "dev" },
{ ref: "v0.4.1", dest-dir: stable, uv-version: "0.5.13", sphinx-release-override: "stable" },
{ ref: "v0.4.2", dest-dir: stable, uv-version: "0.5.13", sphinx-release-override: "stable" },
{ ref: "v0.4.0.dev0", dest-dir: "0.4.0.dev0", uv-version: "0.5.11", sphinx-release-override: "" },
{ ref: "v0.4.0.dev1", dest-dir: "0.4.0.dev1", uv-version: "0.5.11", sphinx-release-override: "" },
{ ref: "v0.4.0.dev2", dest-dir: "0.4.0.dev2", uv-version: "0.5.11", sphinx-release-override: "" },
Expand All @@ -50,6 +50,7 @@ jobs:
{ ref: "v0.4.0.dev13", dest-dir: "0.4.0.dev13", uv-version: "0.5.13", sphinx-release-override: "" },
{ ref: "v0.4.0.post1", dest-dir: "0.4.0", uv-version: "0.5.13", sphinx-release-override: "" },
{ ref: "v0.4.1", dest-dir: "0.4.1", uv-version: "0.5.13", sphinx-release-override: "" },
{ ref: "v0.4.2", dest-dir: "0.4.2", uv-version: "0.5.13", sphinx-release-override: "" },
]
steps:
- name: Checkout
Expand Down Expand Up @@ -110,6 +111,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- run: uv sync --locked --all-extras
working-directory: ./python
- name: Prepare python venv
Expand Down Expand Up @@ -122,6 +123,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down Expand Up @@ -206,6 +208,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/single-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
version: "0.5.18"
- run: uv build --package ${{ github.event.inputs.package }} --out-dir dist/
working-directory: python
- name: Publish package to PyPI
Expand Down
77 changes: 1 addition & 76 deletions docs/switcher.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"name": "0.4.1 (stable)",
"name": "0.4.2 (stable)",
"version": "stable",
"url": "/autogen/stable/",
"preferred": true
Expand All @@ -14,80 +14,5 @@
"name": "0.2",
"version": "0.2",
"url": "/autogen/0.2/"
},
{
"name": "0.4.0",
"version": "0.4.0",
"url": "/autogen/0.4.0/"
},
{
"name": "0.4.0.dev0",
"version": "0.4.0.dev0",
"url": "/autogen/0.4.0dev0/"
},
{
"name": "0.4.0.dev1",
"version": "0.4.0.dev1",
"url": "/autogen/0.4.0.dev1/"
},
{
"name": "0.4.0.dev2",
"version": "0.4.0.dev2",
"url": "/autogen/0.4.0.dev2/"
},
{
"name": "0.4.0.dev3",
"version": "0.4.0.dev3",
"url": "/autogen/0.4.0.dev3/"
},
{
"name": "0.4.0.dev4",
"version": "0.4.0.dev4",
"url": "/autogen/0.4.0.dev4/"
},
{
"name": "0.4.0.dev5",
"version": "0.4.0.dev5",
"url": "/autogen/0.4.0.dev5/"
},
{
"name": "0.4.0.dev6",
"version": "0.4.0.dev6",
"url": "/autogen/0.4.0.dev6/"
},
{
"name": "0.4.0.dev7",
"version": "0.4.0.dev7",
"url": "/autogen/0.4.0.dev7/"
},
{
"name": "0.4.0.dev8",
"version": "0.4.0.dev8",
"url": "/autogen/0.4.0.dev8/"
},
{
"name": "0.4.0.dev9",
"version": "0.4.0.dev9",
"url": "/autogen/0.4.0.dev9/"
},
{
"name": "0.4.0.dev10",
"version": "0.4.0.dev10",
"url": "/autogen/0.4.0.dev10/"
},
{
"name": "0.4.0.dev11",
"version": "0.4.0.dev11",
"url": "/autogen/0.4.0.dev11/"
},
{
"name": "0.4.0.dev12",
"version": "0.4.0.dev12",
"url": "/autogen/0.4.0.dev12/"
},
{
"name": "0.4.0.dev13",
"version": "0.4.0.dev13",
"url": "/autogen/0.4.0.dev13/"
}
]
4 changes: 2 additions & 2 deletions python/packages/autogen-agentchat/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "autogen-agentchat"
version = "0.4.1"
version = "0.4.3"
license = {file = "LICENSE-CODE"}
description = "AutoGen agents and teams library"
readme = "README.md"
Expand All @@ -15,7 +15,7 @@ classifiers = [
"Operating System :: OS Independent",
]
dependencies = [
"autogen-core==0.4.1",
"autogen-core==0.4.3",
]

[tool.ruff]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,27 @@ You have two options for installing from source: manually or using a dev contain
2. Clone the AutoGen Studio repository and install its Python dependencies using `pip install -e .`
3. Navigate to the `python/packages/autogen-studio/frontend` directory, install the dependencies, and build the UI:

```bash
npm install -g gatsby-cli
npm install --global yarn
cd frontend
yarn install
yarn build
# Windows users may need alternative commands to build the frontend:
gatsby clean && rmdir /s /q ..\\autogenstudio\\web\\ui 2>nul & (set \"PREFIX_PATH_VALUE=\" || ver>nul) && gatsby build --prefix-paths && xcopy /E /I /Y public ..\\autogenstudio\\web\\ui
```

### B) Install from source using a dev container
```bash
npm install -g gatsby-cli
npm install --global yarn
cd frontend
yarn install
yarn build
# Windows users may need alternative commands to build the frontend:
gatsby clean && rmdir /s /q ..\\autogenstudio\\web\\ui 2>nul & (set \"PREFIX_PATH_VALUE=\" || ver>nul) && gatsby build --prefix-paths && xcopy /E /I /Y public ..\\autogenstudio\\web\\ui
```

### B) Install from source using a dev container

1. Follow the [Dev Containers tutorial](https://code.visualstudio.com/docs/devcontainers/tutorial) to install VS Code, Docker and relevant extensions.
2. Clone the AutoGen Studio repository.
3. Open `python/packages/autogen-studio/`in VS Code. Click the blue button in bottom the corner or press F1 and select _"Dev Containers: Reopen in Container"_.
4. Build the UI:

```bash
cd frontend
yarn build
```
```bash
cd frontend
yarn build
```

## Running the Application

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@ Team Builder Operations:
- Agents: Add models and tools
- Save team configurations

Component Library Management:
## Gallery - Sharing and Reusing Components

A Gallery is a collection of components - teams, agents, models, tools, and terminations - that can be shared and reused across projects.

Users can create a local gallery or import a gallery (from a URL, a JSON file import or simply by copying and pasting the JSON). At any given time, users can select any of the current Gallery items as a **default gallery**. This **default gallery** will be used to populate the Team Builder sidebar with components.

- Create new galleries via Gallery -> New Gallery
- Edit gallery JSON as needed
- Set a **default** gallery (click pin icon in sidebar) to make components available in Team Builder
- Set a **default** gallery (click pin icon in sidebar) to make components available in Team Builder.

## Interactively Running Teams

Expand Down
4 changes: 2 additions & 2 deletions python/packages/autogen-core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "autogen-core"
version = "0.4.1"
version = "0.4.3"
license = {file = "LICENSE-CODE"}
description = "Foundational interfaces and agent runtime implementation for AutoGen"
readme = "README.md"
Expand Down Expand Up @@ -69,7 +69,7 @@ dev = [
"pygments",
"sphinxext-rediraffe",

"autogen_ext==0.4.1",
"autogen_ext==0.4.3",

# Documentation tooling
"sphinx-autobuild",
Expand Down
12 changes: 6 additions & 6 deletions python/packages/autogen-ext/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "autogen-ext"
version = "0.4.1"
version = "0.4.3"
license = {file = "LICENSE-CODE"}
description = "AutoGen extensions library"
readme = "README.md"
Expand All @@ -15,7 +15,7 @@ classifiers = [
"Operating System :: OS Independent",
]
dependencies = [
"autogen-core==0.4.1",
"autogen-core==0.4.3",
]

[project.optional-dependencies]
Expand All @@ -24,24 +24,24 @@ azure = ["azure-core", "azure-identity"]
docker = ["docker~=7.0"]
openai = ["openai>=1.52.2", "tiktoken>=0.8.0", "aiofiles"]
file-surfer = [
"autogen-agentchat==0.4.1",
"autogen-agentchat==0.4.3",
"markitdown>=0.0.1a2",
]
graphrag = ["graphrag>=1.0.1"]
web-surfer = [
"autogen-agentchat==0.4.1",
"autogen-agentchat==0.4.3",
"playwright>=1.48.0",
"pillow>=11.0.0",
"markitdown>=0.0.1a2",
]
magentic-one = [
"autogen-agentchat==0.4.1",
"autogen-agentchat==0.4.3",
"markitdown>=0.0.1a2",
"playwright>=1.48.0",
"pillow>=11.0.0",
]
video-surfer = [
"autogen-agentchat==0.4.1",
"autogen-agentchat==0.4.3",
"opencv-python>=4.5",
"ffmpeg-python",
"openai-whisper",
Expand Down
Loading

0 comments on commit 1618f9d

Please sign in to comment.