Compare commits

...

9 Commits

Author SHA1 Message Date
glay
24261d20b3 Consider adding more Bedrock-specific configurations 2024-11-13 08:18:20 +08:00
glay
1b5a81c7ad Add AWS secret key validation. 2024-11-13 08:10:10 +08:00
glay
70f066c15f Add AWS region validation and improve code style. 2024-11-13 08:08:01 +08:00
glay
bfa433919f Add AWS access key validation. 2024-11-13 07:57:51 +08:00
glay
afb0752d5d Merge branch 'ChatGPTNextWeb:main' into main 2024-11-13 07:52:30 +08:00
Lloyd Zhou
819d249a09 Merge pull request #5815 from LovelyGuYiMeng/main
Some checks are pending
Run Tests / test (push) Waiting to run
更新视觉模型匹配关键词
2024-11-12 15:04:11 +08:00
LovelyGuYiMeng
8d66fedb1f Update visionKeywords 2024-11-12 14:28:11 +08:00
Lloyd Zhou
7cf89b53ce Merge pull request #5812 from ConnectAI-E/fix/rerender-chat
fix: use current session id to trigger rerender
2024-11-12 13:49:51 +08:00
Dogtiti
1d14a991ee fix: use current session id to trigger rerender 2024-11-11 20:30:59 +08:00
4 changed files with 32 additions and 15 deletions

View File

@@ -2071,6 +2071,6 @@ function _Chat() {
export function Chat() {
const chatStore = useChatStore();
const sessionIndex = chatStore.currentSessionIndex;
return <_Chat key={sessionIndex}></_Chat>;
const session = chatStore.currentSession();
return <_Chat key={session.id}></_Chat>;
}

View File

@@ -978,9 +978,14 @@ export function Settings() {
value={accessStore.awsRegion}
placeholder="us-west-2"
onChange={(e) =>
accessStore.update(
(access) => (access.awsRegion = e.currentTarget.value),
)
accessStore.update((access) => {
const region = e.currentTarget.value;
if (!/^[a-z]{2}-[a-z]+-\d+$/.test(region)) {
showToast(Locale.Settings.Access.Bedrock.Region.Invalid);
return;
}
access.awsRegion = region;
})
}
/>
</ListItem>
@@ -994,9 +999,14 @@ export function Settings() {
type="text"
placeholder={Locale.Settings.Access.Bedrock.AccessKey.Placeholder}
onChange={(e) => {
accessStore.update(
(access) => (access.awsAccessKey = e.currentTarget.value),
);
accessStore.update((access) => {
const accessKey = e.currentTarget.value;
if (accessKey && accessKey.length !== 20) {
showToast(Locale.Settings.Access.Bedrock.AccessKey.Invalid);
return;
}
access.awsAccessKey = accessKey;
});
}}
maskWhenShow={true}
/>
@@ -1011,9 +1021,14 @@ export function Settings() {
type="text"
placeholder={Locale.Settings.Access.Bedrock.SecretKey.Placeholder}
onChange={(e) => {
accessStore.update(
(access) => (access.awsSecretKey = e.currentTarget.value),
);
accessStore.update((access) => {
const secretKey = e.currentTarget.value;
if (secretKey && secretKey.length !== 40) {
showToast(Locale.Settings.Access.Bedrock.SecretKey.Invalid);
return;
}
access.awsSecretKey = secretKey;
});
}}
maskWhenShow={true}
/>

View File

@@ -242,6 +242,8 @@ export const ChatGLM = {
export const Bedrock = {
ChatPath: "converse",
ApiVersion: "2023-11-01",
getEndpoint: (region: string = "us-west-2") =>`https://bedrock-runtime.${region}.amazonaws.com`,
};
export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang

View File

@@ -257,11 +257,11 @@ export function isVisionModel(model: string) {
const excludeKeywords = ["claude-3-5-haiku-20241022"];
const visionKeywords = [
"vision",
"claude-3",
"gemini-1.5-pro",
"gemini-1.5-flash",
"gpt-4o",
"gpt-4o-mini",
"claude-3",
"gemini-1.5",
"qwen-vl",
"qwen2-vl",
];
const isGpt4Turbo =
model.includes("gpt-4-turbo") && !model.includes("preview");