fixup

app/api/chat-stream/route.ts

@@ -59,4 +59,4 @@ export async function POST(req: NextRequest) {
   }
 }
 
-export const runtime = "experimental-edge";
+export const runtime = "edge";

app/api/config/route.ts

@@ -19,3 +19,5 @@ export async function POST(req: NextRequest) {
     needCode: serverConfig.needCode,
   });
 }
+
+export const runtime = "edge";

app/api/openai/route.ts

@@ -17,7 +17,7 @@ async function makeRequest(req: NextRequest) {
       },
       {
         status: 500,
-      }
+      },
     );
   }
 }
@@ -30,4 +30,4 @@ export async function GET(req: NextRequest) {
   return makeRequest(req);
 }
 
-export const runtime = "experimental-edge";
+export const runtime = "edge";

app/components/chat.tsx

@@ -29,7 +29,6 @@ import {
   createMessage,
   useAccessStore,
   Theme,
-  ModelType,
   useAppConfig,
   ModelConfig,
   DEFAULT_TOPIC,
@@ -57,7 +56,8 @@ import { Input, List, ListItem, Modal, Popover, showModal } from "./ui-lib";
 import { useNavigate } from "react-router-dom";
 import { Path } from "../constant";
 import { ModelConfigList } from "./model-config";
-import { AvatarPicker } from "./emoji";
+import { Avatar, AvatarPicker } from "./emoji";
+
 const Markdown = dynamic(
   async () => memo((await import("./markdown")).Markdown),
   {
@@ -65,10 +65,6 @@ const Markdown = dynamic(
   },
 );
 
-const Avatar = dynamic(async () => (await import("./emoji")).Avatar, {
-  loading: () => <LoadingIcon />,
-});
-
 function exportMessages(messages: Message[], topic: string) {
   const mdText =
     `# ${topic}\n\n` +
@@ -112,8 +108,6 @@ function ContextPrompts() {
   const session = chatStore.currentSession();
   const context = session.context;
 
-  const [showPicker, setShowPicker] = useState(false);
-
   const addContextPrompt = (prompt: Message) => {
     chatStore.updateCurrentSession((session) => {
       session.context.push(prompt);
@@ -190,6 +184,48 @@ function ContextPrompts() {
           />
         </div>
       </div>
+    </>
+  );
+}
+
+export function SessionConfigModel(props: { onClose: () => void }) {
+  const chatStore = useChatStore();
+  const session = chatStore.currentSession();
+
+  const [showPicker, setShowPicker] = useState(false);
+
+  const updateConfig = (updater: (config: ModelConfig) => void) => {
+    const config = { ...session.modelConfig };
+    updater(config);
+    chatStore.updateCurrentSession((session) => (session.modelConfig = config));
+  };
+
+  return (
+    <div className="modal-mask">
+      <Modal
+        title={Locale.Context.Edit}
+        onClose={() => props.onClose()}
+        actions={[
+          <IconButton
+            key="reset"
+            icon={<CopyIcon />}
+            bordered
+            text="重置预设"
+            onClick={() =>
+              confirm(Locale.Memory.ResetConfirm) && chatStore.resetSession()
+            }
+          />,
+          <IconButton
+            key="copy"
+            icon={<CopyIcon />}
+            bordered
+            text="保存预设"
+            onClick={() => copyToClipboard(session.memoryPrompt)}
+          />,
+        ]}
+      >
+        <ContextPrompts />
+
         <List>
           <ListItem title={"角色头像"}>
             <Popover
@@ -225,58 +261,24 @@ function ContextPrompts() {
               }
             ></input>
           </ListItem>
+        </List>
+
+        <List>
+          <ModelConfigList
+            modelConfig={session.modelConfig}
+            updateConfig={updateConfig}
+          />
+
+          {session.modelConfig.sendMemory ? (
             <ListItem
               title={`${Locale.Memory.Title} (${session.lastSummarizeIndex} of 
           ${session.messages.length})`}
               subTitle={session.memoryPrompt || Locale.Memory.EmptyContent}
             ></ListItem>
+          ) : (
+            <></>
+          )}
         </List>
-    </>
-  );
-}
-
-export function SessionConfigModel(props: { onClose: () => void }) {
-  const chatStore = useChatStore();
-  const config = useAppConfig();
-  const session = chatStore.currentSession();
-  const context = session.context;
-
-  const updateConfig = (updater: (config: ModelConfig) => void) => {
-    const config = { ...session.modelConfig };
-    updater(config);
-    chatStore.updateCurrentSession((session) => (session.modelConfig = config));
-  };
-
-  return (
-    <div className="modal-mask">
-      <Modal
-        title={Locale.Context.Edit}
-        onClose={() => props.onClose()}
-        actions={[
-          <IconButton
-            key="reset"
-            icon={<CopyIcon />}
-            bordered
-            text="重置预设"
-            onClick={() =>
-              confirm(Locale.Memory.ResetConfirm) && chatStore.resetSession()
-            }
-          />,
-          <IconButton
-            key="copy"
-            icon={<CopyIcon />}
-            bordered
-            text="保存预设"
-            onClick={() => copyToClipboard(session.memoryPrompt)}
-          />,
-        ]}
-      >
-        <ContextPrompts />
-
-        <ModelConfigList
-          modelConfig={session.modelConfig}
-          updateConfig={updateConfig}
-        />
       </Modal>
     </div>
   );

app/components/model-config.tsx

@@ -10,7 +10,7 @@ export function ModelConfigList(props: {
   updateConfig: (updater: (config: ModelConfig) => void) => void;
 }) {
   return (
-    <List>
+    <>
       <ListItem title={Locale.Settings.Model}>
         <select
           value={props.modelConfig.model}
@@ -136,6 +136,6 @@ export function ModelConfigList(props: {
           }
         ></input>
       </ListItem>
-    </List>
+    </>
   );
 }

app/components/settings.tsx

@@ -486,6 +486,7 @@ export function Settings() {
           </ListItem>
         </List>
 
+        <List>
           <ModelConfigList
             modelConfig={config.modelConfig}
             updateConfig={(upater) => {
@@ -494,6 +495,7 @@ export function Settings() {
               config.update((config) => (config.modelConfig = modelConfig));
             }}
           />
+        </List>
 
         {shouldShowPromptModal && (
           <UserPromptModal onClose={() => setShowPromptModal(false)} />

app/store/chat.ts

@@ -11,7 +11,7 @@ import { isMobileScreen, trimTopic } from "../utils";
 
 import Locale from "../locales";
 import { showToast } from "../components/ui-lib";
-import { ModelConfig, ModelType, useAppConfig } from "./config";
+import { DEFAULT_CONFIG, ModelConfig, ModelType, useAppConfig } from "./config";
 
 export type Message = ChatCompletionResponseMessage & {
   date: string;
@@ -326,7 +326,7 @@ export const useChatStore = create<ChatStore>()(
 
         // long term memory
         if (
-          session.sendMemory &&
+          session.modelConfig.sendMemory &&
           session.memoryPrompt &&
           session.memoryPrompt.length > 0
         ) {
@@ -432,7 +432,7 @@ export const useChatStore = create<ChatStore>()(
         if (
           historyMsgLength >
             config.modelConfig.compressMessageLengthThreshold &&
-          session.sendMemory
+          session.modelConfig.sendMemory
         ) {
           requestChatStream(
             toBeSummarizedMsgs.concat({
@@ -481,7 +481,7 @@ export const useChatStore = create<ChatStore>()(
     }),
     {
       name: LOCAL_KEY,
-      version: 1.2,
+      version: 2,
       migrate(persistedState, version) {
         const state = persistedState as ChatStore;
 
@@ -489,8 +489,10 @@ export const useChatStore = create<ChatStore>()(
           state.sessions.forEach((s) => (s.context = []));
         }
 
-        if (version < 1.2) {
+        if (version < 2) {
-          state.sessions.forEach((s) => (s.sendMemory = true));
+          state.sessions.forEach(
+            (s) => (s.modelConfig = { ...DEFAULT_CONFIG.modelConfig }),
+          );
         }
 
         return state;

app/store/config.ts

@@ -15,7 +15,7 @@ export enum Theme {
   Light = "light",
 }
 
-const DEFAULT_CONFIG = {
+export const DEFAULT_CONFIG = {
   sendBotMessages: true as boolean,
   submitKey: SubmitKey.CtrlEnter as SubmitKey,
   avatar: "1f603",