Skip to content

Commit

Permalink
merge from stagin (#3682)
Browse files Browse the repository at this point in the history
* add logging to agentchat

* Update magentic-one readme with the latest numbers (a complete set of results on WebArena, and updated results for GAIA)

* make logging independent module

* move logging module to root of agent_chat

* Add staging to workflow target; fix circular imports in autogen_agentchat (#3651)

* Fix formatting and remove duplicated import of EVENT_LOGGER_NAME in agentchat

* add staging to target in checks

* add staging to target in checks for dotnet

* Fix circular imports

* Add all redirect links (#3659)

* generate docs on push, deploy on main

* Remove accidentally added files from 0.2 (#3661)

* try fix docs CI (#3660)

Co-authored-by: Eric Zhu <[email protected]>

* fix: remove subscription on client disconnect in worker runtime (#3653)

* remove subscription on client disconnect in worker runtime

* address PR feedback

* remove outdated comment

* remove public properties

* fix mypy issue

* address PR feedback

---------

Co-authored-by: Jack Gerrits <[email protected]>

* Move tools to agent in `agentchat`; refactored logging to support tool events (#3665)

* Move tool to agent; refactor logging in agentchat

* Update notebook

* [.Net] Remove merging primitive from .editorconfig and gitignore (#3676)

* remove merging primitive from .editorconfig and gitignore

* use file scope namespace

* remove file-scope name

* fix format

* Add poethepoet to dev deps (#3675)

Co-authored-by: Eric Zhu <[email protected]>

---------

Co-authored-by: Victor Dibia <[email protected]>
Co-authored-by: Adam Fourney <[email protected]>
Co-authored-by: gagb <[email protected]>
Co-authored-by: Eric Zhu <[email protected]>
Co-authored-by: Jack Gerrits <[email protected]>
Co-authored-by: Jack Gerrits <[email protected]>
Co-authored-by: Mohammad Mazraeh <[email protected]>
Co-authored-by: Xiaoyun Zhang <[email protected]>
  • Loading branch information
9 people authored Oct 8, 2024
1 parent dd43cf8 commit 583a78b
Show file tree
Hide file tree
Showing 44 changed files with 1,321 additions and 3,675 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- main
- staging
pull_request:
branches:
- main
- staging

jobs:
format:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ name: Docs
on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
branches:
- main
- staging

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down Expand Up @@ -49,9 +51,6 @@ jobs:
name: "04-docs"

build-02:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -60,8 +59,7 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
repository: "microsoft/autogen"
# ref: "0.2"
ref: "0.2"
- uses: actions/setup-node@v4
with:
node-version: 18.x
Expand Down Expand Up @@ -115,6 +113,7 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: [build-02, build-04]
if: ${{ needs.build-02.result == 'success' && needs.build-04.result == 'success' && github.ref == 'refs/heads/main' }}
steps:
- uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/dotnet-build-test-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on:
push:
branches:
- main
- staging
pull_request:
branches:
- main
- staging

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: dotnet-ci
on:
workflow_dispatch:
pull_request:
branches: [ "main" ]
branches: [ "main", "staging" ]
push:
branches: [ "main" ]
branches: [ "main", "staging" ]
merge_group:
types: [checks_requested]

Expand Down
270 changes: 0 additions & 270 deletions autogen/oai/cerebras.py

This file was deleted.

Loading

0 comments on commit 583a78b

Please sign in to comment.