Update ChatStore, App, InputMessage, and Config components

Author: small-stone

src/models/index.ts

@@ -1,80 +1,91 @@
 const modelsTemplate = [
   {
     name: "gpt-3.5-turbo",
-    provider: "openai",
+    provider: "devchat",
+    stream: true,
     max_input_tokens: 13000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "gpt-4",
     provider: "openai",
+    stream: true,
     max_input_tokens: 6000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "gpt-4-turbo-preview",
-    provider: "openai",
-    max_input_tokens: 32000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    provider: "devchat",
+    stream: true,
+    // max_input_tokens: 32000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "claude-2.1",
     provider: "devchat",
-    max_input_tokens: 32000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 32000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "xinghuo-3.5",
     provider: "devchat",
-    max_input_tokens: 6000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 6000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "GLM-4",
     provider: "devchat",
-    max_input_tokens: 8000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 8000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "ERNIE-Bot-4.0",
     provider: "devchat",
-    max_input_tokens: 8000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 8000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "togetherai/codellama/CodeLlama-70b-Instruct-hf",
     provider: "devchat",
-    max_input_tokens: 4000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 4000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "togetherai/mistralai/Mixtral-8x7B-Instruct-v0.1",
     provider: "devchat",
-    max_input_tokens: 4000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 4000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "minimax/abab6-chat",
     provider: "devchat",
-    max_input_tokens: 4000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 4000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
   {
     name: "llama-2-70b-chat",
     provider: "devchat",
-    max_input_tokens: 4000,
-    temperature: 0.3,
-    max_tokens: 2048,
+    stream: true,
+    // max_input_tokens: 4000,
+    // temperature: 0.3,
+    // max_tokens: 2048,
   },
 ];
 

src/views/App.tsx

@@ -25,11 +25,9 @@ export default function App() {
   };
 
   const getConfig = () => {
-    console.log("getConfig");
-    MessageUtil.sendMessage({ command: "readConfig" });
-    MessageUtil.registerHandler("readConfig", (data: any) => {
-      console.log("readConfig: ", data);
-      config.setConfig(data);
+    MessageUtil.sendMessage({ command: "readConfig", key: "" });
+    MessageUtil.registerHandler("readConfig", (data: { value: any }) => {
+      config.setConfig(data.value);
       setReady(true);
     });
   };

src/views/components/InputMessage/index.tsx

@@ -337,6 +337,7 @@ const InputMessage = observer((props: any) => {
       },
     },
   };
+  // DC.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJvcmdfaWQiOjI1MTYwMzg1MzQ2LCJqdGkiOjczMjc0OTkzMjcwMzc1MjkyNjB9.e-KAl0QM0Ooe6NdLAV3vaJAiA4Zr_DAgqkE0cl7MKZw
 
   return (
     <Stack
@@ -367,7 +368,7 @@ const InputMessage = observer((props: any) => {
               leftIcon={<IconRobot size="1rem" />}
               styles={buttonStyles}
             >
-              {getModelShowName(chat.chatModel)}
+              {getModelShowName(config.defaultModel)}
             </Button>
           </Menu.Target>
           <Menu.Dropdown>

src/views/pages/Config.tsx

@@ -32,7 +32,7 @@ const commonInputStyle = {
   input: {
     fontSize: "var(--vscode-editor-font-size)",
     backgroundColor: "var(--vscode-sideBar-background)",
-    borderColor: "var(--vscode-input-border)",
+    borderColor: "var(--vscode-editor-foreground)",
     color: "var(--vscode-editor-foreground)",
     "&[data-disabled]": {
       color: "var(--vscode-disabledForeground)",
@@ -90,7 +90,6 @@ const Config = function () {
   useEffect(() => {
     MessageUtil.registerHandler("updateSetting", (data) => {
       // 保存后的回调
-
       MessageUtil.sendMessage({ command: "readConfig" });
     });
     if (router.currentRoute !== "config") return;
@@ -106,6 +105,7 @@ const Config = function () {
 
   useEffect(() => {
     if (router.currentRoute !== "config") return;
+    form.setValues(config.config);
     if (config.settle && loading) {
       setTimeout(() => {
         router.updateRoute("chat");
@@ -115,11 +115,18 @@ const Config = function () {
   }, [config.settle]);
 
   const onSave = (values) => {
-    if (!isEqual(values, config.config)) {
-      config.updateSettle(false);
-      startLoading();
-      MessageUtil.sendMessage({ command: "saveConfig", data: values });
-    }
+    config.updateSettle(false);
+    startLoading();
+    MessageUtil.sendMessage({
+      command: "writeConfig",
+      value: values,
+      key: "",
+    });
+    config.setConfig(values);
+    setTimeout(() => {
+      router.updateRoute("chat");
+      closeLoading();
+    }, 1000);
   };
 
   const changeModelDetail = (key: string, value: number | string) => {
@@ -345,7 +352,7 @@ const Config = function () {
             label="Python for commands"
             placeholder="/xxx/xxx"
             description="Please enter the path of your python"
-            {...form.getInputProps("python_for_command")}
+            {...form.getInputProps("python_for_commands")}
           />
         </Stack>
         <Group

src/views/stores/ChatStore.ts

@@ -94,7 +94,6 @@ export const ChatStore = types
     isBottom: true,
     isTop: false,
     scrollBottom: 0,
-    chatModel: "GPT-3.5",
     chatPanelWidth: 300,
     disabled: false,
     rechargeSite: "https://web.devchat.ai/pricing/",

src/views/stores/ConfigStore.ts

@@ -6,13 +6,14 @@ export const ConfigStore = types
   .model("Config", {
     config: types.optional(types.frozen(), {}),
     settle: types.optional(types.boolean, false),
+    defaultModel: types.optional(types.string, ""),
   })
   .actions((self) => ({
     updateSettle: (value: boolean) => {
       self.settle = value;
     },
     getDefaultModel: () => {
-      return self.config?.default_model;
+      return self.defaultModel;
     },
     getLanguage: () => {
       return self.config?.language;
@@ -39,26 +40,40 @@ export const ConfigStore = types
     setConfig: (data) => {
       self.settle = false;
       const newConfig = { ...data };
+      if (!data.models) {
+        newConfig.models = {};
+      }
       modelsTemplate.forEach((item) => {
+        const currentModel: any = {
+          ...item,
+        };
+        delete currentModel.name;
         if (!newConfig.models[item.name]) {
-          newConfig[item.name] = {
-            ...item,
+          newConfig.models[item.name] = {
+            ...currentModel,
           };
         } else {
+          console.log(
+            "newConfig.models[item.name]: ",
+            newConfig.models[item.name]
+          );
           newConfig.models[item.name] = {
-            ...item,
-            ...newConfig[item.name],
+            ...currentModel,
+            ...newConfig.models[item.name],
           };
         }
       });
+
       if (!newConfig.providers?.openai) {
         newConfig.providers.openai = {
           api_key: "",
           api_base: "",
         };
       }
       self.config = newConfig;
+      console.log("newConfig: ", newConfig);
       self.settle = true;
+      self.defaultModel = newConfig.default_model;
     },
     getModelList: () => {
       const modelsArray = modelsTemplate.map((item) => {
@@ -67,8 +82,17 @@ export const ConfigStore = types
       return modelsArray;
     },
     setConfigValue: (key: string, value: any) => {
-      self.config[key] = value;
-      MessageUtil.sendMessage({});
+      if (key === "default_model") {
+        self.defaultModel = value;
+      }
+      const newConfig = { ...self.config };
+      newConfig[key] = value;
+      self.config = newConfig;
+      MessageUtil.sendMessage({
+        command: "writeConfig",
+        value: newConfig,
+        key: "",
+      });
     },
   }));