forked from XiaoMo/ChatGPT-Next-Web
feat: support streaming for Gemini Pro (#3688)
* feat: support streaming for Gemini Pro * feat: display texts smoothly * chore: remove comments
This commit is contained in:
parent
3ba598633c
commit
5cf58d9446
@ -20,6 +20,7 @@ export class GeminiProApi implements LLMApi {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
async chat(options: ChatOptions): Promise<void> {
|
async chat(options: ChatOptions): Promise<void> {
|
||||||
|
const apiClient = this;
|
||||||
const messages = options.messages.map((v) => ({
|
const messages = options.messages.map((v) => ({
|
||||||
role: v.role.replace("assistant", "model").replace("system", "user"),
|
role: v.role.replace("assistant", "model").replace("system", "user"),
|
||||||
parts: [{ text: v.content }],
|
parts: [{ text: v.content }],
|
||||||
@ -61,8 +62,7 @@ export class GeminiProApi implements LLMApi {
|
|||||||
|
|
||||||
console.log("[Request] google payload: ", requestPayload);
|
console.log("[Request] google payload: ", requestPayload);
|
||||||
|
|
||||||
// todo: support stream later
|
const shouldStream = !!options.config.stream;
|
||||||
const shouldStream = false;
|
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
options.onController?.(controller);
|
options.onController?.(controller);
|
||||||
try {
|
try {
|
||||||
@ -82,13 +82,21 @@ export class GeminiProApi implements LLMApi {
|
|||||||
if (shouldStream) {
|
if (shouldStream) {
|
||||||
let responseText = "";
|
let responseText = "";
|
||||||
let remainText = "";
|
let remainText = "";
|
||||||
|
let streamChatPath = chatPath.replace(
|
||||||
|
"generateContent",
|
||||||
|
"streamGenerateContent",
|
||||||
|
);
|
||||||
let finished = false;
|
let finished = false;
|
||||||
|
const finish = () => {
|
||||||
|
finished = true;
|
||||||
|
options.onFinish(responseText + remainText);
|
||||||
|
};
|
||||||
|
|
||||||
// animate response to make it looks smooth
|
// animate response to make it looks smooth
|
||||||
function animateResponseText() {
|
function animateResponseText() {
|
||||||
if (finished || controller.signal.aborted) {
|
if (finished || controller.signal.aborted) {
|
||||||
responseText += remainText;
|
responseText += remainText;
|
||||||
console.log("[Response Animation] finished");
|
finish();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,87 +113,40 @@ export class GeminiProApi implements LLMApi {
|
|||||||
|
|
||||||
// start animaion
|
// start animaion
|
||||||
animateResponseText();
|
animateResponseText();
|
||||||
|
fetch(streamChatPath, chatPayload)
|
||||||
|
.then((response) => {
|
||||||
|
const reader = response?.body?.getReader();
|
||||||
|
const decoder = new TextDecoder();
|
||||||
|
let partialData = "";
|
||||||
|
|
||||||
const finish = () => {
|
return reader?.read().then(function processText({
|
||||||
if (!finished) {
|
done,
|
||||||
|
value,
|
||||||
|
}): Promise<any> {
|
||||||
|
if (done) {
|
||||||
|
console.log("Stream complete");
|
||||||
|
// options.onFinish(responseText + remainText);
|
||||||
finished = true;
|
finished = true;
|
||||||
options.onFinish(responseText + remainText);
|
return Promise.resolve();
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
controller.signal.onabort = finish;
|
|
||||||
|
|
||||||
fetchEventSource(chatPath, {
|
|
||||||
...chatPayload,
|
|
||||||
async onopen(res) {
|
|
||||||
clearTimeout(requestTimeoutId);
|
|
||||||
const contentType = res.headers.get("content-type");
|
|
||||||
console.log(
|
|
||||||
"[OpenAI] request response content type: ",
|
|
||||||
contentType,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (contentType?.startsWith("text/plain")) {
|
|
||||||
responseText = await res.clone().text();
|
|
||||||
return finish();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
partialData += decoder.decode(value, { stream: true });
|
||||||
!res.ok ||
|
|
||||||
!res.headers
|
|
||||||
.get("content-type")
|
|
||||||
?.startsWith(EventStreamContentType) ||
|
|
||||||
res.status !== 200
|
|
||||||
) {
|
|
||||||
const responseTexts = [responseText];
|
|
||||||
let extraInfo = await res.clone().text();
|
|
||||||
try {
|
try {
|
||||||
const resJson = await res.clone().json();
|
let data = JSON.parse(ensureProperEnding(partialData));
|
||||||
extraInfo = prettyObject(resJson);
|
console.log(data);
|
||||||
} catch {}
|
let fetchText = apiClient.extractMessage(data[data.length - 1]);
|
||||||
|
console.log("[Response Animation] fetchText: ", fetchText);
|
||||||
if (res.status === 401) {
|
remainText += fetchText;
|
||||||
responseTexts.push(Locale.Error.Unauthorized);
|
} catch (error) {
|
||||||
|
// skip error message when parsing json
|
||||||
}
|
}
|
||||||
|
|
||||||
if (extraInfo) {
|
return reader.read().then(processText);
|
||||||
responseTexts.push(extraInfo);
|
});
|
||||||
}
|
})
|
||||||
|
.catch((error) => {
|
||||||
responseText = responseTexts.join("\n\n");
|
console.error("Error:", error);
|
||||||
|
|
||||||
return finish();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onmessage(msg) {
|
|
||||||
if (msg.data === "[DONE]" || finished) {
|
|
||||||
return finish();
|
|
||||||
}
|
|
||||||
const text = msg.data;
|
|
||||||
try {
|
|
||||||
const json = JSON.parse(text) as {
|
|
||||||
choices: Array<{
|
|
||||||
delta: {
|
|
||||||
content: string;
|
|
||||||
};
|
|
||||||
}>;
|
|
||||||
};
|
|
||||||
const delta = json.choices[0]?.delta?.content;
|
|
||||||
if (delta) {
|
|
||||||
remainText += delta;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error("[Request] parse error", text);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onclose() {
|
|
||||||
finish();
|
|
||||||
},
|
|
||||||
onerror(e) {
|
|
||||||
options.onError?.(e);
|
|
||||||
throw e;
|
|
||||||
},
|
|
||||||
openWhenHidden: true,
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const res = await fetch(chatPath, chatPayload);
|
const res = await fetch(chatPath, chatPayload);
|
||||||
@ -220,3 +181,10 @@ export class GeminiProApi implements LLMApi {
|
|||||||
return "/api/google/" + path;
|
return "/api/google/" + path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ensureProperEnding(str: string) {
|
||||||
|
if (str.startsWith("[") && !str.endsWith("]")) {
|
||||||
|
return str + "]";
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user