GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-06-08 05:40:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web

Browse Source
This commit is contained in:
GH Action - Upstream Sync 2024-09-08 00:12:51 +00:00
commit 30a83ef2f6
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/platforms/anthropic.ts
View File

@ -203,7 +203,7 @@ export class ClaudeApi implements LLMApi {
const [tools, funcs] = usePluginStore const [tools, funcs] = usePluginStore
.getState() .getState()
.getAsTools( .getAsTools(
useChatStore.getState().currentSession().mask?.plugin as string[], useChatStore.getState().currentSession().mask?.plugin || [],
); );
return stream( return stream(
path, path,

2
app/client/platforms/moonshot.ts
View File

@ -125,7 +125,7 @@ export class MoonshotApi implements LLMApi {
const [tools, funcs] = usePluginStore const [tools, funcs] = usePluginStore
.getState() .getState()
.getAsTools( .getAsTools(
useChatStore.getState().currentSession().mask?.plugin as string[], useChatStore.getState().currentSession().mask?.plugin || [],
); );
return stream( return stream(
chatPath, chatPath,

2
app/client/platforms/openai.ts
View File

@ -244,7 +244,7 @@ export class ChatGPTApi implements LLMApi {
const [tools, funcs] = usePluginStore const [tools, funcs] = usePluginStore
.getState() .getState()
.getAsTools( .getAsTools(
useChatStore.getState().currentSession().mask?.plugin as string[], useChatStore.getState().currentSession().mask?.plugin || [],
); );
// console.log("getAsTools", tools, funcs); // console.log("getAsTools", tools, funcs);
stream( stream(

3
app/components/markdown.tsx
View File

@ -163,7 +163,7 @@ export function PreCode(props: { children: any }) {
); );
} }
function CustomCode(props: { children: any }) { function CustomCode(props: { children: any; className?: string }) {
const ref = useRef<HTMLPreElement>(null); const ref = useRef<HTMLPreElement>(null);
const [collapsed, setCollapsed] = useState(true); const [collapsed, setCollapsed] = useState(true);
const [showToggle, setShowToggle] = useState(false); const [showToggle, setShowToggle] = useState(false);
@ -182,6 +182,7 @@ function CustomCode(props: { children: any }) {
return ( return (
<> <>
<code <code
className={props?.className}
ref={ref} ref={ref}
style={{ style={{
maxHeight: collapsed ? "400px" : "none", maxHeight: collapsed ? "400px" : "none",

2
app/layout.tsx
View File

@ -41,7 +41,7 @@ export default function RootLayout({
name="viewport" name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/> />
<link rel="manifest" href="/site.webmanifest"></link> <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"></link>
<script src="/serviceWorkerRegister.js" defer></script> <script src="/serviceWorkerRegister.js" defer></script>
</head> </head>
<body> <body>

2
app/store/plugin.ts
View File

@ -199,7 +199,7 @@ export const usePluginStore = createPersistStore(
getAsTools(ids: string[]) { getAsTools(ids: string[]) {
const plugins = get().plugins; const plugins = get().plugins;
const selected = ids const selected = (ids || [])
.map((id) => plugins[id]) .map((id) => plugins[id])
.filter((i) => i) .filter((i) => i)
.map((p) => FunctionToolService.add(p)); .map((p) => FunctionToolService.add(p));

2
src-tauri/tauri.conf.json
View File

@ -9,7 +9,7 @@
}, },
"package": { "package": {
"productName": "NextChat", "productName": "NextChat",
"version": "2.14.2" "version": "2.15.1"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {