update version

Merge pull request #5418 from ConnectAI-E/hotfix/artifact
fixed: html codeblock include 2 newline
2025-11-17 14:33:41 +08:00 · 2024-09-13 17:36:32 +08:00 · 2024-09-13 17:32:21 +08:00 · 2024-09-13 17:31:22 +08:00 · 2024-09-13 16:56:06 +08:00 · 2024-09-13 16:27:02 +08:00
14 changed files with 144 additions and 46 deletions
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -160,6 +160,7 @@ export class ChatGPTApi implements LLMApi {
    let requestPayload: RequestPayload | DalleRequestPayload;

    const isDalle3 = _isDalle3(options.config.model);
+    const isO1 = options.config.model.startsWith("o1");
    if (isDalle3) {
      const prompt = getMessageTextContent(
        options.messages.slice(-1)?.pop() as any,
@@ -181,30 +182,32 @@ export class ChatGPTApi implements LLMApi {
        const content = visionModel
          ? await preProcessImageContent(v.content)
          : getMessageTextContent(v);
-        messages.push({ role: v.role, content });
+        if (!(isO1 && v.role === "system"))
+          messages.push({ role: v.role, content });
      }

+      // O1 not support image, tools (plugin in ChatGPTNextWeb) and system, stream, logprobs, temperature, top_p, n, presence_penalty, frequency_penalty yet.
      requestPayload = {
        messages,
-        stream: options.config.stream,
+        stream: !isO1 ? options.config.stream : false,
        model: modelConfig.model,
-        temperature: modelConfig.temperature,
-        presence_penalty: modelConfig.presence_penalty,
-        frequency_penalty: modelConfig.frequency_penalty,
-        top_p: modelConfig.top_p,
+        temperature: !isO1 ? modelConfig.temperature : 1,
+        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.
      };

      // add max_tokens to vision model
-      if (visionModel && modelConfig.model.includes("preview")) {
+      if (visionModel) {
        requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
      }
    }

    console.log("[Request] openai payload: ", requestPayload);

-    const shouldStream = !isDalle3 && !!options.config.stream;
+    const shouldStream = !isDalle3 && !!options.config.stream && !isO1;
    const controller = new AbortController();
    options.onController?.(controller);

@@ -313,7 +316,7 @@ export class ChatGPTApi implements LLMApi {
        // make a fetch request
        const requestTimeoutId = setTimeout(
          () => controller.abort(),
-          isDalle3 ? REQUEST_TIMEOUT_MS * 2 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow.
+          isDalle3 || isO1 ? REQUEST_TIMEOUT_MS * 2 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow.
        );

        const res = await fetch(chatPath, chatPayload);
--- a/app/components/artifacts.tsx
+++ b/app/components/artifacts.tsx
@@ -80,7 +80,7 @@ export const HTMLPreview = forwardRef<HTMLPreviewHander, HTMLPreviewProps>(
    }, [props.autoHeight, props.height, iframeHeight]);

    const srcDoc = useMemo(() => {
-      const script = `<script>new ResizeObserver((entries) => parent.postMessage({id: '${frameId}', height: entries[0].target.clientHeight}, '*')).observe(document.body)</script>`;
+      const script = `<script>window.addEventListener("DOMContentLoaded", () => new ResizeObserver((entries) => parent.postMessage({id: '${frameId}', height: entries[0].target.clientHeight}, '*')).observe(document.body))</script>`;
      if (props.code.includes("<!DOCTYPE html>")) {
        props.code.replace("<!DOCTYPE html>", "<!DOCTYPE html>" + script);
      }
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -68,6 +68,7 @@ import {
  isVisionModel,
  isDalle3,
  showPlugins,
+  safeLocalStorage,
 } from "../utils";

 import { uploadImage as uploadImageRemote } from "@/app/utils/chat";
@@ -110,6 +111,8 @@ import { getClientConfig } from "../config/client";
 import { useAllModels } from "../utils/hooks";
 import { MultimodalContent } from "../client/api";

+const localStorage = safeLocalStorage();
+
 const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
  loading: () => <LoadingIcon />,
 });
@@ -189,7 +192,7 @@ function PromptToast(props: {

  return (
    <div className={styles["prompt-toast"]} key="prompt-toast">
-      {props.showToast && (
+      {props.showToast && context.length > 0 && (
        <div
          className={styles["prompt-toast-inner"] + " clickable"}
          role="button"
@@ -504,6 +507,8 @@ export function ChatActions(props: {
  const currentStyle =
    chatStore.currentSession().mask.modelConfig?.style ?? "vivid";

+  const isMobileScreen = useMobileScreen();
+
  useEffect(() => {
    const show = isVisionModel(currentModel);
    setShowUploadImage(show);
@@ -758,11 +763,13 @@ export function ChatActions(props: {
        />
      )}

-      <ChatAction
-        onClick={() => props.setShowShortcutKeyModal(true)}
-        text={Locale.Chat.ShortcutKey.Title}
-        icon={<ShortcutkeyIcon />}
-      />
+      {!isMobileScreen && (
+        <ChatAction
+          onClick={() => props.setShowShortcutKeyModal(true)}
+          text={Locale.Chat.ShortcutKey.Title}
+          icon={<ShortcutkeyIcon />}
+        />
+      )}
    </div>
  );
 }
@@ -1010,7 +1017,7 @@ function _Chat() {
      .onUserInput(userInput, attachImages)
      .then(() => setIsLoading(false));
    setAttachImages([]);
-    localStorage.setItem(LAST_INPUT_KEY, userInput);
+    chatStore.setLastInput(userInput);
    setUserInput("");
    setPromptHints([]);
    if (!isMobileScreen) inputRef.current?.focus();
@@ -1076,7 +1083,7 @@ function _Chat() {
      userInput.length <= 0 &&
      !(e.metaKey || e.altKey || e.ctrlKey)
    ) {
-      setUserInput(localStorage.getItem(LAST_INPUT_KEY) ?? "");
+      setUserInput(chatStore.lastInput ?? "");
      e.preventDefault();
      return;
    }
--- a/app/components/error.tsx
+++ b/app/components/error.tsx
@@ -8,6 +8,7 @@ import { ISSUE_URL } from "../constant";
 import Locale from "../locales";
 import { showConfirm } from "./ui-lib";
 import { useSyncStore } from "../store/sync";
+import { useChatStore } from "../store/chat";

 interface IErrorBoundaryState {
  hasError: boolean;
@@ -30,8 +31,7 @@ export class ErrorBoundary extends React.Component<any, IErrorBoundaryState> {
    try {
      useSyncStore.getState().export();
    } finally {
-      localStorage.clear();
-      location.reload();
+      useChatStore.getState().clearAllData();
    }
  }

--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -237,9 +237,26 @@ function escapeBrackets(text: string) {
  );
 }

+function tryWrapHtmlCode(text: string) {
+  // try add wrap html code (fixed: html codeblock include 2 newline)
+  return text
+    .replace(
+      /([`]*?)(\w*?)([\n\r]*?)(<!DOCTYPE html>)/g,
+      (match, quoteStart, lang, newLine, doctype) => {
+        return !quoteStart ? "\n```html\n" + doctype : match;
+      },
+    )
+    .replace(
+      /(<\/body>)([\r\n\s]*?)(<\/html>)([\n\r]*?)([`]*?)([\n\r]*?)/g,
+      (match, bodyEnd, space, htmlEnd, newLine, quoteEnd) => {
+        return !quoteEnd ? bodyEnd + space + htmlEnd + "\n```\n" : match;
+      },
+    );
+}
+
 function _MarkDownContent(props: { content: string }) {
  const escapedContent = useMemo(() => {
-    return escapeBrackets(escapeDollarNumber(props.content));
+    return tryWrapHtmlCode(escapeBrackets(escapeDollarNumber(props.content)));
  }, [props.content]);

  return (
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -426,16 +426,7 @@ export function MaskPage() {
  const maskStore = useMaskStore();
  const chatStore = useChatStore();

-  const [filterLang, setFilterLang] = useState<Lang | undefined>(
-    () => localStorage.getItem("Mask-language") as Lang | undefined,
-  );
-  useEffect(() => {
-    if (filterLang) {
-      localStorage.setItem("Mask-language", filterLang);
-    } else {
-      localStorage.removeItem("Mask-language");
-    }
-  }, [filterLang]);
+  const filterLang = maskStore.language;

  const allMasks = maskStore
    .getAll()
@@ -542,9 +533,9 @@ export function MaskPage() {
              onChange={(e) => {
                const value = e.currentTarget.value;
                if (value === Locale.Settings.Lang.All) {
-                  setFilterLang(undefined);
+                  maskStore.setLanguage(undefined);
                } else {
-                  setFilterLang(value as Lang);
+                  maskStore.setLanguage(value as Lang);
                }
              }}
            >
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -250,6 +250,8 @@ export const KnowledgeCutOffDate: Record<string, string> = {
  "gpt-4o-mini": "2023-10",
  "gpt-4o-mini-2024-07-18": "2023-10",
  "gpt-4-vision-preview": "2023-04",
+  "o1-mini": "2023-10",
+  "o1-preview": "2023-10",
  // After improvements,
  // it's now easier to add "KnowledgeCutOffDate" instead of stupid hardcoding it, as was done previously.
  "gemini-pro": "2023-12",
@@ -276,6 +278,8 @@ const openaiModels = [
  "gpt-4-turbo-2024-04-09",
  "gpt-4-1106-preview",
  "dall-e-3",
+  "o1-mini",
+  "o1-preview"
 ];

 const googleModels = [
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -504,8 +504,8 @@ const cn = {
    },
  },
  Copy: {
-    Success: "已写入剪切板",
-    Failed: "复制失败，请赋予剪切板权限",
+    Success: "已写入剪贴板",
+    Failed: "复制失败，请赋予剪贴板权限",
  },
  Download: {
    Success: "内容已下载到您的目录。",
--- a/app/locales/index.ts
+++ b/app/locales/index.ts
@@ -18,10 +18,13 @@ import ar from "./ar";
 import bn from "./bn";
 import sk from "./sk";
 import { merge } from "../utils/merge";
+import { safeLocalStorage } from "@/app/utils";

 import type { LocaleType } from "./cn";
 export type { LocaleType, PartialLocaleType } from "./cn";

+const localStorage = safeLocalStorage();
+
 const ALL_LANGS = {
  cn,
  en,
@@ -82,17 +85,11 @@ merge(fallbackLang, targetLang);
 export default fallbackLang as LocaleType;

 function getItem(key: string) {
-  try {
-    return localStorage.getItem(key);
-  } catch {
-    return null;
-  }
+  return localStorage.getItem(key);
 }

 function setItem(key: string, value: string) {
-  try {
-    localStorage.setItem(key, value);
-  } catch {}
+  localStorage.setItem(key, value);
 }

 function getLanguage() {
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -26,9 +26,11 @@ import { nanoid } from "nanoid";
 import { createPersistStore } from "../utils/store";
 import { collectModelsWithDefaultModel } from "../utils/model";
 import { useAccessStore } from "./access";
-import { isDalle3 } from "../utils";
+import { isDalle3, safeLocalStorage } from "../utils";
 import { indexedDBStorage } from "@/app/utils/indexedDB-storage";

+const localStorage = safeLocalStorage();
+
 export type ChatMessageTool = {
  id: string;
  index?: number;
@@ -179,6 +181,7 @@ function fillTemplateWith(input: string, modelConfig: ModelConfig) {
 const DEFAULT_CHAT_STATE = {
  sessions: [createEmptySession()],
  currentSessionIndex: 0,
+  lastInput: "",
 };

 export const useChatStore = createPersistStore(
@@ -701,6 +704,11 @@ export const useChatStore = createPersistStore(
        localStorage.clear();
        location.reload();
      },
+      setLastInput(lastInput: string) {
+        set({
+          lastInput,
+        });
+      },
    };

    return methods;
--- a/app/store/mask.ts
+++ b/app/store/mask.ts
@@ -23,9 +23,12 @@ export type Mask = {

 export const DEFAULT_MASK_STATE = {
  masks: {} as Record<string, Mask>,
+  language: undefined as Lang | undefined,
 };

-export type MaskState = typeof DEFAULT_MASK_STATE;
+export type MaskState = typeof DEFAULT_MASK_STATE & {
+  language?: Lang | undefined;
+};

 export const DEFAULT_MASK_AVATAR = "gpt-bot";
 export const createEmptyMask = () =>
@@ -102,6 +105,11 @@ export const useMaskStore = createPersistStore(
    search(text: string) {
      return Object.values(get().masks);
    },
+    setLanguage(language: Lang | undefined) {
+      set({
+        language,
+      });
+    },
  }),
  {
    name: StoreKey.Mask,
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -318,3 +318,63 @@ export function adapter(config: Record<string, unknown>) {
    : path;
  return fetch(fetchUrl as string, { ...rest, responseType: "text" });
 }
+
+export function safeLocalStorage(): {
+  getItem: (key: string) => string | null;
+  setItem: (key: string, value: string) => void;
+  removeItem: (key: string) => void;
+  clear: () => void;
+} {
+  let storage: Storage | null;
+
+  try {
+    if (typeof window !== "undefined" && window.localStorage) {
+      storage = window.localStorage;
+    } else {
+      storage = null;
+    }
+  } catch (e) {
+    console.error("localStorage is not available:", e);
+    storage = null;
+  }
+
+  return {
+    getItem(key: string): string | null {
+      if (storage) {
+        return storage.getItem(key);
+      } else {
+        console.warn(
+          `Attempted to get item "${key}" from localStorage, but localStorage is not available.`,
+        );
+        return null;
+      }
+    },
+    setItem(key: string, value: string): void {
+      if (storage) {
+        storage.setItem(key, value);
+      } else {
+        console.warn(
+          `Attempted to set item "${key}" in localStorage, but localStorage is not available.`,
+        );
+      }
+    },
+    removeItem(key: string): void {
+      if (storage) {
+        storage.removeItem(key);
+      } else {
+        console.warn(
+          `Attempted to remove item "${key}" from localStorage, but localStorage is not available.`,
+        );
+      }
+    },
+    clear(): void {
+      if (storage) {
+        storage.clear();
+      } else {
+        console.warn(
+          "Attempted to clear localStorage, but localStorage is not available.",
+        );
+      }
+    },
+  };
+}
--- a/app/utils/indexedDB-storage.ts
+++ b/app/utils/indexedDB-storage.ts
@@ -1,5 +1,8 @@
 import { StateStorage } from "zustand/middleware";
 import { get, set, del, clear } from "idb-keyval";
+import { safeLocalStorage } from "@/app/utils";
+
+const localStorage = safeLocalStorage();

 class IndexedDBStorage implements StateStorage {
  public async getItem(name: string): Promise<string | null> {
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
    "productName": "NextChat",
-    "version": "2.15.1"
+    "version": "2.15.2"
  },
  "tauri": {
    "allowlist": {
Author	SHA1	Message	Date
lloydzhou	df62736ff6	update version	2024-09-13 17:36:32 +08:00
Dogtiti	6a464b3e5f	Merge pull request #5418 from ConnectAI-E/hotfix/artifact fixed: html codeblock include 2 newline	2024-09-13 17:32:21 +08:00
Lloyd Zhou	57fcda80df	Merge pull request #5419 from DDMeaqua/feat-shortcutkey chore: 手机端隐藏快捷键展示	2024-09-13 17:31:22 +08:00
DDMeaqua	db39fbc419	chore: 手机端隐藏快捷键展示	2024-09-13 16:56:06 +08:00
lloydzhou	3dabe47c78	fixed: html codeblock include 2 newline	2024-09-13 16:27:02 +08:00
Dogtiti	affc194cde	Merge pull request #5416 from skymkmk/pr-add-o1 feat: add o1 model	2024-09-13 16:26:42 +08:00
skymkmk	03fa580a55	fix: give o1 some time to think twice	2024-09-13 16:25:04 +08:00
skymkmk	d0dce654bf	fix: shouldstream is not depend on iso1	2024-09-13 14:18:18 +08:00
Dogtiti	169323e238	Merge pull request #5415 from skymkmk/pr-fix-incorrect-vision-model-judgement fix: remove the visual model judgment method that checks if the model…	2024-09-13 13:57:37 +08:00
skymkmk	71df415b14	feat: add o1 model	2024-09-13 13:34:49 +08:00
skymkmk	6bb01bc564	fix: remove the visual model judgment method that checks if the model name contains 'preview' from the openai api to prevent models like o1-preview from being classified as visual models	2024-09-13 12:56:28 +08:00
Dogtiti	07c6fe5975	Merge pull request #5406 from ChatGPTNextWeb/river fix: #4240 remove tip when 0 context	2024-09-12 21:48:11 +08:00
Dogtiti	5964181cb2	Merge pull request #5405 from xmcp/patch-1 fix typo in UI	2024-09-12 21:47:39 +08:00
river	4b8288a2b2	fix: #4240 remove tip when 0 context	2024-09-12 21:05:02 +08:00
xmcp	88b1c1c6a5	fix typo	2024-09-12 19:54:16 +08:00
Dogtiti	1234deabfa	Merge pull request #5396 from DDMeaqua/feat-shortcutkey feat: add shortcut key	2024-09-12 13:57:24 +08:00
Dogtiti	35f77f45a2	Merge pull request #5386 from ConnectAI-E/feature/safeLocalStorage fix: safaLocalStorage	2024-09-09 16:48:25 +08:00
Dogtiti	992c3a5d3a	fix: safaLocalStorage	2024-09-08 13:23:40 +08:00