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

fix(ai-proxy): (multiple)(AG-154) fixed tools-functions calls coming back empty #13760

Merged
merged 5 commits into from
Nov 25, 2024

Conversation

tysoekong
Copy link
Contributor

@tysoekong tysoekong commented Oct 16, 2024

Summary

  • Fixes Bedrock, Gemini, Anthropic, Cohere function calling in AI-Proxy system (AG-154)
  • Fixes "image_url" type message not working in Bedrock (AG-155)

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

AG-154
AG-155
AG-166

@tysoekong tysoekong marked this pull request as ready for review October 16, 2024 15:04
@tysoekong
Copy link
Contributor Author

@fffonion @subnetmarco Let's go

@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Oct 16, 2024
@tysoekong
Copy link
Contributor Author

tysoekong commented Oct 16, 2024

spec/03-plugins/39-ai-request-transformer/02-integration_spec.lua is a genuine failure. I never get this right first-go, argh.

I'll fix it...

@tysoekong tysoekong force-pushed the fix/AG-154_bedrock_gemini_function_calling branch 3 times, most recently from b5414c2 to 0124b09 Compare October 25, 2024 17:36
@team-eng-enablement team-eng-enablement removed the author/community PRs from the open-source community (not Kong Inc) label Nov 4, 2024
@tysoekong tysoekong force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 0124b09 to 073ce14 Compare November 5, 2024 16:24
@AndyZhang0707 AndyZhang0707 requested a review from oowl November 11, 2024 09:52
Copy link
Member

@oowl oowl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we need some test for the current fix.

@tysoekong
Copy link
Contributor Author

@oowl I am on it

@tysoekong tysoekong force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 073ce14 to 6cf4b8b Compare November 13, 2024 03:18
@tysoekong
Copy link
Contributor Author

@oowl Added tests

@tysoekong tysoekong force-pushed the fix/AG-154_bedrock_gemini_function_calling branch 3 times, most recently from 9f6fdbe to 0142f6f Compare November 13, 2024 18:09
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from d2b0712 to 36adbc9 Compare November 20, 2024 11:23
@fffonion fffonion force-pushed the ai-plugins-refactor branch from 9247f35 to 1acaf85 Compare November 20, 2024 11:36
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 36adbc9 to 97ee4d1 Compare November 20, 2024 11:36
@fffonion fffonion force-pushed the ai-plugins-refactor branch 3 times, most recently from 3a6bc4f to 8d862c8 Compare November 20, 2024 13:35
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 97ee4d1 to b99e1de Compare November 20, 2024 13:37
Base automatically changed from ai-plugins-refactor to master November 21, 2024 08:19
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from b99e1de to 2aa1d99 Compare November 21, 2024 08:48
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 2aa1d99 to 8038a88 Compare November 21, 2024 11:42
@fffonion fffonion force-pushed the fix/AG-154_bedrock_gemini_function_calling branch from 8038a88 to e659e37 Compare November 25, 2024 09:14
@fffonion fffonion merged commit db9d6ae into master Nov 25, 2024
26 checks passed
@fffonion fffonion deleted the fix/AG-154_bedrock_gemini_function_calling branch November 25, 2024 09:36
@fffonion
Copy link
Contributor

cherry-pick in https://github.com/Kong/kong-ee/pull/10757

@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13760-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13760-to-master-to-upstream
git checkout -b cherry-pick-13760-to-master-to-upstream
ancref=$(git merge-base c5199ff0c386bc8091273c8a99d6760eb382f102 e659e37b9832fd57aa970545244dec76d4b23210)
git cherry-pick -x $ancref..e659e37b9832fd57aa970545244dec76d4b23210

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 25, 2024
@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.8.x
git worktree add -d .worktree/backport-13760-to-release/3.8.x origin/release/3.8.x
cd .worktree/backport-13760-to-release/3.8.x
git switch --create backport-13760-to-release/3.8.x
git cherry-pick -x e5f5ca82a96fd860283580d2c1680580909c842e 042848703e56fef53b58b9fa49bf4c38b0b4035f 720ab027a02078ddafe04eb2cdceba799405c81f d19edcfea9fdfaf7733fe4cfeb3df81a8d5b9f27 db9d6ae7a9987e3a29efd20ad66122d3b834813e

@kikito kikito removed incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention incomplete-backport labels Nov 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants