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.

Sign up for GitHub

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

Jump to bottom

feat(ai-proxy): google-gemini support #12948

Merged
merged 20 commits into from
Jul 9, 2024
Merged

feat(ai-proxy): google-gemini support #12948

merged 20 commits into from
Jul 9, 2024

Conversation

tysoekong
Copy link
Contributor

@tysoekong tysoekong commented Apr 27, 2024 •
edited
Loading

Summary

Adds Google Gemini support to Kong AI Gateway.

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-27

@tysoekong tysoekong force-pushed the feat/ai_proxy_google_gemini branch from 7724fc8 to 4c9b05b Compare May 17, 2024 15:27
@tysoekong tysoekong mentioned this pull request May 22, 2024
Closed
3 tasks
@tysoekong tysoekong marked this pull request as ready for review May 29, 2024 11:18
@tysoekong tysoekong requested review from locao, hanshuebner and jschmid1 and removed request for jschmid1 May 29, 2024 11:19
@tysoekong tysoekong changed the title DRAFT: feat(ai-proxy): google-gemini support feat(ai-proxy): google-gemini support May 29, 2024
EduardoEspinozaPerez
EduardoEspinozaPerez approved these changes Jun 10, 2024
View reviewed changes
Copy link

@EduardoEspinozaPerez EduardoEspinozaPerez left a comment

Choose a reason for hiding this comment

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

LGTM

fffonion
fffonion reviewed Jun 17, 2024
View reviewed changes
Dockerfile Outdated Show resolved Hide resolved
fffonion
fffonion reviewed Jun 17, 2024
View reviewed changes
kong/plugins/ai-proxy/handler.lua Outdated Show resolved Hide resolved
kong/llm/drivers/shared.lua Show resolved Hide resolved
jschmid1
jschmid1 reviewed Jun 27, 2024
View reviewed changes
Dockerfile Outdated Show resolved Hide resolved
kong/llm/drivers/gemini.lua Outdated Show resolved Hide resolved
@tysoekong tysoekong force-pushed the feat/ai_proxy_google_gemini branch from f5df3aa to d312ce6 Compare June 28, 2024 15:38
@tysoekong tysoekong force-pushed the feat/ai_proxy_google_gemini branch from d312ce6 to de580bd Compare July 4, 2024 11:59
@subnetmarco
Copy link
Member

@tysoekong Let's get this merged.

@tysoekong tysoekong force-pushed the feat/ai_proxy_google_gemini branch from 0520fad to 61d44d1 Compare July 5, 2024 00:09
@tysoekong tysoekong requested a review from jschmid1 July 5, 2024 09:20
tysoekong and others added 19 commits July 5, 2024 11:06
@tysoekong
fix gemini system prompt
f384a15
@tysoekong
stash
a0b0296
@tysoekong
working public and vertex gemini chat text
f5d75bb
@tysoekong
stash
49a6784
@tysoekong
working static format for vertex; patched broken streaming termination
32c9528
@tysoekong
finished gemini (text-only) support
e4c3137
@tysoekong
entity catch on gemini
d148a92
@tysoekong
repair gemini split logic
3ef1f50
@tysoekong
fix(ai-proxy): gemini streaming transformer bug
c207f2b
@tysoekong
working public and vertex gemini chat text
dd303d6
@tysoekong
working static format for vertex; patched broken streaming termination
2f998b6
@tysoekong
finished gemini (text-only) support
569054a
@tysoekong
fix(ai-proxy): gemini streaming transformer bug
5043361
@tysoekong
Delete Dockerfile
14721f8
@tysoekong @fffonion
Update kong/plugins/ai-proxy/handler.lua
23d95f2 
Co-authored-by: Wangchong Zhou <wangchong@konghq.com>
@tysoekong
fix(ai-proxy): gemini duplication
9dea66f
@tysoekong
gemini tests
65b0d8f
@tysoekong
feat(ai-proxy): stream format tests
6c2cc3e
@tysoekong
fix(ai-proxy): lint
ae686a4
@tysoekong tysoekong force-pushed the feat/ai_proxy_google_gemini branch from 61d44d1 to ae686a4 Compare July 5, 2024 10:09
@jschmid1 jschmid1 merged commit c8d99a2 into master Jul 9, 2024
25 checks passed
@jschmid1 jschmid1 deleted the feat/ai_proxy_google_gemini branch July 9, 2024 07:40
@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-12948-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12948-to-master-to-upstream
git checkout -b cherry-pick-12948-to-master-to-upstream
ancref=$(git merge-base 8aea938eb4601a81b0326c6ae1004f62dcf0f5f5 ae686a42488415c593e950cf0bf48422e0619578)
git cherry-pick -x $ancref..ae686a42488415c593e950cf0bf48422e0619578

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 9, 2024
@locao locao removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 16, 2024
@tysoekong tysoekong mentioned this pull request Jul 23, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fffonion fffonion fffonion approved these changes

@jschmid1 jschmid1 jschmid1 approved these changes

@EduardoEspinozaPerez EduardoEspinozaPerez EduardoEspinozaPerez approved these changes

@locao locao Awaiting requested review from locao

@hanshuebner hanshuebner Awaiting requested review from hanshuebner

Assignees

@tysoekong tysoekong

Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee plugins/ai-proxy plugins/ai-request-transformer plugins/ai-response-transformer schema-change-noteworthy size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tysoekong @subnetmarco @team-gateway-bot @fffonion @jschmid1 @EduardoEspinozaPerez @locao