Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve Merge Conflict & Add Tool Config #1

Open
wants to merge 253 commits into
base: dev
Choose a base branch
from

Conversation

luxzoli
Copy link

@luxzoli luxzoli commented Aug 20, 2024

  • Resolve merge conflicts
  • Add tool config support for function calling for VertexAI

Only changes to gemini.py , test_gemini.py , and openai_utils.py need to be reviewed, as the rest is changed due to synchronization with the official autogen repo except for agentchat_gemini.ipynb, where the difference is only automated formatting, which is not visible to the user anyway and thus irrelevant.

LittleLittleCloud and others added 30 commits June 25, 2024 21:40
…#2709)

* microsoft#2708 add Add a judgment to the graph constructor

* microsoft#2708 add Add a judgment to the graph constructor & added unit test

* microsoft#2708 microsoft#2079 move GraphTests to AutoGen.Tests; delete AutoGen.Core.Tests project
…ama Plus move ollama openai sample to AutoGen.OpenAI.Sample project (microsoft#3015)

* add sample

* Update Connect_To_Ollama.cs

* Update Connect_To_Ollama.cs
* Create azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md

* Update azure_cosmos_db.md
* Groq Client Class - main class and setup, except tests

* Change pricing per K, added tests

* Streaming support, including with tool calling

* Used Groq retries instead of loop, thanks Gal-Gilor!

* Fixed bug when using logging.

---------

Co-authored-by: Qingyun Wu <qingyun0327@gmail.com>
…et website (microsoft#3044)

* add instruction in ollama-litellm function call example

* add tutorial

* fix tests
adding links to blogposts to increase the clarity
…t#2944)

* Squash commits : support anthropic tools

* Support tool_choice

* Remove reference from TypeSafeFunctionCallCodeSnippet.cs and add own function in test proj
* make IStreamingMessage obsolete

* update final reply message
* Update qdrant dependency

* Update qdrant dependency
* update readme

* Update README.md

Co-authored-by: HRUSHIKESH DOKALA <96101829+Hk669@users.noreply.github.com>

* add notion link

---------

Co-authored-by: HRUSHIKESH DOKALA <96101829+Hk669@users.noreply.github.com>
* Blogpost for enhanced non-OpenAI model support

* update: quickstart with simple conversation

* update: authors details

* Added upfront text

* Added function calling, refined text. Added chess for alt-models notebook, updated examples listing.

* Added Groq to blog

* Removed acknowledgements

---------

Co-authored-by: Hk669 <hrushi669@gmail.com>
Co-authored-by: HRUSHIKESH DOKALA <96101829+Hk669@users.noreply.github.com>
* initial setup for cohere client

* client update

* changes: ClintType added to the utils

* Revert "changes: ClintType added to the utils"

This reverts commit 80d6155.

* Message conversion to Cohere, Parameter handling, cost calculation, streaming, tool calling

* Changed Groq references.

* minor fix

* tests added

* ref fix

* added in the workflows

* Fixed bug on non-streaming text generation

* fix: formatting

* Support Cohere rule for last message not USER when tool_results exist

* Added Cohere to documentation

* fixed client.py merge, removed unnecessary comments in groq.py, updated Cohere documentation, added Groq documentation

* log: ignored params

* update: custom exception added

---------

Co-authored-by: Mark Sze <mark@sze.family>
Co-authored-by: Mark Sze <66362098+marklysze@users.noreply.github.com>
* Update FunctionCallTemplate.tt

changed the desscription assigning to handle double quotes in comments and prevent the generated code from breaking.

* Added the necessary changes

Fixed handling of double quotes in descriptions within FunctionCallTemplate.tt.
Standardized newline characters to ensure consistency.
Updated test cases in FunctionCallTemplateEncodingTests to verify correct encoding of double quotes in descriptions.
Cleaned up unnecessary using directives in FunctionCallTemplateEncodingTests.
Aligned the template with the approved test output.

* test cases passing

Test cases passing like `Starting test execution, please wait...
A total of 1 test files matched the specified pattern.

Passed!  - Failed:     0, Passed:     9, Skipped:     0, Total:     9, Duration: 66 ms - AutoGen.SourceGenerator.Tests.dll (net8.0)`

* Delete FunctionCallTemplateTests.TestFunctionCallTemplate.approved.txt

Deleted the ApprovalTests/FunctionCallTemplateTests.TestFunctionCallTemplate.approved.txt successfully!

* Revert "Delete FunctionCallTemplateTests.TestFunctionCallTemplate.approved.txt"

This reverts commit 7a6ea9c.

---------

Co-authored-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>
* add notebook for using Gemini with VertexAI

* add missing image

* remove part with workload identity federation

* Spelling

* Capitalisation and tweak on config note.

* autogen gemini gcp image

* fix formatting

* move gemini vertexai notebook to website/docs/topics/non-openai-models

* Adjust license

Co-authored-by: Chi Wang <wang.chi@microsoft.com>

* remove auto-generated cell

---------

Co-authored-by: Mark Sze <66362098+marklysze@users.noreply.github.com>
Co-authored-by: Chi Wang <wang.chi@microsoft.com>
* add round robin orchestrator

* add constructor for orchestrators

* add tests

* revert change

* return single orchestrator

* address comment
…dpoint (microsoft#2633)

* update

* add test

* clean up

* update

* Delete dotnet/src/AutoGen.Server/AutoGen.Service.csproj.user

* implement streaming

* add sample project

* rename AutoGen.Service to AutoGen.WebAPI

* rename AutoGen.Service to AutoGen.WebAPI
…ion. modified the default agent reply so that it is different from the user's prompt (microsoft#3128)
* feat: Qdrant support

* chore: pre-defined vector db

* Fix issues

---------

Co-authored-by: Li Jiang <bnujli@gmail.com>
jackgerrits and others added 21 commits September 30, 2024 19:14
* feat: adds async hooks, across all types, and a hookable check

* fix: adds test to other hook types
* Cerebras Integration

* Address feedback

* Fix typo

* Run formatter
Co-authored-by: Eric Zhu <ekzhu@users.noreply.github.com>
* Disable Azure tests

* fix calculator notebook

* use gpt-4o-mini for tests

* use gpt-4o

* use gpt-4o

* fix formatting

* Fix models used in contrib tests

* Fix retrieval test

* WIP

* Skip

* Fix format

* Fix formatting
* Ollama client! With function calling. Initial commit, client, no docs or tests yet.

* Tidy comments

* Cater for missing prompt token count

* Removed use of eval, added json parsing support library

* Fix to the use of the JSON fix library, handling of Mixtral escape sequence

* Fixed 'name' in JSON bug, catered for single function call JSON without []

* removing role='tool' from inner tool result to reduce token usage.

* Added Ollama documentation and updated library versions

* Added Native Ollama tool calling (v0.3.0 req.) as well as hide/show tools support

* Added native tool calling and hide_tools parameter to documentation

* Update to Ollama 0.3.1, added tests

* Tweak to manual function calling prompt to improve number handling.

* Fix formatting

Co-authored-by: gagb <gagb@users.noreply.github.com>
Co-authored-by: Jack Gerrits <jackgerrits@users.noreply.github.com>

* Fix formatting

* Better error message

---------

Co-authored-by: Eric Zhu <ekzhu@users.noreply.github.com>
Co-authored-by: gagb <gagb@users.noreply.github.com>
Co-authored-by: Jack Gerrits <jackgerrits@users.noreply.github.com>
* Update version to 0.2.36, update package name

* update publish

* Formatting

* Update README.md

* update email
* Fix typos in Cerebras doc

Fix typo in Cerebras documentation

* FIx formatting
* Update PR link in blog post

* Update index.mdx
* Update config.yml

* Delete .github/ISSUE_TEMPLATE.md

* Delete .github/ISSUE_TEMPLATE/general_issue.yml

* Update feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Update bug_report.yml

* Update .github/ISSUE_TEMPLATE/bug_report.yml

Co-authored-by: Eric Zhu <ekzhu@users.noreply.github.com>

* Update .github/ISSUE_TEMPLATE/config.yml

Co-authored-by: Eric Zhu <ekzhu@users.noreply.github.com>

* Update bug_report.yml

* Update config.yml

---------

Co-authored-by: Eric Zhu <ekzhu@users.noreply.github.com>
@luxzoli luxzoli force-pushed the arjun-g-dev-tool-config branch from df95d5f to f44309b Compare October 7, 2024 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.