{tool.isError === false ? (
diff --git a/app/components/markdown.tsx b/app/components/markdown.tsx
index 6e340d065..a25b8537b 100644
--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -207,23 +207,6 @@ function CustomCode(props: { children: any; className?: string }) {
);
}
-function escapeDollarNumber(text: string) {
- let escapedText = "";
-
- for (let i = 0; i < text.length; i += 1) {
- let char = text[i];
- const nextChar = text[i + 1] || " ";
-
- if (char === "$" && nextChar >= "0" && nextChar <= "9") {
- char = "\\$";
- }
-
- escapedText += char;
- }
-
- return escapedText;
-}
-
function escapeBrackets(text: string) {
const pattern =
/(```[\s\S]*?```|`.*?`)|\\\[([\s\S]*?[^\\])\\\]|\\\((.*?)\\\)/g;
@@ -252,7 +235,7 @@ function tryWrapHtmlCode(text: string) {
},
)
.replace(
- /(<\/body>)([\r\n\s]*?)(<\/html>)([\n\r]*?)([`]*?)([\n\r]*?)/g,
+ /(<\/body>)([\r\n\s]*?)(<\/html>)([\n\r]*)([`]*)([\n\r]*?)/g,
(match, bodyEnd, space, htmlEnd, newLine, quoteEnd) => {
return !quoteEnd ? bodyEnd + space + htmlEnd + "\n```\n" : match;
},
@@ -261,7 +244,7 @@ function tryWrapHtmlCode(text: string) {
function _MarkDownContent(props: { content: string }) {
const escapedContent = useMemo(() => {
- return tryWrapHtmlCode(escapeBrackets(escapeDollarNumber(props.content)));
+ return tryWrapHtmlCode(escapeBrackets(props.content));
}, [props.content]);
return (
diff --git a/app/constant.ts b/app/constant.ts
index a54a973da..a06b8f050 100644
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -11,7 +11,6 @@ export const RUNTIME_CONFIG_DOM = "danger-runtime-config";
export const STABILITY_BASE_URL = "https://api.stability.ai";
-export const DEFAULT_API_HOST = "https://api.nextchat.dev";
export const OPENAI_BASE_URL = "https://api.openai.com";
export const ANTHROPIC_BASE_URL = "https://api.anthropic.com";
diff --git a/app/store/access.ts b/app/store/access.ts
index d74cb9d02..dec3a7258 100644
--- a/app/store/access.ts
+++ b/app/store/access.ts
@@ -1,9 +1,18 @@
import {
- ApiPath,
- DEFAULT_API_HOST,
GoogleSafetySettingsThreshold,
ServiceProvider,
StoreKey,
+ ApiPath,
+ OPENAI_BASE_URL,
+ ANTHROPIC_BASE_URL,
+ GEMINI_BASE_URL,
+ BAIDU_BASE_URL,
+ BYTEDANCE_BASE_URL,
+ ALIBABA_BASE_URL,
+ TENCENT_BASE_URL,
+ MOONSHOT_BASE_URL,
+ STABILITY_BASE_URL,
+ IFLYTEK_BASE_URL,
} from "../constant";
import { getHeaders } from "../client/api";
import { getClientConfig } from "../config/client";
@@ -15,45 +24,25 @@ let fetchState = 0; // 0 not fetch, 1 fetching, 2 done
const isApp = getClientConfig()?.buildMode === "export";
-const DEFAULT_OPENAI_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/openai"
- : ApiPath.OpenAI;
+const DEFAULT_OPENAI_URL = isApp ? OPENAI_BASE_URL : ApiPath.OpenAI;
-const DEFAULT_GOOGLE_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/google"
- : ApiPath.Google;
+const DEFAULT_GOOGLE_URL = isApp ? GEMINI_BASE_URL : ApiPath.Google;
-const DEFAULT_ANTHROPIC_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/anthropic"
- : ApiPath.Anthropic;
+const DEFAULT_ANTHROPIC_URL = isApp ? ANTHROPIC_BASE_URL : ApiPath.Anthropic;
-const DEFAULT_BAIDU_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/baidu"
- : ApiPath.Baidu;
+const DEFAULT_BAIDU_URL = isApp ? BAIDU_BASE_URL : ApiPath.Baidu;
-const DEFAULT_BYTEDANCE_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/bytedance"
- : ApiPath.ByteDance;
+const DEFAULT_BYTEDANCE_URL = isApp ? BYTEDANCE_BASE_URL : ApiPath.ByteDance;
-const DEFAULT_ALIBABA_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/alibaba"
- : ApiPath.Alibaba;
+const DEFAULT_ALIBABA_URL = isApp ? ALIBABA_BASE_URL : ApiPath.Alibaba;
-const DEFAULT_TENCENT_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/tencent"
- : ApiPath.Tencent;
+const DEFAULT_TENCENT_URL = isApp ? TENCENT_BASE_URL : ApiPath.Tencent;
-const DEFAULT_MOONSHOT_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/moonshot"
- : ApiPath.Moonshot;
+const DEFAULT_MOONSHOT_URL = isApp ? MOONSHOT_BASE_URL : ApiPath.Moonshot;
-const DEFAULT_STABILITY_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/stability"
- : ApiPath.Stability;
+const DEFAULT_STABILITY_URL = isApp ? STABILITY_BASE_URL : ApiPath.Stability;
-const DEFAULT_IFLYTEK_URL = isApp
- ? DEFAULT_API_HOST + "/api/proxy/iflytek"
- : ApiPath.Iflytek;
+const DEFAULT_IFLYTEK_URL = isApp ? IFLYTEK_BASE_URL : ApiPath.Iflytek;
const DEFAULT_ACCESS_STATE = {
accessCode: "",
@@ -211,10 +200,13 @@ export const useAccessStore = createPersistStore(
})
.then((res) => res.json())
.then((res) => {
- // Set default model from env request
- let defaultModel = res.defaultModel ?? "";
- if (defaultModel !== "")
- DEFAULT_CONFIG.modelConfig.model = defaultModel;
+ const defaultModel = res.defaultModel ?? "";
+ if (defaultModel !== "") {
+ const [model, providerName] = defaultModel.split("@");
+ DEFAULT_CONFIG.modelConfig.model = model;
+ DEFAULT_CONFIG.modelConfig.providerName = providerName;
+ }
+
return res;
})
.then((res: DangerConfig) => {
diff --git a/app/store/chat.ts b/app/store/chat.ts
index 968d8cb64..02adb26b3 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -16,6 +16,9 @@ import {
DEFAULT_SYSTEM_TEMPLATE,
KnowledgeCutOffDate,
StoreKey,
+ SUMMARIZE_MODEL,
+ GEMINI_SUMMARIZE_MODEL,
+ ServiceProvider,
} from "../constant";
import Locale, { getLang } from "../locales";
import { isDalle3, safeLocalStorage } from "../utils";
@@ -23,6 +26,8 @@ import { prettyObject } from "../utils/format";
import { createPersistStore } from "../utils/store";
import { estimateTokenLength } from "../utils/token";
import { ModelConfig, ModelType, useAppConfig } from "./config";
+import { useAccessStore } from "./access";
+import { collectModelsWithDefaultModel } from "../utils/model";
import { createEmptyMask, Mask } from "./mask";
const localStorage = safeLocalStorage();
@@ -37,6 +42,7 @@ export type ChatMessageTool = {
};
content?: string;
isError?: boolean;
+ errorMsg?: string;
};
export type ChatMessage = RequestMessage & {
@@ -102,6 +108,35 @@ function createEmptySession(): ChatSession {
};
}
+function getSummarizeModel(
+ currentModel: string,
+ providerName: string,
+): string[] {
+ // if it is using gpt-* models, force to use 4o-mini to summarize
+ if (currentModel.startsWith("gpt") || currentModel.startsWith("chatgpt")) {
+ const configStore = useAppConfig.getState();
+ const accessStore = useAccessStore.getState();
+ const allModel = collectModelsWithDefaultModel(
+ configStore.models,
+ [configStore.customModels, accessStore.customModels].join(","),
+ accessStore.defaultModel,
+ );
+ const summarizeModel = allModel.find(
+ (m) => m.name === SUMMARIZE_MODEL && m.available,
+ );
+ if (summarizeModel) {
+ return [
+ summarizeModel.name,
+ summarizeModel.provider?.providerName as string,
+ ];
+ }
+ }
+ if (currentModel.startsWith("gemini")) {
+ return [GEMINI_SUMMARIZE_MODEL, ServiceProvider.Google];
+ }
+ return [currentModel, providerName];
+}
+
function countMessages(msgs: ChatMessage[]) {
return msgs.reduce(
(pre, cur) => pre + estimateTokenLength(getMessageTextContent(cur)),
@@ -578,8 +613,14 @@ export const useChatStore = createPersistStore(
return;
}
- const providerName = modelConfig.compressProviderName;
- const api: ClientApi = getClientApi(providerName);
+ // if not config compressModel, then using getSummarizeModel
+ const [model, providerName] = modelConfig.compressModel
+ ? [modelConfig.compressModel, modelConfig.compressProviderName]
+ : getSummarizeModel(
+ session.mask.modelConfig.model,
+ session.mask.modelConfig.providerName,
+ );
+ const api: ClientApi = getClientApi(providerName as ServiceProvider);
// remove error messages if any
const messages = session.messages;
@@ -610,7 +651,7 @@ export const useChatStore = createPersistStore(
api.llm.chat({
messages: topicMessages,
config: {
- model: modelConfig.compressModel,
+ model,
stream: false,
providerName,
},
@@ -674,7 +715,8 @@ export const useChatStore = createPersistStore(
config: {
...modelcfg,
stream: true,
- model: modelConfig.compressModel,
+ model,
+ providerName,
},
onUpdate(message) {
session.memoryPrompt = message;
@@ -727,7 +769,7 @@ export const useChatStore = createPersistStore(
},
{
name: StoreKey.Chat,
- version: 3.2,
+ version: 3.3,
migrate(persistedState, version) {
const state = persistedState as any;
const newState = JSON.parse(
@@ -783,6 +825,14 @@ export const useChatStore = createPersistStore(
config.modelConfig.compressProviderName;
});
}
+ // revert default summarize model for every session
+ if (version < 3.3) {
+ newState.sessions.forEach((s) => {
+ const config = useAppConfig.getState();
+ s.mask.modelConfig.compressModel = "";
+ s.mask.modelConfig.compressProviderName = "";
+ });
+ }
return newState as any;
},
diff --git a/app/store/config.ts b/app/store/config.ts
index 3dcd4d86b..f9ddce4a8 100644
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -71,8 +71,8 @@ export const DEFAULT_CONFIG = {
sendMemory: true,
historyMessageCount: 4,
compressMessageLengthThreshold: 1000,
- compressModel: "gpt-4o-mini" as ModelType,
- compressProviderName: "OpenAI" as ServiceProvider,
+ compressModel: "",
+ compressProviderName: "",
enableInjectSystemPrompts: true,
template: config?.template ?? DEFAULT_INPUT_TEMPLATE,
size: "1024x1024" as DalleSize,
@@ -178,7 +178,7 @@ export const useAppConfig = createPersistStore(
}),
{
name: StoreKey.Config,
- version: 4,
+ version: 4.1,
merge(persistedState, currentState) {
const state = persistedState as ChatConfig | undefined;
@@ -231,7 +231,7 @@ export const useAppConfig = createPersistStore(
: config?.template ?? DEFAULT_INPUT_TEMPLATE;
}
- if (version < 4) {
+ if (version < 4.1) {
state.modelConfig.compressModel =
DEFAULT_CONFIG.modelConfig.compressModel;
state.modelConfig.compressProviderName =
diff --git a/app/store/plugin.ts b/app/store/plugin.ts
index 84ae0816e..b3d9f6d8c 100644
--- a/app/store/plugin.ts
+++ b/app/store/plugin.ts
@@ -4,10 +4,10 @@ import { nanoid } from "nanoid";
import { createPersistStore } from "../utils/store";
import { getClientConfig } from "../config/client";
import yaml from "js-yaml";
-import { adapter } from "../utils";
+import { adapter, getOperationId } from "../utils";
import { useAccessStore } from "./access";
-const isApp = getClientConfig()?.isApp;
+const isApp = getClientConfig()?.isApp !== false;
export type Plugin = {
id: string;
@@ -116,7 +116,7 @@ export const FunctionToolService = {
return {
type: "function",
function: {
- name: o.operationId,
+ name: getOperationId(o),
description: o.description || o.summary,
parameters: parameters,
},
@@ -124,7 +124,7 @@ export const FunctionToolService = {
}),
funcs: operations.reduce((s, o) => {
// @ts-ignore
- s[o.operationId] = function (args) {
+ s[getOperationId(o)] = function (args) {
const parameters: Record
= {};
if (o.parameters instanceof Array) {
o.parameters.forEach((p) => {
@@ -139,8 +139,8 @@ export const FunctionToolService = {
} else if (authLocation == "body") {
args[headerName] = tokenValue;
}
- // @ts-ignore
- return api.client[o.operationId](
+ // @ts-ignore if o.operationId is null, then using o.path and o.method
+ return api.client.paths[o.path][o.method](
parameters,
args,
api.axiosConfigDefaults,
diff --git a/app/store/sync.ts b/app/store/sync.ts
index 9db60d5f4..8477c1e4b 100644
--- a/app/store/sync.ts
+++ b/app/store/sync.ts
@@ -12,7 +12,6 @@ import { downloadAs, readFromFile } from "../utils";
import { showToast } from "../components/ui-lib";
import Locale from "../locales";
import { createSyncClient, ProviderType } from "../utils/cloud";
-import { corsPath } from "../utils/cors";
export interface WebDavConfig {
server: string;
@@ -26,7 +25,7 @@ export type SyncStore = GetStoreState;
const DEFAULT_SYNC_STATE = {
provider: ProviderType.WebDAV,
useProxy: true,
- proxyUrl: corsPath(ApiPath.Cors),
+ proxyUrl: ApiPath.Cors as string,
webdav: {
endpoint: "",
diff --git a/app/utils.ts b/app/utils.ts
index 9a8bebf38..b3d27cbce 100644
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -2,8 +2,9 @@ import { useEffect, useState } from "react";
import { showToast } from "./components/ui-lib";
import Locale from "./locales";
import { RequestMessage } from "./client/api";
-import { ServiceProvider, REQUEST_TIMEOUT_MS } from "./constant";
-import { fetch as tauriFetch, ResponseType } from "@tauri-apps/api/http";
+import { ServiceProvider } from "./constant";
+// import { fetch as tauriFetch, ResponseType } from "@tauri-apps/api/http";
+import { fetch as tauriStreamFetch } from "./utils/stream";
export function trimTopic(topic: string) {
// Fix an issue where double quotes still show in the Indonesian language
@@ -292,30 +293,23 @@ export function fetch(
options?: Record,
): Promise {
if (window.__TAURI__) {
- const payload = options?.body || options?.data;
- return tauriFetch(url, {
- ...options,
- body:
- payload &&
- ({
- type: "Text",
- payload,
- } as any),
- timeout: ((options?.timeout as number) || REQUEST_TIMEOUT_MS) / 1000,
- responseType:
- options?.responseType == "text" ? ResponseType.Text : ResponseType.JSON,
- } as any);
+ return tauriStreamFetch(url, options);
}
return window.fetch(url, options);
}
export function adapter(config: Record) {
- const { baseURL, url, params, ...rest } = config;
+ const { baseURL, url, params, data: body, ...rest } = config;
const path = baseURL ? `${baseURL}${url}` : url;
const fetchUrl = params
? `${path}?${new URLSearchParams(params as any).toString()}`
: path;
- return fetch(fetchUrl as string, { ...rest, responseType: "text" });
+ return fetch(fetchUrl as string, { ...rest, body }).then((res) => {
+ const { status, headers, statusText } = res;
+ return res
+ .text()
+ .then((data: string) => ({ status, statusText, headers, data }));
+ });
}
export function safeLocalStorage(): {
@@ -377,3 +371,15 @@ export function safeLocalStorage(): {
},
};
}
+
+export function getOperationId(operation: {
+ operationId?: string;
+ method: string;
+ path: string;
+}) {
+ // pattern '^[a-zA-Z0-9_-]+$'
+ return (
+ operation?.operationId ||
+ `${operation.method.toUpperCase()}${operation.path.replaceAll("/", "_")}`
+ );
+}
diff --git a/app/utils/chat.ts b/app/utils/chat.ts
index 7f3bb23c5..46f232638 100644
--- a/app/utils/chat.ts
+++ b/app/utils/chat.ts
@@ -10,6 +10,7 @@ import {
fetchEventSource,
} from "@fortaine/fetch-event-source";
import { prettyObject } from "./format";
+import { fetch as tauriFetch } from "./stream";
export function compressImage(file: Blob, maxSize: number): Promise {
return new Promise((resolve, reject) => {
@@ -221,7 +222,7 @@ export function stream(
),
)
.then((res) => {
- const content = JSON.stringify(res.data);
+ let content = res.data || res?.statusText;
if (res.status >= 300) {
return Promise.reject(content);
}
@@ -236,7 +237,11 @@ export function stream(
return content;
})
.catch((e) => {
- options?.onAfterTool?.({ ...tool, isError: true });
+ options?.onAfterTool?.({
+ ...tool,
+ isError: true,
+ errorMsg: e.toString(),
+ });
return e.toString();
})
.then((content) => ({
@@ -287,6 +292,7 @@ export function stream(
REQUEST_TIMEOUT_MS,
);
fetchEventSource(chatPath, {
+ fetch: tauriFetch as any,
...chatPayload,
async onopen(res) {
clearTimeout(requestTimeoutId);
diff --git a/app/utils/cors.ts b/app/utils/cors.ts
deleted file mode 100644
index f5e5ce6f0..000000000
--- a/app/utils/cors.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { getClientConfig } from "../config/client";
-import { DEFAULT_API_HOST } from "../constant";
-
-export function corsPath(path: string) {
- const baseUrl = getClientConfig()?.isApp ? `${DEFAULT_API_HOST}` : "";
-
- if (baseUrl === "" && path === "") {
- return "";
- }
- if (!path.startsWith("/")) {
- path = "/" + path;
- }
-
- if (!path.endsWith("/")) {
- path += "/";
- }
-
- return `${baseUrl}${path}`;
-}
diff --git a/app/utils/stream.ts b/app/utils/stream.ts
new file mode 100644
index 000000000..2eda768f3
--- /dev/null
+++ b/app/utils/stream.ts
@@ -0,0 +1,107 @@
+// using tauri command to send request
+// see src-tauri/src/stream.rs, and src-tauri/src/main.rs
+// 1. invoke('stream_fetch', {url, method, headers, body}), get response with headers.
+// 2. listen event: `stream-response` multi times to get body
+
+type ResponseEvent = {
+ id: number;
+ payload: {
+ request_id: number;
+ status?: number;
+ chunk?: number[];
+ };
+};
+
+type StreamResponse = {
+ request_id: number;
+ status: number;
+ status_text: string;
+ headers: Record;
+};
+
+export function fetch(url: string, options?: RequestInit): Promise {
+ if (window.__TAURI__) {
+ const {
+ signal,
+ method = "GET",
+ headers: _headers = {},
+ body = [],
+ } = options || {};
+ let unlisten: Function | undefined;
+ let setRequestId: Function | undefined;
+ const requestIdPromise = new Promise((resolve) => (setRequestId = resolve));
+ const ts = new TransformStream();
+ const writer = ts.writable.getWriter();
+
+ let closed = false;
+ const close = () => {
+ if (closed) return;
+ closed = true;
+ unlisten && unlisten();
+ writer.ready.then(() => {
+ writer.close().catch((e) => console.error(e));
+ });
+ };
+
+ if (signal) {
+ signal.addEventListener("abort", () => close());
+ }
+ // @ts-ignore 2. listen response multi times, and write to Response.body
+ window.__TAURI__.event
+ .listen("stream-response", (e: ResponseEvent) =>
+ requestIdPromise.then((request_id) => {
+ const { request_id: rid, chunk, status } = e?.payload || {};
+ if (request_id != rid) {
+ return;
+ }
+ if (chunk) {
+ writer.ready.then(() => {
+ writer.write(new Uint8Array(chunk));
+ });
+ } else if (status === 0) {
+ // end of body
+ close();
+ }
+ }),
+ )
+ .then((u: Function) => (unlisten = u));
+
+ const headers: Record = {
+ Accept: "application/json, text/plain, */*",
+ "Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7",
+ "User-Agent": navigator.userAgent,
+ };
+ for (const item of new Headers(_headers || {})) {
+ headers[item[0]] = item[1];
+ }
+ return window.__TAURI__
+ .invoke("stream_fetch", {
+ method: method.toUpperCase(),
+ url,
+ headers,
+ // TODO FormData
+ body:
+ typeof body === "string"
+ ? Array.from(new TextEncoder().encode(body))
+ : [],
+ })
+ .then((res: StreamResponse) => {
+ const { request_id, status, status_text: statusText, headers } = res;
+ setRequestId?.(request_id);
+ const response = new Response(ts.readable, {
+ status,
+ statusText,
+ headers,
+ });
+ if (status >= 300) {
+ setTimeout(close, 100);
+ }
+ return response;
+ })
+ .catch((e) => {
+ console.error("stream error", e);
+ throw e;
+ });
+ }
+ return window.fetch(url, options);
+}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 47d12e119..c9baffc0a 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -348,9 +348,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
dependencies = [
"serde",
]
@@ -942,9 +942,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
"percent-encoding",
]
@@ -970,9 +970,9 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
[[package]]
name = "futures-executor"
@@ -987,9 +987,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
[[package]]
name = "futures-lite"
@@ -1008,9 +1008,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
@@ -1019,21 +1019,21 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
[[package]]
name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
[[package]]
name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
dependencies = [
"futures-core",
"futures-io",
@@ -1555,9 +1555,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -1986,6 +1986,10 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
name = "nextchat"
version = "0.1.0"
dependencies = [
+ "bytes",
+ "futures-util",
+ "percent-encoding",
+ "reqwest",
"serde",
"serde_json",
"tauri",
@@ -2281,9 +2285,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "phf"
@@ -2545,9 +2549,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -3889,9 +3893,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 387584491..8a11c3b6f 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -37,6 +37,10 @@ tauri = { version = "1.5.4", features = [ "http-all",
"window-unminimize",
] }
tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+percent-encoding = "2.3.1"
+reqwest = "0.11.18"
+futures-util = "0.3.30"
+bytes = "1.7.2"
[features]
# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index ed3ec32f3..d04969c04 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1,8 +1,11 @@
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+mod stream;
+
fn main() {
tauri::Builder::default()
+ .invoke_handler(tauri::generate_handler![stream::stream_fetch])
.plugin(tauri_plugin_window_state::Builder::default().build())
.run(tauri::generate_context!())
.expect("error while running tauri application");
diff --git a/src-tauri/src/stream.rs b/src-tauri/src/stream.rs
new file mode 100644
index 000000000..d2c0726b0
--- /dev/null
+++ b/src-tauri/src/stream.rs
@@ -0,0 +1,134 @@
+//
+//
+
+use std::time::Duration;
+use std::error::Error;
+use std::sync::atomic::{AtomicU32, Ordering};
+use std::collections::HashMap;
+use futures_util::{StreamExt};
+use reqwest::Client;
+use reqwest::header::{HeaderName, HeaderMap};
+
+static REQUEST_COUNTER: AtomicU32 = AtomicU32::new(0);
+
+#[derive(Debug, Clone, serde::Serialize)]
+pub struct StreamResponse {
+ request_id: u32,
+ status: u16,
+ status_text: String,
+ headers: HashMap
+}
+
+#[derive(Clone, serde::Serialize)]
+pub struct EndPayload {
+ request_id: u32,
+ status: u16,
+}
+
+#[derive(Clone, serde::Serialize)]
+pub struct ChunkPayload {
+ request_id: u32,
+ chunk: bytes::Bytes,
+}
+
+#[tauri::command]
+pub async fn stream_fetch(
+ window: tauri::Window,
+ method: String,
+ url: String,
+ headers: HashMap,
+ body: Vec,
+) -> Result {
+
+ let event_name = "stream-response";
+ let request_id = REQUEST_COUNTER.fetch_add(1, Ordering::SeqCst);
+
+ let mut _headers = HeaderMap::new();
+ for (key, value) in &headers {
+ _headers.insert(key.parse::().unwrap(), value.parse().unwrap());
+ }
+
+ // println!("method: {:?}", method);
+ // println!("url: {:?}", url);
+ // println!("headers: {:?}", headers);
+ // println!("headers: {:?}", _headers);
+
+ let method = method.parse::().map_err(|err| format!("failed to parse method: {}", err))?;
+ let client = Client::builder()
+ .default_headers(_headers)
+ .redirect(reqwest::redirect::Policy::limited(3))
+ .connect_timeout(Duration::new(3, 0))
+ .build()
+ .map_err(|err| format!("failed to generate client: {}", err))?;
+
+ let mut request = client.request(
+ method.clone(),
+ url.parse::().map_err(|err| format!("failed to parse url: {}", err))?
+ );
+
+ if method == reqwest::Method::POST || method == reqwest::Method::PUT || method == reqwest::Method::PATCH {
+ let body = bytes::Bytes::from(body);
+ // println!("body: {:?}", body);
+ request = request.body(body);
+ }
+
+ // println!("client: {:?}", client);
+ // println!("request: {:?}", request);
+
+ let response_future = request.send();
+
+ let res = response_future.await;
+ let response = match res {
+ Ok(res) => {
+ // get response and emit to client
+ let mut headers = HashMap::new();
+ for (name, value) in res.headers() {
+ headers.insert(
+ name.as_str().to_string(),
+ std::str::from_utf8(value.as_bytes()).unwrap().to_string()
+ );
+ }
+ let status = res.status().as_u16();
+
+ tauri::async_runtime::spawn(async move {
+ let mut stream = res.bytes_stream();
+
+ while let Some(chunk) = stream.next().await {
+ match chunk {
+ Ok(bytes) => {
+ // println!("chunk: {:?}", bytes);
+ if let Err(e) = window.emit(event_name, ChunkPayload{ request_id, chunk: bytes }) {
+ println!("Failed to emit chunk payload: {:?}", e);
+ }
+ }
+ Err(err) => {
+ println!("Error chunk: {:?}", err);
+ }
+ }
+ }
+ if let Err(e) = window.emit(event_name, EndPayload{ request_id, status: 0 }) {
+ println!("Failed to emit end payload: {:?}", e);
+ }
+ });
+
+ StreamResponse {
+ request_id,
+ status,
+ status_text: "OK".to_string(),
+ headers,
+ }
+ }
+ Err(err) => {
+ println!("Error response: {:?}", err.source().expect("REASON").to_string());
+ StreamResponse {
+ request_id,
+ status: 599,
+ status_text: err.source().expect("REASON").to_string(),
+ headers: HashMap::new(),
+ }
+ }
+ };
+ // println!("Response: {:?}", response);
+ Ok(response)
+}
+
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index eb0d411cb..cc137ee8a 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
},
"package": {
"productName": "NextChat",
- "version": "2.15.3"
+ "version": "2.15.4"
},
"tauri": {
"allowlist": {
](https://zeabur.com/templates/ZBUEFA) [
](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web)
@@ -54,7 +54,7 @@
### 打开自动更新
-> 如果你遇到了 Upstream Sync 执行错误，请手动 Sync Fork 一次！
+> 如果你遇到了 Upstream Sync 执行错误，请[手动 Sync Fork 一次](./README_CN.md#手动更新代码)！
当你 fork 项目之后，由于 Github 的限制，需要手动去你 fork 后的项目的 Actions 页面启用 Workflows，并启用 Upstream Sync Action，启用之后即可开启每小时定时自动更新：
@@ -216,9 +216,9 @@ ByteDance Api Url.
用来控制模型列表，使用 `+` 增加一个模型，使用 `-` 来隐藏一个模型，使用 `模型名=展示名` 来自定义模型的展示名，用英文逗号隔开。
-在Azure的模式下，支持使用`modelName@azure=deploymentName`的方式配置模型名称和部署名称(deploy-name)
-> 示例：`+gpt-3.5-turbo@azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项。
-> 如果你只能使用Azure模式，那么设置 `-all,+gpt-3.5-turbo@azure=gpt35` 则可以让对话的默认使用 `gpt35(Azure)`
+在Azure的模式下，支持使用`modelName@Azure=deploymentName`的方式配置模型名称和部署名称(deploy-name)
+> 示例：`+gpt-3.5-turbo@Azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项。
+> 如果你只能使用Azure模式，那么设置 `-all,+gpt-3.5-turbo@Azure=gpt35` 则可以让对话的默认使用 `gpt35(Azure)`
在ByteDance的模式下，支持使用`modelName@bytedance=deploymentName`的方式配置模型名称和部署名称(deploy-name)
> 示例: `+Doubao-lite-4k@bytedance=ep-xxxxx-xxx`这个配置会在模型列表显示一个`Doubao-lite-4k(ByteDance)`的选项
diff --git a/README_JA.md b/README_JA.md
index 1716089af..062c11262 100644
--- a/README_JA.md
+++ b/README_JA.md
@@ -5,7 +5,7 @@
ワンクリックで無料であなた専用の ChatGPT ウェブアプリをデプロイ。GPT3、GPT4 & Gemini Pro モデルをサポート。
-[企業版](#企業版) / [デモ](https://chat-gpt-next-web.vercel.app/) / [フィードバック](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) / [Discordに参加](https://discord.gg/zrhvHCr79N)
+[NextChatAI](https://nextchat.dev/chat?utm_source=readme) / [企業版](#企業版) / [デモ](https://chat-gpt-next-web.vercel.app/) / [フィードバック](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) / [Discordに参加](https://discord.gg/zrhvHCr79N)
[