mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-11-15 13:33:43 +08:00
修改： app/api/[provider]/[...path]/route.ts
修改： app/api/auth.ts 新文件： app/api/bedrock.ts 新文件： app/api/bedrock/models.ts 新文件： app/api/bedrock/utils.ts 修改： app/client/api.ts 新文件： app/client/platforms/bedrock.ts 修改： app/components/settings.tsx 修改： app/config/server.ts 修改： app/constant.ts 修改： app/locales/cn.ts 修改： app/locales/en.ts 修改： app/store/access.ts 修改： app/utils.ts 修改： package.json
This commit is contained in:
glay
@@ -12,6 +12,7 @@ import {
|
||||
useChatStore,
|
||||
} from "../store";
|
||||
import { ChatGPTApi, DalleRequestPayload } from "./platforms/openai";
|
||||
import { BedrockApi } from "./platforms/bedrock";
|
||||
import { GeminiProApi } from "./platforms/google";
|
||||
import { ClaudeApi } from "./platforms/anthropic";
|
||||
import { ErnieApi } from "./platforms/baidu";
|
||||
@@ -129,6 +130,9 @@ export class ClientApi {
|
||||
|
||||
constructor(provider: ModelProvider = ModelProvider.GPT) {
|
||||
switch (provider) {
|
||||
case ModelProvider.Bedrock:
|
||||
this.llm = new BedrockApi();
|
||||
break;
|
||||
case ModelProvider.GeminiPro:
|
||||
this.llm = new GeminiProApi();
|
||||
break;
|
||||
@@ -235,6 +239,7 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
|
||||
function getConfig() {
|
||||
const modelConfig = chatStore.currentSession().mask.modelConfig;
|
||||
const isBedrock = modelConfig.providerName === ServiceProvider.Bedrock;
|
||||
const isGoogle = modelConfig.providerName === ServiceProvider.Google;
|
||||
const isAzure = modelConfig.providerName === ServiceProvider.Azure;
|
||||
const isAnthropic = modelConfig.providerName === ServiceProvider.Anthropic;
|
||||
@@ -247,6 +252,8 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
const isEnabledAccessControl = accessStore.enabledAccessControl();
|
||||
const apiKey = isGoogle
|
||||
? accessStore.googleApiKey
|
||||
: isBedrock
|
||||
? accessStore.awsAccessKeyId // Use AWS access key for Bedrock
|
||||
: isAzure
|
||||
? accessStore.azureApiKey
|
||||
: isAnthropic
|
||||
@@ -265,6 +272,7 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
: ""
|
||||
: accessStore.openaiApiKey;
|
||||
return {
|
||||
isBedrock,
|
||||
isGoogle,
|
||||
isAzure,
|
||||
isAnthropic,
|
||||
@@ -286,10 +294,13 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
? "x-api-key"
|
||||
: isGoogle
|
||||
? "x-goog-api-key"
|
||||
: isBedrock
|
||||
? "x-api-key"
|
||||
: "Authorization";
|
||||
}
|
||||
|
||||
const {
|
||||
isBedrock,
|
||||
isGoogle,
|
||||
isAzure,
|
||||
isAnthropic,
|
||||
@@ -302,17 +313,27 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
|
||||
const authHeader = getAuthHeader();
|
||||
|
||||
const bearerToken = getBearerToken(
|
||||
apiKey,
|
||||
isAzure || isAnthropic || isGoogle,
|
||||
);
|
||||
|
||||
if (bearerToken) {
|
||||
headers[authHeader] = bearerToken;
|
||||
} else if (isEnabledAccessControl && validString(accessStore.accessCode)) {
|
||||
headers["Authorization"] = getBearerToken(
|
||||
ACCESS_CODE_PREFIX + accessStore.accessCode,
|
||||
if (isBedrock) {
|
||||
// Add AWS credentials for Bedrock
|
||||
headers["X-Region"] = accessStore.awsRegion;
|
||||
headers["X-Access-Key"] = accessStore.awsAccessKeyId;
|
||||
headers["X-Secret-Key"] = accessStore.awsSecretAccessKey;
|
||||
if (accessStore.awsSessionToken) {
|
||||
headers["X-Session-Token"] = accessStore.awsSessionToken;
|
||||
}
|
||||
} else {
|
||||
const bearerToken = getBearerToken(
|
||||
apiKey,
|
||||
isAzure || isAnthropic || isGoogle,
|
||||
);
|
||||
|
||||
if (bearerToken) {
|
||||
headers[authHeader] = bearerToken;
|
||||
} else if (isEnabledAccessControl && validString(accessStore.accessCode)) {
|
||||
headers["Authorization"] = getBearerToken(
|
||||
ACCESS_CODE_PREFIX + accessStore.accessCode,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return headers;
|
||||
@@ -320,6 +341,8 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
||||
|
||||
export function getClientApi(provider: ServiceProvider): ClientApi {
|
||||
switch (provider) {
|
||||
case ServiceProvider.Bedrock:
|
||||
return new ClientApi(ModelProvider.Bedrock);
|
||||
case ServiceProvider.Google:
|
||||
return new ClientApi(ModelProvider.GeminiPro);
|
||||
case ServiceProvider.Anthropic:
|
||||
|
||||
223
app/client/platforms/bedrock.ts
Normal file
223
app/client/platforms/bedrock.ts
Normal file
@@ -0,0 +1,223 @@
|
||||
import { ApiPath } from "../../constant";
|
||||
import { ChatOptions, getHeaders, LLMApi, SpeechOptions } from "../api";
|
||||
import {
|
||||
useAccessStore,
|
||||
useAppConfig,
|
||||
useChatStore,
|
||||
usePluginStore,
|
||||
} from "../../store";
|
||||
import { preProcessImageContent, stream } from "../../utils/chat";
|
||||
import Locale from "../../locales";
|
||||
|
||||
export interface BedrockChatRequest {
|
||||
model: string;
|
||||
messages: Array<{
|
||||
role: string;
|
||||
content:
|
||||
| string
|
||||
| Array<{
|
||||
type: string;
|
||||
text?: string;
|
||||
image_url?: { url: string };
|
||||
document?: {
|
||||
format: string;
|
||||
name: string;
|
||||
source: {
|
||||
bytes: string;
|
||||
};
|
||||
};
|
||||
}>;
|
||||
}>;
|
||||
temperature?: number;
|
||||
top_p?: number;
|
||||
max_tokens?: number;
|
||||
stream?: boolean;
|
||||
}
|
||||
|
||||
export class BedrockApi implements LLMApi {
|
||||
speech(options: SpeechOptions): Promise<ArrayBuffer> {
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
|
||||
extractMessage(res: any) {
|
||||
console.log("[Response] bedrock response: ", res);
|
||||
return res;
|
||||
}
|
||||
|
||||
async chat(options: ChatOptions): Promise<void> {
|
||||
const shouldStream = !!options.config.stream;
|
||||
|
||||
const modelConfig = {
|
||||
...useAppConfig.getState().modelConfig,
|
||||
...useChatStore.getState().currentSession().mask.modelConfig,
|
||||
...{
|
||||
model: options.config.model,
|
||||
},
|
||||
};
|
||||
|
||||
const accessStore = useAccessStore.getState();
|
||||
|
||||
if (
|
||||
!accessStore.awsRegion ||
|
||||
!accessStore.awsAccessKeyId ||
|
||||
!accessStore.awsSecretAccessKey
|
||||
) {
|
||||
console.log("AWS credentials are not set");
|
||||
let responseText = "";
|
||||
const responseTexts = [responseText];
|
||||
responseTexts.push(Locale.Error.Unauthorized);
|
||||
responseText = responseTexts.join("\n\n");
|
||||
options.onFinish(responseText);
|
||||
return;
|
||||
}
|
||||
|
||||
// Process messages to handle image and document content
|
||||
const messages = await Promise.all(
|
||||
options.messages.map(async (v) => {
|
||||
const content = await preProcessImageContent(v.content);
|
||||
// If content is an array (multimodal), ensure each item is properly formatted
|
||||
if (Array.isArray(content)) {
|
||||
return {
|
||||
role: v.role,
|
||||
content: content.map((item) => {
|
||||
if (item.type === "image_url" && item.image_url?.url) {
|
||||
// If the URL is a base64 data URL, use it directly
|
||||
if (item.image_url.url.startsWith("data:image/")) {
|
||||
return item;
|
||||
}
|
||||
// Otherwise, it's a regular URL that needs to be converted to base64
|
||||
// The conversion should have been handled by preProcessImageContent
|
||||
return item;
|
||||
}
|
||||
if ("document" in item) {
|
||||
// Handle document content
|
||||
const doc = item as any;
|
||||
if (
|
||||
doc?.document?.format &&
|
||||
doc?.document?.name &&
|
||||
doc?.document?.source?.bytes
|
||||
) {
|
||||
return {
|
||||
type: "document",
|
||||
document: {
|
||||
format: doc.document.format,
|
||||
name: doc.document.name,
|
||||
source: {
|
||||
bytes: doc.document.source.bytes,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
return item;
|
||||
}),
|
||||
};
|
||||
}
|
||||
// If content is a string, return it as is
|
||||
return {
|
||||
role: v.role,
|
||||
content,
|
||||
};
|
||||
}),
|
||||
);
|
||||
|
||||
const requestBody: BedrockChatRequest = {
|
||||
messages,
|
||||
stream: shouldStream,
|
||||
model: modelConfig.model,
|
||||
max_tokens: modelConfig.max_tokens,
|
||||
temperature: modelConfig.temperature,
|
||||
top_p: modelConfig.top_p,
|
||||
};
|
||||
|
||||
console.log("[Bedrock] Request:", {
|
||||
model: modelConfig.model,
|
||||
messages: messages,
|
||||
});
|
||||
|
||||
const controller = new AbortController();
|
||||
options.onController?.(controller);
|
||||
|
||||
const headers: Record<string, string> = {
|
||||
...getHeaders(),
|
||||
"X-Region": accessStore.awsRegion,
|
||||
"X-Access-Key": accessStore.awsAccessKeyId,
|
||||
"X-Secret-Key": accessStore.awsSecretAccessKey,
|
||||
};
|
||||
|
||||
if (accessStore.awsSessionToken) {
|
||||
headers["X-Session-Token"] = accessStore.awsSessionToken;
|
||||
}
|
||||
|
||||
try {
|
||||
if (shouldStream) {
|
||||
let responseText = "";
|
||||
const pluginStore = usePluginStore.getState();
|
||||
const currentSession = useChatStore.getState().currentSession();
|
||||
const [tools, funcs] = pluginStore.getAsTools(
|
||||
currentSession.mask?.plugin || [],
|
||||
);
|
||||
|
||||
await stream(
|
||||
`${ApiPath.Bedrock}/invoke`,
|
||||
requestBody,
|
||||
headers,
|
||||
Array.isArray(tools) ? tools : [],
|
||||
funcs || {},
|
||||
controller,
|
||||
(chunk: string) => {
|
||||
try {
|
||||
responseText += chunk;
|
||||
return chunk;
|
||||
} catch (e) {
|
||||
console.error("[Request] parse error", chunk, e);
|
||||
return "";
|
||||
}
|
||||
},
|
||||
(
|
||||
requestPayload: any,
|
||||
toolCallMessage: any,
|
||||
toolCallResult: any[],
|
||||
) => {
|
||||
console.log("[Bedrock] processToolMessage", {
|
||||
requestPayload,
|
||||
toolCallMessage,
|
||||
toolCallResult,
|
||||
});
|
||||
},
|
||||
options,
|
||||
);
|
||||
} else {
|
||||
const response = await fetch(`${ApiPath.Bedrock}/invoke`, {
|
||||
method: "POST",
|
||||
headers,
|
||||
body: JSON.stringify(requestBody),
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const error = await response.text();
|
||||
console.error("[Bedrock] Error response:", error);
|
||||
throw new Error(`Bedrock API error: ${error}`);
|
||||
}
|
||||
|
||||
const text = await response.text();
|
||||
options.onFinish(text);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("[Bedrock] Chat error:", e);
|
||||
options.onError?.(e as Error);
|
||||
}
|
||||
}
|
||||
|
||||
async usage() {
|
||||
return {
|
||||
used: 0,
|
||||
total: 0,
|
||||
};
|
||||
}
|
||||
|
||||
async models() {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user