Update i18n translations and ConfigStore

small-stone · small-stone · commit a49c00abe0eb · 2024-03-25T19:14:27.000+08:00
diff --git a/src/models/index.ts b/src/models/index.ts
@@ -4,88 +4,72 @@ const modelsTemplate = [
     provider: "devchat",
     stream: true,
     max_input_tokens: 13000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "gpt-4",
     provider: "devchat",
     stream: true,
     max_input_tokens: 6000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "gpt-4-turbo-preview",
     provider: "devchat",
     stream: true,
     max_input_tokens: 32000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
-    name: "claude-2.1",
+    name: "claude-3-opus",
+    provider: "devchat",
+    stream: true,
+    max_input_tokens: 32000,
+  },
+  {
+    name: "claude-3-sonnet",
     provider: "devchat",
     stream: true,
     max_input_tokens: 32000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "xinghuo-3.5",
     provider: "devchat",
     stream: true,
     max_input_tokens: 6000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "GLM-4",
     provider: "devchat",
     stream: true,
     max_input_tokens: 8000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "ERNIE-Bot-4.0",
     provider: "devchat",
     stream: true,
     max_input_tokens: 8000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "togetherai/codellama/CodeLlama-70b-Instruct-hf",
     provider: "devchat",
     stream: true,
     max_input_tokens: 4000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
   },
   {
     name: "togetherai/mistralai/Mixtral-8x7B-Instruct-v0.1",
     provider: "devchat",
     stream: true,
-    // max_input_tokens: 4000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
+    max_input_tokens: 4000,
   },
   {
     name: "minimax/abab6-chat",
     provider: "devchat",
     stream: true,
-    // max_input_tokens: 4000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
+    max_input_tokens: 4000,
   },
   {
     name: "llama-2-70b-chat",
     provider: "devchat",
     stream: true,
-    // max_input_tokens: 4000,
-    // temperature: 0.3,
-    // max_tokens: 2048,
+    max_input_tokens: 4000,
   },
 ];
 
diff --git a/src/views/i18n/zh.json b/src/views/i18n/zh.json
@@ -24,5 +24,9 @@
   "note-explain": "使用这个工作流程，您可以生成专业的、格式化的发布说明(markdown格式)。我只需要关于本次发布的提交的一些基本信息。通过点击“+”按钮并选择 git_log_releasenote 将这些信息添加到上下文中。如果提交的范围与默认命令不同，您还可以选择 <custom command> 并输入如 git log 579398b^..HEAD --pretty=format:\"%h - %B\" 的命令行来包含从提交 579398b(包括此提交)到最新提交的所有变更。",
   "Explain /code": "解释 /code",
   "code-explain": "使用 DevChat 工作流程来请求编写代码。请输入您的具体需求，并提供适当的实施上下文。您可以选择相关的代码或文件，然后右键点击“添加到 DevChat”。如果您发现上下文仍然不足以解释清楚，您可以通过提供所选代码的类/函数定义来增强我对您代码的理解。要做到这一点，请点击所选代码旁边的“+”按钮，然后选择“符号定义”。请注意，这些信息显示在 DevChat 中可能需要几秒钟时间。",
-  "Config": "配置"
+  "Config": "配置",
+  "Singapore Node": "新加坡区节点",
+  "China Node": "中国区节点",
+  "Custom": "自定义",
+  "Custom API Base of Devchat": "自定义 DevChat API 地址"
 }
