Skip to content

Commit 1cdc47c

Browse files
authored
⚡ feat: Gemini-1.5 Flash, gpt-4o imports, modelSpec greeting fix (danny-avila#2729)
* fix: Gemini Flash stream fix * fix: correct `sender` field for gpt-4o imports from ChatGPT * add flash model examples and fix vertex streaming * style: modelSpec greeting fix
1 parent 49bce2c commit 1cdc47c

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ GOOGLE_KEY=user_provided
116116
# GOOGLE_REVERSE_PROXY=
117117

118118
# Gemini API
119-
# GOOGLE_MODELS=gemini-1.0-pro,gemini-1.0-pro-001,gemini-1.0-pro-latest,gemini-1.0-pro-vision-latest,gemini-1.5-pro-latest,gemini-pro,gemini-pro-vision
119+
# GOOGLE_MODELS=gemini-1.5-flash-latest,gemini-1.0-pro,gemini-1.0-pro-001,gemini-1.0-pro-latest,gemini-1.0-pro-vision-latest,gemini-1.5-pro-latest,gemini-pro,gemini-pro-vision
120120

121121
# Vertex AI
122-
# GOOGLE_MODELS=gemini-1.5-pro-preview-0409,gemini-1.0-pro-vision-001,gemini-pro,gemini-pro-vision,chat-bison,chat-bison-32k,codechat-bison,codechat-bison-32k,text-bison,text-bison-32k,text-unicorn,code-gecko,code-bison,code-bison-32k
122+
# GOOGLE_MODELS=gemini-1.5-flash-preview-0514,gemini-1.5-pro-preview-0409,gemini-1.0-pro-vision-001,gemini-pro,gemini-pro-vision,chat-bison,chat-bison-32k,codechat-bison,codechat-bison-32k,text-bison,text-bison-32k,text-unicorn,code-gecko,code-bison,code-bison-32k
123123

124124
# Google Gemini Safety Settings
125125
# NOTE (Vertex AI): You do not have access to the BLOCK_NONE setting by default.

api/app/clients/GoogleClient.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -683,11 +683,12 @@ class GoogleClient extends BaseClient {
683683
const safetySettings = _payload.safetySettings;
684684
requestOptions.safetySettings = safetySettings;
685685

686+
const delay = modelName.includes('flash') ? 8 : 14;
686687
const result = await client.generateContentStream(requestOptions);
687688
for await (const chunk of result.stream) {
688689
const chunkText = chunk.text();
689-
this.generateTextStream(chunkText, onProgress, {
690-
delay: 12,
690+
await this.generateTextStream(chunkText, onProgress, {
691+
delay,
691692
});
692693
reply += chunkText;
693694
}
@@ -701,10 +702,14 @@ class GoogleClient extends BaseClient {
701702
safetySettings: safetySettings,
702703
});
703704

705+
let delay = this.isGenerativeModel ? 12 : 8;
706+
if (modelName.includes('flash')) {
707+
delay = 5;
708+
}
704709
for await (const chunk of stream) {
705710
const chunkText = chunk?.content ?? chunk;
706-
this.generateTextStream(chunkText, onProgress, {
707-
delay: this.isGenerativeModel ? 12 : 8,
711+
await this.generateTextStream(chunkText, onProgress, {
712+
delay,
708713
});
709714
reply += chunkText;
710715
}

api/server/utils/import/importers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function processConversation(conv, importBatchBuilder, requestUserId) {
202202
const isCreatedByUser = role === 'user';
203203
let sender = isCreatedByUser ? 'user' : 'GPT-3.5';
204204
const model = mapping.message.metadata.model_slug || openAISettings.model.default;
205-
if (model === 'gpt-4') {
205+
if (model.includes('gpt-4')) {
206206
sender = 'GPT-4';
207207
}
208208

client/src/components/Chat/Landing.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default function Landing({ Header }: { Header?: ReactNode }) {
7676
</div> */}
7777
</div>
7878
) : (
79-
<div className="mb-5 text-2xl font-medium dark:text-white">
79+
<div className="mb-5 max-w-[75vh] px-12 text-center text-lg font-medium dark:text-white md:px-0 md:text-2xl">
8080
{endpoint === EModelEndpoint.assistants
8181
? conversation?.greeting ?? localize('com_nav_welcome_assistant')
8282
: conversation?.greeting ?? localize('com_nav_welcome_message')}

0 commit comments

Comments
 (0)