GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-22 05:30:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge feature/update-bedrock-api into main

Browse Source
This commit is contained in:
glay 2024-11-05 20:20:20 +08:00
parent 1164e1bdf6
commit 1998cf5ced
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/bedrock.ts
View File

@ -41,10 +41,7 @@ export interface ConverseRequest {
function supportsToolUse(modelId: string): boolean {
// llama和mistral模型不支持工具调用
return (
modelId.toLowerCase().includes("claude-3") &&
modelId.toLowerCase().includes("claude-3-5")
);
return modelId.toLowerCase().includes("claude-3");
}
function formatRequestBody(

14
app/client/platforms/bedrock.ts
View File

@ -38,11 +38,9 @@ export class BedrockApi implements LLMApi {
}
extractMessage(res: any) {
console.log("[Response] bedrock response: ", res);
if (Array.isArray(res?.content)) {
return res.content;
}
return res;
console.log("[Response] claude response: ", res);
return res?.content?.[0]?.text;
}
async chat(options: ChatOptions): Promise<void> {
@ -173,7 +171,6 @@ export class BedrockApi implements LLMApi {
funcs,
controller,
// parseSSE
// parseSSE
(text: string, runTools: ChatMessageTool[]) => {
// console.log("parseSSE", text, runTools);
let chunkJson:
@ -269,13 +266,14 @@ export class BedrockApi implements LLMApi {
};
try {
controller.signal.onabort = () => options.onFinish("");
controller.signal.onabort = () =>
options.onFinish("", new Response(null, { status: 400 }));
const res = await fetch(conversePath, payload);
const resJson = await res.json();
const message = this.extractMessage(resJson);
options.onFinish(message);
options.onFinish(message, res);
} catch (e) {
console.error("failed to chat", e);
options.onError?.(e as Error);