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

support for gemini thinking model #856

Merged
merged 9 commits into from
Jan 18, 2025
Merged

support for gemini thinking model #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70af0e2
support for gemini thinking model
narengogi Jan 6, 2025
9bf74b3
replicate changes for google
narengogi Jan 6, 2025
3993321
support chain of thought model response in streaming as well
narengogi Jan 15, 2025
3a73f19
handle strict openai compliance for streaming thinking model response…
narengogi Jan 15, 2025
b1ffa0b
use streamstate to check cot message was present or not for gemini th…
narengogi Jan 18, 2025
6fd96d9
update check
narengogi Jan 18, 2025
7686034
update check
narengogi Jan 18, 2025
094700d
Merge remote-tracking branch 'upstream/main' into chore/vertex/gemini…
narengogi Jan 18, 2025
19ffb37
add route version
narengogi Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/providers/google-vertex-ai/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ import { Options } from '../../types/requestBody';
import { endpointStrings, ProviderAPIConfig } from '../types';
import { getModelAndProvider, getAccessToken } from './utils';

const shouldUseBeta1Version = (provider: string, inputModel: string) => {
if (
provider === 'meta' ||
inputModel.includes('gemini-2.0-flash-thinking-exp')
)
return true;
return false;
};

const getProjectRoute = (
providerOptions: Options,
inputModel: string
Expand All @@ -17,7 +26,10 @@ const getProjectRoute = (
}

const { provider } = getModelAndProvider(inputModel as string);
const routeVersion = provider === 'meta' ? 'v1beta1' : 'v1';
let routeVersion = provider === 'meta' ? 'v1beta1' : 'v1';
if (shouldUseBeta1Version(provider, inputModel)) {
routeVersion = 'v1beta1';
}
return `/${routeVersion}/projects/${projectId}/locations/${vertexRegion}`;
};

