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): Fix Cohere breaks with model parameter in body; Fix OpenAI token counting for function requests; Fix user sending own-model parameter #13000

Merged
merged 12 commits into from
Jun 20, 2024

Conversation

tysoekong
Copy link
Contributor

@tysoekong tysoekong commented May 8, 2024

Summary

Minor fix rollup from RC2, for function calling fixes and other broken AI config checks.

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

KAG-4596

@tysoekong
Copy link
Contributor Author

Happy 13,000th pull request!!

@tysoekong tysoekong force-pushed the fix/ai_proxy_rc2_feedback branch 3 times, most recently from 3cd4e1a to 7bef31f Compare June 3, 2024 10:00
@fffonion
Copy link
Contributor

fffonion commented Jun 4, 2024

changes look fine, the commit message as well the linked ticket description should be more descriptive, let's describe what's actually being fixed instead of RC2 feedback.

@tysoekong tysoekong changed the title fix(ai-proxy): RC2 feedback fix(ai-proxy): Fix Cohere breaks with model parameter in body; Fix OpenAI token counting for function requests; Fix user sending own-model parameter Jun 5, 2024
@Kong Kong deleted a comment from ttyS0e Jun 5, 2024
@fffonion
Copy link
Contributor

fffonion commented Jun 7, 2024

@tysoekong please resolve conflict. would be ideal if you keep 4 commits as there're four changelogs, as it may become headache if we want to revert one of them. not a hard blocker though.

@ttyS0e
Copy link
Contributor

ttyS0e commented Jun 7, 2024

I just have to also investigate the streaming issue, it would make no sense to leave unpatched.

@pull-request-size pull-request-size bot added size/L and removed size/M labels Jun 10, 2024
@tysoekong tysoekong force-pushed the fix/ai_proxy_rc2_feedback branch 4 times, most recently from 7d54c33 to 082be0c Compare June 10, 2024 21:31
Copy link
Contributor

@fffonion fffonion left a comment

Choose a reason for hiding this comment

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

merge on CI pass.
reviewers please review each commits individually

kong/llm/drivers/anthropic.lua Outdated Show resolved Hide resolved
kong/llm/drivers/cohere.lua Show resolved Hide resolved
@tysoekong
Copy link
Contributor Author

READY TO GO

Copy link
Contributor

@fffonion fffonion left a comment

Choose a reason for hiding this comment

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

moving forward, we might want to setup a SSE server to catch more more corner cases

@fffonion fffonion merged commit 116f017 into master Jun 20, 2024
25 checks passed
@fffonion fffonion deleted the fix/ai_proxy_rc2_feedback branch June 20, 2024 01:48
@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-13000-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13000-to-master-to-upstream
git checkout -b cherry-pick-13000-to-master-to-upstream
ancref=$(git merge-base 755c07ccbcabf3964832afe63e7f5c89c936ee04 ace23f14961714d845a534e52cbdb72b48030ccc)
git cherry-pick -x $ancref..ace23f14961714d845a534e52cbdb72b48030ccc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants