fix max_completions_tokens

优化访问码输入框

.github/workflows/docker.yml

@@ -19,26 +19,26 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
-      -
+      
+      - 
         name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ secrets.DOCKER_USERNAME }}/chatgpt-next-web
+          images: yidadaa/chatgpt-next-web
           tags: |
             type=raw,value=latest
             type=ref,event=tag
-
-      -
+      
+      - 
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
-      -
+      - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
-      -
+      
+      - 
         name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
@@ -49,4 +49,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
+            

app/client/platforms/openai.ts

@@ -63,7 +63,7 @@ export interface RequestPayload {
   presence_penalty: number;
   frequency_penalty: number;
   top_p: number;
-  max_tokens?: number;
+  max_completions_tokens?: number;
 }
 
 export interface DalleRequestPayload {
@@ -228,13 +228,16 @@ export class ChatGPTApi implements LLMApi {
         presence_penalty: !isO1 ? modelConfig.presence_penalty : 0,
         frequency_penalty: !isO1 ? modelConfig.frequency_penalty : 0,
         top_p: !isO1 ? modelConfig.top_p : 1,
-        // max_tokens: Math.max(modelConfig.max_tokens, 1024),
-        // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
+        // max_completions_tokens: Math.max(modelConfig.max_completions_tokens, 1024),
+        // Please do not ask me why not send max_completions_tokens, no reason, this param is just shit, I dont want to explain anymore.
       };
 
-      // add max_tokens to vision model
+      // add max_completions_tokens to vision model
       if (visionModel) {
-        requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
+        requestPayload["max_completions_tokens"] = Math.max(
+          modelConfig.max_completions_tokens,
+          4000,
+        );
       }
     }
 

app/command.ts

@@ -35,7 +35,6 @@ export function useCommand(commands: Commands = {}) {
 interface ChatCommands {
   new?: Command;
   newm?: Command;
-  copy?: Command;
   next?: Command;
   prev?: Command;
   clear?: Command;

app/components/auth.tsx

@@ -11,6 +11,7 @@ import Logo from "../icons/logo.svg";
 import { useMobileScreen } from "@/app/utils";
 import BotIcon from "../icons/bot.svg";
 import { getClientConfig } from "../config/client";
+import { PasswordInput } from "./ui-lib";
 import LeftIcon from "@/app/icons/left.svg";
 import { safeLocalStorage } from "@/app/utils";
 import {
@@ -60,36 +61,43 @@ export function AuthPage() {
       <div className={styles["auth-title"]}>{Locale.Auth.Title}</div>
       <div className={styles["auth-tips"]}>{Locale.Auth.Tips}</div>
 
-      <input
-        className={styles["auth-input"]}
-        type="password"
-        placeholder={Locale.Auth.Input}
+      <PasswordInput
+        style={{ marginTop: "3vh", marginBottom: "3vh" }}
+        aria={Locale.Settings.ShowPassword}
+        aria-label={Locale.Auth.Input}
         value={accessStore.accessCode}
+        type="text"
+        placeholder={Locale.Auth.Input}
         onChange={(e) => {
           accessStore.update(
             (access) => (access.accessCode = e.currentTarget.value),
           );
         }}
       />
+
       {!accessStore.hideUserApiKey ? (
         <>
           <div className={styles["auth-tips"]}>{Locale.Auth.SubTips}</div>
-          <input
-            className={styles["auth-input"]}
-            type="password"
-            placeholder={Locale.Settings.Access.OpenAI.ApiKey.Placeholder}
+          <PasswordInput
+            style={{ marginTop: "3vh", marginBottom: "3vh" }}
+            aria={Locale.Settings.ShowPassword}
+            aria-label={Locale.Settings.Access.OpenAI.ApiKey.Placeholder}
             value={accessStore.openaiApiKey}
+            type="text"
+            placeholder={Locale.Settings.Access.OpenAI.ApiKey.Placeholder}
             onChange={(e) => {
               accessStore.update(
                 (access) => (access.openaiApiKey = e.currentTarget.value),
               );
             }}
           />
-          <input
-            className={styles["auth-input-second"]}
-            type="password"
-            placeholder={Locale.Settings.Access.Google.ApiKey.Placeholder}
+          <PasswordInput
+            style={{ marginTop: "3vh", marginBottom: "3vh" }}
+            aria={Locale.Settings.ShowPassword}
+            aria-label={Locale.Settings.Access.Google.ApiKey.Placeholder}
             value={accessStore.googleApiKey}
+            type="text"
+            placeholder={Locale.Settings.Access.Google.ApiKey.Placeholder}
             onChange={(e) => {
               accessStore.update(
                 (access) => (access.googleApiKey = e.currentTarget.value),

app/components/chat.tsx

@@ -70,7 +70,6 @@ import {
   getMessageImages,
   isVisionModel,
   isDalle3,
-  removeOutdatedEntries,
   showPlugins,
   safeLocalStorage,
 } from "../utils";
@@ -985,7 +984,6 @@ function _Chat() {
   const chatCommands = useChatCommand({
     new: () => chatStore.newSession(),
     newm: () => navigate(Path.NewChat),
-    copy: () => chatStore.copySession(),
     prev: () => chatStore.nextSession(-1),
     next: () => chatStore.nextSession(1),
     clear: () =>
@@ -1117,20 +1115,10 @@ function _Chat() {
   };
 
   const deleteMessage = (msgId?: string) => {
-    chatStore.updateCurrentSession((session) => {
-      session.deletedMessageIds &&
-        removeOutdatedEntries(session.deletedMessageIds);
-      session.messages = session.messages.filter((m) => {
-        if (m.id !== msgId) {
-          return true;
-        }
-        if (!session.deletedMessageIds) {
-          session.deletedMessageIds = {} as Record<string, number>;
-        }
-        session.deletedMessageIds[m.id] = Date.now();
-        return false;
-      });
-    });
+    chatStore.updateCurrentSession(
+      (session) =>
+        (session.messages = session.messages.filter((m) => m.id !== msgId)),
+    );
   };
 
   const onDelete = (msgId: string) => {

app/components/settings.tsx

@@ -360,21 +360,6 @@ function SyncConfigModal(props: { onClose?: () => void }) {
             </select>
           </ListItem>
 
-          <ListItem
-            title={Locale.Settings.Sync.Config.EnableAutoSync.Title}
-            subTitle={Locale.Settings.Sync.Config.EnableAutoSync.SubTitle}
-          >
-            <input
-              type="checkbox"
-              checked={syncStore.enableAutoSync}
-              onChange={(e) => {
-                syncStore.update(
-                  (config) => (config.enableAutoSync = e.currentTarget.checked),
-                );
-              }}
-            ></input>
-          </ListItem>
-
           <ListItem
             title={Locale.Settings.Sync.Config.Proxy.Title}
             subTitle={Locale.Settings.Sync.Config.Proxy.SubTitle}

app/locales/cn.ts

@@ -62,7 +62,6 @@ const cn = {
     Commands: {
       new: "新建聊天",
       newm: "从面具新建聊天",
-      copy: "复制当前聊天",
       next: "下一个聊天",
       prev: "上一个聊天",
       clear: "清除上下文",
@@ -233,10 +232,6 @@ const cn = {
           Title: "同步类型",
           SubTitle: "选择喜爱的同步服务器",
         },
-        EnableAutoSync: {
-          Title: "自动同步设置",
-          SubTitle: "在回复完成或删除消息后自动同步数据",
-        },
         Proxy: {
           Title: "启用代理",
           SubTitle: "在浏览器中同步时，必须启用代理以避免跨域限制",

app/locales/en.ts

@@ -63,7 +63,6 @@ const en: LocaleType = {
     Commands: {
       new: "Start a new chat",
       newm: "Start a new chat with mask",
-      copy: "Copy the current Chat",
       next: "Next Chat",
       prev: "Previous Chat",
       clear: "Clear Context",
@@ -235,11 +234,6 @@ const en: LocaleType = {
           Title: "Sync Type",
           SubTitle: "Choose your favorite sync service",
         },
-        EnableAutoSync: {
-          Title: "Auto Sync Settings",
-          SubTitle:
-            "Automatically synchronize data after replying or deleting messages",
-        },
         Proxy: {
           Title: "Enable CORS Proxy",
           SubTitle: "Enable a proxy to avoid cross-origin restrictions",

app/store/access.ts

@@ -211,7 +211,7 @@ export const useAccessStore = createPersistStore(
         })
         .then((res: DangerConfig) => {
           console.log("[Config] got config from server", res);
-          set(() => ({ lastUpdateTime: Date.now(), ...res }));
+          set(() => ({ ...res }));
         })
         .catch(() => {
           console.error("[Config] failed to fetch config");

app/store/chat.ts

@@ -1,8 +1,4 @@
-import {
-  getMessageTextContent,
-  trimTopic,
-  removeOutdatedEntries,
-} from "../utils";
+import { getMessageTextContent, trimTopic } from "../utils";
 
 import { indexedDBStorage } from "@/app/utils/indexedDB-storage";
 import { nanoid } from "nanoid";
@@ -33,7 +29,6 @@ import { ModelConfig, ModelType, useAppConfig } from "./config";
 import { useAccessStore } from "./access";
 import { collectModelsWithDefaultModel } from "../utils/model";
 import { createEmptyMask, Mask } from "./mask";
-import { useSyncStore } from "./sync";
 
 const localStorage = safeLocalStorage();
 
@@ -85,7 +80,6 @@ export interface ChatSession {
   lastUpdate: number;
   lastSummarizeIndex: number;
   clearContextIndex?: number;
-  deletedMessageIds?: Record<string, number>;
 
   mask: Mask;
 }
@@ -109,7 +103,6 @@ function createEmptySession(): ChatSession {
     },
     lastUpdate: Date.now(),
     lastSummarizeIndex: 0,
-    deletedMessageIds: {},
 
     mask: createEmptyMask(),
   };
@@ -195,19 +188,9 @@ function fillTemplateWith(input: string, modelConfig: ModelConfig) {
   return output;
 }
 
-let cloudSyncTimer: any = null;
-function noticeCloudSync(): void {
-  const syncStore = useSyncStore.getState();
-  cloudSyncTimer && clearTimeout(cloudSyncTimer);
-  cloudSyncTimer = setTimeout(() => {
-    syncStore.autoSync();
-  }, 500);
-}
-
 const DEFAULT_CHAT_STATE = {
   sessions: [createEmptySession()],
   currentSessionIndex: 0,
-  deletedSessionIds: {} as Record<string, number>,
   lastInput: "",
 };
 
@@ -257,28 +240,6 @@ export const useChatStore = createPersistStore(
         });
       },
 
-      copySession() {
-        set((state) => {
-          const { sessions, currentSessionIndex } = state;
-          const emptySession = createEmptySession();
-
-          // copy the session
-          const curSession = JSON.parse(
-            JSON.stringify(sessions[currentSessionIndex]),
-          );
-          curSession.id = emptySession.id;
-          curSession.lastUpdate = emptySession.lastUpdate;
-
-          const newSessions = [...sessions];
-          newSessions.splice(0, 0, curSession);
-
-          return {
-            currentSessionIndex: 0,
-            sessions: newSessions,
-          };
-        });
-      },
-
       moveSession(from: number, to: number) {
         set((state) => {
           const { sessions, currentSessionIndex: oldIndex } = state;
@@ -341,18 +302,7 @@ export const useChatStore = createPersistStore(
         if (!deletedSession) return;
 
         const sessions = get().sessions.slice();
-        const deletedSessionIds = { ...get().deletedSessionIds };
-
-        removeOutdatedEntries(deletedSessionIds);
-
-        const hasDelSessions = sessions.splice(index, 1);
-        if (hasDelSessions?.length) {
-          hasDelSessions.forEach((session) => {
-            if (session.messages.length > 0) {
-              deletedSessionIds[session.id] = Date.now();
-            }
-          });
-        }
+        sessions.splice(index, 1);
 
         const currentIndex = get().currentSessionIndex;
         let nextIndex = Math.min(
@@ -369,24 +319,19 @@ export const useChatStore = createPersistStore(
         const restoreState = {
           currentSessionIndex: get().currentSessionIndex,
           sessions: get().sessions.slice(),
-          deletedSessionIds: get().deletedSessionIds,
         };
 
         set(() => ({
           currentSessionIndex: nextIndex,
           sessions,
-          deletedSessionIds,
         }));
 
-        noticeCloudSync();
-
         showToast(
           Locale.Home.DeleteToast,
           {
             text: Locale.Home.Revert,
             onClick() {
               set(() => restoreState);
-              noticeCloudSync();
             },
           },
           5000,
@@ -407,24 +352,6 @@ export const useChatStore = createPersistStore(
         return session;
       },
 
-      sortSessions() {
-        const currentSession = get().currentSession();
-        const sessions = get().sessions.slice();
-
-        sessions.sort(
-          (a, b) =>
-            new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
-        );
-        const currentSessionIndex = sessions.findIndex((session) => {
-          return session && currentSession && session.id === currentSession.id;
-        });
-
-        set((state) => ({
-          currentSessionIndex,
-          sessions,
-        }));
-      },
-
       onNewMessage(message: ChatMessage) {
         get().updateCurrentSession((session) => {
           session.messages = session.messages.concat();
@@ -432,8 +359,6 @@ export const useChatStore = createPersistStore(
         });
         get().updateStat(message);
         get().summarizeSession();
-        get().sortSessions();
-        noticeCloudSync();
       },
 
       async onUserInput(content: string, attachImages?: string[]) {

app/store/config.ts

@@ -65,7 +65,7 @@ export const DEFAULT_CONFIG = {
     providerName: "OpenAI" as ServiceProvider,
     temperature: 0.5,
     top_p: 1,
-    max_tokens: 4000,
+    max_completions_tokens: 4000,
     presence_penalty: 0,
     frequency_penalty: 0,
     sendMemory: true,
@@ -127,7 +127,7 @@ export const ModalConfigValidator = {
   model(x: string) {
     return x as ModelType;
   },
-  max_tokens(x: number) {
+  max_completions_tokens(x: number) {
     return limitNumber(x, 0, 512000, 1024);
   },
   presence_penalty(x: number) {

app/store/sync.ts

@@ -24,7 +24,6 @@ export type SyncStore = GetStoreState<typeof useSyncStore>;
 
 const DEFAULT_SYNC_STATE = {
   provider: ProviderType.WebDAV,
-  enableAutoSync: true,
   useProxy: true,
   proxyUrl: ApiPath.Cors as string,
 
@@ -44,8 +43,6 @@ const DEFAULT_SYNC_STATE = {
   lastProvider: "",
 };
 
-let lastSyncTime = 0;
-
 export const useSyncStore = createPersistStore(
   DEFAULT_SYNC_STATE,
   (set, get) => ({
@@ -92,16 +89,6 @@ export const useSyncStore = createPersistStore(
     },
 
     async sync() {
-      if (lastSyncTime && lastSyncTime >= Date.now() - 800) {
-        return;
-      }
-      lastSyncTime = Date.now();
-
-      const enableAutoSync = get().enableAutoSync;
-      if (!enableAutoSync) {
-        return;
-      }
-
       const localState = getLocalAppState();
       const provider = get().provider;
       const config = get()[provider];
@@ -116,7 +103,9 @@ export const useSyncStore = createPersistStore(
           );
           return;
         } else {
-          const parsedRemoteState = JSON.parse(remoteState) as AppState;
+          const parsedRemoteState = JSON.parse(
+            await client.get(config.username),
+          ) as AppState;
           mergeAppState(localState, parsedRemoteState);
           setLocalAppState(localState);
         }
@@ -134,14 +123,6 @@ export const useSyncStore = createPersistStore(
       const client = this.getClient();
       return await client.check();
     },
-
-    async autoSync() {
-      const { lastSyncTime, provider } = get();
-      const syncStore = useSyncStore.getState();
-      if (lastSyncTime && syncStore.cloudSync()) {
-        syncStore.sync();
-      }
-    },
   }),
   {
     name: StoreKey.Sync,

app/utils.ts

@@ -274,19 +274,6 @@ export function isDalle3(model: string) {
   return "dall-e-3" === model;
 }
 
-export function removeOutdatedEntries(
-  timeMap: Record<string, number>,
-): Record<string, number> {
-  const oneMonthAgo = Date.now() - 30 * 24 * 60 * 60 * 1000;
-  // Delete data from a month ago
-  Object.keys(timeMap).forEach((id) => {
-    if (timeMap[id] < oneMonthAgo) {
-      delete timeMap[id];
-    }
-  });
-  return timeMap;
-}
-
 export function showPlugins(provider: ServiceProvider, model: string) {
   if (
     provider == ServiceProvider.OpenAI ||

app/utils/sync.ts

@@ -8,7 +8,6 @@ import { useMaskStore } from "../store/mask";
 import { usePromptStore } from "../store/prompt";
 import { StoreKey } from "../constant";
 import { merge } from "./merge";
-import { removeOutdatedEntries } from "@/app/utils";
 
 type NonFunctionKeys<T> = {
   [K in keyof T]: T[K] extends (...args: any[]) => any ? never : K;
@@ -66,10 +65,7 @@ type StateMerger = {
 const MergeStates: StateMerger = {
   [StoreKey.Chat]: (localState, remoteState) => {
     // merge sessions
-    const currentSession = useChatStore.getState().currentSession();
-
     const localSessions: Record<string, ChatSession> = {};
-    const localDeletedSessionIds = localState.deletedSessionIds || {};
     localState.sessions.forEach((s) => (localSessions[s.id] = s));
 
     remoteState.sessions.forEach((remoteSession) => {
@@ -79,98 +75,29 @@ const MergeStates: StateMerger = {
       const localSession = localSessions[remoteSession.id];
       if (!localSession) {
         // if remote session is new, just merge it
-        if (
-          (localDeletedSessionIds[remoteSession.id] || -1) <
-          remoteSession.lastUpdate
-        ) {
-          localState.sessions.push(remoteSession);
-        }
+        localState.sessions.push(remoteSession);
       } else {
         // if both have the same session id, merge the messages
         const localMessageIds = new Set(localSession.messages.map((v) => v.id));
-        const localDeletedMessageIds = localSession.deletedMessageIds || {};
         remoteSession.messages.forEach((m) => {
           if (!localMessageIds.has(m.id)) {
-            if (
-              !localDeletedMessageIds[m.id] ||
-              new Date(localDeletedMessageIds[m.id]).toLocaleString() < m.date
-            ) {
-              localSession.messages.push(m);
-            }
+            localSession.messages.push(m);
           }
         });
 
-        const remoteDeletedMessageIds = remoteSession.deletedMessageIds || {};
-        localSession.messages = localSession.messages.filter((localMessage) => {
-          return (
-            !remoteDeletedMessageIds[localMessage.id] ||
-            new Date(localDeletedMessageIds[localMessage.id]).toLocaleString() <
-              localMessage.date
-          );
-        });
-
         // sort local messages with date field in asc order
         localSession.messages.sort(
           (a, b) => new Date(a.date).getTime() - new Date(b.date).getTime(),
         );
-        localSession.lastUpdate = Math.max(
-          remoteSession.lastUpdate,
-          localSession.lastUpdate,
-        );
-
-        const deletedMessageIds = {
-          ...remoteDeletedMessageIds,
-          ...localDeletedMessageIds,
-        };
-        removeOutdatedEntries(deletedMessageIds);
-        localSession.deletedMessageIds = deletedMessageIds;
       }
     });
 
-    const remoteDeletedSessionIds = remoteState.deletedSessionIds || {};
-
-    const finalIds: Record<string, any> = {};
-    localState.sessions = localState.sessions.filter((localSession) => {
-      // 去除掉重复的会话
-      if (finalIds[localSession.id]) {
-        return false;
-      }
-      finalIds[localSession.id] = true;
-
-      // 去除掉非首个空会话，避免多个空会话在中间，不方便管理
-      if (
-        localSession.messages.length === 0 &&
-        localSession != localState.sessions[0]
-      ) {
-        return false;
-      }
-
-      // 去除云端删除并且删除时间小于本地修改时间的会话
-      return (
-        (remoteDeletedSessionIds[localSession.id] || -1) <=
-        localSession.lastUpdate
-      );
-    });
-
     // sort local sessions with date field in desc order
     localState.sessions.sort(
       (a, b) =>
         new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
     );
 
-    const deletedSessionIds = {
-      ...remoteDeletedSessionIds,
-      ...localDeletedSessionIds,
-    };
-    removeOutdatedEntries(deletedSessionIds);
-    localState.deletedSessionIds = deletedSessionIds;
-
-    localState.currentSessionIndex = localState.sessions.findIndex(
-      (session) => {
-        return session && currentSession && session.id === currentSession.id;
-      },
-    );
-
     return localState;
   },
   [StoreKey.Prompt]: (localState, remoteState) => {
@@ -226,9 +153,9 @@ export function mergeWithUpdate<T extends { lastUpdateTime?: number }>(
   remoteState: T,
 ) {
   const localUpdateTime = localState.lastUpdateTime ?? 0;
-  const remoteUpdateTime = remoteState.lastUpdateTime ?? 1;
+  const remoteUpdateTime = localState.lastUpdateTime ?? 1;
 
-  if (localUpdateTime >= remoteUpdateTime) {
+  if (localUpdateTime < remoteUpdateTime) {
     merge(remoteState, localState);
     return { ...remoteState };
   } else {