Expand Down
44 changes: 41 additions & 3 deletions src/providers/google-vertex-ai/chatComplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,11 +644,26 @@ export const GoogleChatCompleteResponseTransform: (
provider: GOOGLE_VERTEX_AI,
choices:
response.candidates?.map((generation, index) => {
const containsChainOfThoughtMessage =
generation.content?.parts.length > 1;
let message: Message = { role: 'assistant', content: '' };
if (generation.content?.parts[0]?.text) {
let content: string = generation.content.parts[0]?.text;
if (
containsChainOfThoughtMessage &&
generation.content.parts[1]?.text
) {
if (strictOpenAiCompliance)
content = generation.content.parts[1]?.text;
else
content =
generation.content.parts[0]?.text +
'\r\n\r\n' +
generation.content.parts[1]?.text;
}
message = {
role: 'assistant',
content: generation.content.parts[0]?.text,
content,
};
} else if (generation.content?.parts[0]?.functionCall) {
message = {
Expand Down Expand Up @@ -751,9 +766,11 @@ export const GoogleChatCompleteStreamChunkTransform: (
) => string = (
responseChunk,
fallbackId,
_streamState,
streamState,
strictOpenAiCompliance
) => {
streamState.containsChainOfThoughtMessage =
streamState?.containsChainOfThoughtMessage ?? false;
const chunk = responseChunk
.trim()
.replace(/^data: /, '')
Expand Down Expand Up @@ -784,9 +801,30 @@ export const GoogleChatCompleteStreamChunkTransform: (
parsedChunk.candidates?.map((generation, index) => {
let message: Message = { role: 'assistant', content: '' };
if (generation.content?.parts[0]?.text) {
if (generation.content.parts[0].thought)
streamState.containsChainOfThoughtMessage = true;

let content: string =
strictOpenAiCompliance && streamState.containsChainOfThoughtMessage
? ''
: generation.content.parts[0]?.text;
if (generation.content.parts[1]?.text) {
if (strictOpenAiCompliance)
content = generation.content.parts[1].text;
else content += '\r\n\r\n' + generation.content.parts[1]?.text;
streamState.containsChainOfThoughtMessage = false;
} else if (
streamState.containsChainOfThoughtMessage &&
!generation.content.parts[0]?.thought
) {
if (strictOpenAiCompliance)
content = generation.content.parts[0].text;
else content = '\r\n\r\n' + content;
streamState.containsChainOfThoughtMessage = false;
}
message = {
role: 'assistant',
content: generation.content.parts[0]?.text,
content,
};
} else if (generation.content?.parts[0]?.functionCall) {
message = {
Expand Down
1 change: 1 addition & 0 deletions src/providers/google-vertex-ai/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface GoogleGenerateContentResponse {
content: {
parts: {
text?: string;
thought?: string; // for models like gemini-2.0-flash-thinking-exp refer: https://ai.google.dev/gemini-api/docs/thinking-mode#streaming_model_thinking
functionCall?: GoogleGenerateFunctionCall;
}[];
};
Expand Down
12 changes: 8 additions & 4 deletions src/providers/google/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
import { ProviderAPIConfig } from '../types';

export const GoogleApiConfig: ProviderAPIConfig = {
getBaseURL: () => 'https://generativelanguage.googleapis.com/v1beta',
getBaseURL: () => 'https://generativelanguage.googleapis.com',
headers: () => {
return { 'Content-Type': 'application/json' };
},
getEndpoint: ({ fn, providerOptions, gatewayRequestBodyJSON }) => {
let routeVersion = 'v1beta';
let mappedFn = fn;
const { model, stream } = gatewayRequestBodyJSON;
if (model?.includes('gemini-2.0-flash-thinking-exp')) {
routeVersion = 'v1alpha';
}
const { apiKey } = providerOptions;
if (stream && fn === 'chatComplete') {
return `/models/${model}:streamGenerateContent?key=${apiKey}`;
return `/${routeVersion}/models/${model}:streamGenerateContent?key=${apiKey}`;
}
switch (mappedFn) {
case 'chatComplete': {
return `/models/${model}:generateContent?key=${apiKey}`;
return `/${routeVersion}/models/${model}:generateContent?key=${apiKey}`;
}
case 'embed': {
return `/models/${model}:embedContent?key=${apiKey}`;
return `/${routeVersion}/models/${model}:embedContent?key=${apiKey}`;
}
default:
return '';
Expand Down
48 changes: 44 additions & 4 deletions src/providers/google/chatComplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ interface GoogleGenerateContentResponse {
content: {
parts: {
text?: string;
thought?: string; // for models like gemini-2.0-flash-thinking-exp refer: https://ai.google.dev/gemini-api/docs/thinking-mode#streaming_model_thinking
functionCall?: GoogleGenerateFunctionCall;
}[];
};
Expand Down Expand Up @@ -489,11 +490,26 @@ export const GoogleChatCompleteResponseTransform: (
provider: 'google',
choices:
response.candidates?.map((generation, idx) => {
const containsChainOfThoughtMessage =
generation.content?.parts.length > 1;
let message: Message = { role: 'assistant', content: '' };
if (generation.content?.parts[0]?.text) {
let content: string = generation.content.parts[0]?.text;
if (
containsChainOfThoughtMessage &&
generation.content.parts[1]?.text
) {
if (strictOpenAiCompliance)
content = generation.content.parts[1]?.text;
else
content =
generation.content.parts[0]?.text +
'\r\n\r\n' +
generation.content.parts[1]?.text;
}
message = {
role: 'assistant',
content: generation.content.parts[0]?.text,
content,
};
} else if (generation.content?.parts[0]?.functionCall) {
message = {
Expand Down Expand Up @@ -540,9 +556,11 @@ export const GoogleChatCompleteStreamChunkTransform: (
) => string = (
responseChunk,
fallbackId,
_streamState,
streamState,
strictOpenAiCompliance
) => {
streamState.containsChainOfThoughtMessage =
streamState?.containsChainOfThoughtMessage ?? false;
let chunk = responseChunk.trim();
if (chunk.startsWith('[')) {
chunk = chunk.slice(1);
Expand Down Expand Up @@ -572,10 +590,32 @@ export const GoogleChatCompleteStreamChunkTransform: (
choices:
parsedChunk.candidates?.map((generation, index) => {
let message: Message = { role: 'assistant', content: '' };
if (generation.content.parts[0]?.text) {
if (generation.content?.parts[0]?.text) {
if (generation.content.parts[0].thought)
streamState.containsChainOfThoughtMessage = true;

let content: string =
strictOpenAiCompliance &&
streamState.containsChainOfThoughtMessage
? ''
: generation.content.parts[0]?.text;
if (generation.content.parts[1]?.text) {
if (strictOpenAiCompliance)
content = generation.content.parts[1].text;
else content += '\r\n\r\n' + generation.content.parts[1]?.text;
streamState.containsChainOfThoughtMessage = false;
} else if (
streamState.containsChainOfThoughtMessage &&
!generation.content.parts[0]?.thought
) {
if (strictOpenAiCompliance)
content = generation.content.parts[0].text;
else content = '\r\n\r\n' + content;
streamState.containsChainOfThoughtMessage = false;
}
message = {
role: 'assistant',
content: generation.content.parts[0]?.text,
content,
};
} else if (generation.content.parts[0]?.functionCall) {
message = {
Expand Down
Loading