diff --git a/src/views/pages/Config.tsx b/src/views/pages/Config.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, forwardRef } from "react";
 import {
   Title,
   Box,
@@ -67,6 +67,22 @@ const Config = function () {
   const { config } = useMst();
   const router = useRouter();
   const { i18n, t } = useTranslation();
+
+  const apiSelection = [
+    {
+      value: "https://api.devchat.ai/v1",
+      label: t("Singapore Node"),
+    },
+    {
+      value: "https://api.devchat-ai.cn/v1",
+      label: t("China Node"),
+    },
+    {
+      value: "custom",
+      label: t("Custom"),
+    },
+  ];
+
   const form = useForm({
     initialValues: {
       providers: {},
@@ -80,6 +96,10 @@ const Config = function () {
           //   value.length > 0 ? null : "Please enter access key",
           api_base: (value) =>
             value.length > 0 ? null : "Please enter api base",
+          cumstom_api_base: (value, values) =>
+            values.providers.devchat.api_base === "custom" && value.length > 0
+              ? null
+              : "Please enter custom api base",
         },
       },
     },
@@ -107,6 +127,16 @@ const Config = function () {
   useEffect(() => {
     if (router.currentRoute !== "config") return;
     const cloneConfig = cloneDeep(config.config);
+    if (
+      cloneConfig?.providers?.devchat?.api_base !== apiSelection[0].value ||
+      cloneConfig?.providers?.devchat?.api_base !== apiSelection[1].value
+    ) {
+      cloneConfig.providers.devchat.api_base = "custom";
+    }
+    console.log(
+      "cloneConfig.providers.devchat.api_base: ",
+      cloneConfig.providers.devchat.api_base
+    );
     form.setValues(cloneConfig);
     if (config.settle && loading) {
       setTimeout(() => {
@@ -119,9 +149,15 @@ const Config = function () {
   const onSave = (values) => {
     config.updateSettle(false);
     startLoading();
+    const writeConfig = cloneDeep(self.config);
+    if (writeConfig.providers.devchat.cumstom_api_base) {
+      writeConfig.providers.devchat.api_base =
+        writeConfig.providers.devchat.cumstom_api_base;
+      delete writeConfig.providers.devchat.cumstom_api_base;
+    }
     MessageUtil.sendMessage({
       command: "writeConfig",
-      value: values,
+      value: writeConfig,
       key: "",
     });
     MessageUtil.sendMessage({ command: "readConfig", key: "" });
@@ -219,14 +255,26 @@ const Config = function () {
               }}
             >
               <Stack>
-                <TextInput
+                <Select
+                  data={apiSelection}
                   styles={commonInputStyle}
                   placeholder="https://xxxx.xx"
                   label={t("API Base of Devchat")}
                   withAsterisk
                   description={t("the base URL for the API")}
                   {...form.getInputProps("providers.devchat.api_base")}
                 />
+                {form.values.providers.devchat.api_base === "custom" && (
+                  <TextInput
+                    styles={commonInputStyle}
+                    label={t("Custom API Base of Devchat")}
+                    withAsterisk
+                    description={t("the base URL for the API")}
+                    {...form.getInputProps(
+                      "providers.devchat.cumstom_api_base"
+                    )}
+                  />
+                )}
 
                 <PasswordInput
                   styles={commonInputStyle}
diff --git a/src/views/stores/ConfigStore.ts b/src/views/stores/ConfigStore.ts
@@ -1,6 +1,12 @@
 import MessageUtil from "@/util/MessageUtil";
 import { types, Instance } from "mobx-state-tree";
 import modelsTemplate from "@/models";
+import cloneDeep from "lodash.clonedeep";
+
+const defaultAPIBase = [
+  "https://api.devchat.ai",
+  "https://api.devchat-ai.cn/v1",
+];
 
 export const ConfigStore = types
   .model("Config", {
@@ -72,8 +78,20 @@ export const ConfigStore = types
           api_base: "",
         };
       }
-      self.config = newConfig;
+      if (!newConfig.providers?.devchat) {
+        newConfig.providers.devchat = {
+          api_key: "",
+          api_base: "",
+        };
+      }
+      if (!defaultAPIBase.includes(newConfig.providers.devchat.api_base)) {
+        newConfig.providers.devchat.cumstom_api_base =
+          newConfig.providers.devchat.api_base;
+        newConfig.providers.devchat.api_base = "custom";
+      }
       console.log("newConfig: ", newConfig);
+
+      self.config = newConfig;
       self.settle = true;
       self.defaultModel = newConfig.default_model;
     },
@@ -87,12 +105,20 @@ export const ConfigStore = types
       if (key === "default_model") {
         self.defaultModel = value;
       }
-      const newConfig = { ...self.config };
-      newConfig[key] = value;
-      self.config = newConfig;
+      const cloneConfig = cloneDeep(self.config);
+      cloneConfig[key] = value;
+      self.config = cloneConfig;
+
+      const writeConfig = cloneDeep(self.config);
+      if (writeConfig.providers.devchat.cumstom_api_base) {
+        writeConfig.providers.devchat.api_base =
+          writeConfig.providers.devchat.cumstom_api_base;
+        delete writeConfig.providers.devchat.cumstom_api_base;
+      }
+
       MessageUtil.sendMessage({
         command: "writeConfig",
-        value: newConfig,
+        value: writeConfig,
         key: "",
       });
     },
