Integration with SiliconFlow (#1)

siliconflow · Nov 22, 2024 · 10193f1 · 10193f1
1 parent 3932c59
commit 10193f1
Show file tree

Hide file tree

Showing 12 changed files with 782 additions and 6 deletions.
diff --git a/.github/workflows/auto-rebase.yml b/.github/workflows/auto-rebase.yml
@@ -0,0 +1,38 @@
+name: Auto Rebase
+
+on:
+  schedule:
+    - cron: '0 * * * *'  # This will run every hour
+  push:
+    branches:
+      - main  # Change this to the branch you want to watch for updates
+  workflow_dispatch:  # Allows manual triggering of the action
+
+permissions:
+  id-token: write
+  contents: write
+
+jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Fetch all history for all branches and tags
+
+      - name: Add upstream remote
+        run: git remote add upstream https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
+
+      - name: Fetch upstream changes
+        run: git fetch upstream
+
+      - name: Rebase branch
+        run: |
+          git config --global user.email [email protected]
+          git config --global user.name tsai
+          git checkout main
+          git rebase upstream/main
+
+      - name: Push changes
+        run: git push origin main --force
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ For enterprise inquiries, please contact: **[email protected]**
 - I18n: English, 简体中文, 繁体中文, 日本語, Français, Español, Italiano, Türkçe, Deutsch, Tiếng Việt, Русский, Čeština, 한국어, Indonesia
 
 <div align="center">
-   
+
 ![主界面](./docs/images/cover.png)
 
 </div>
@@ -103,7 +103,7 @@ For enterprise inquiries, please contact: **[email protected]**
 - 🚀 v2.15.8 Now supports Realtime Chat [#5672](https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/issues/5672)
 - 🚀 v2.15.4 The Application supports using Tauri fetch LLM API, MORE SECURITY! [#5379](https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/issues/5379)
 - 🚀 v2.15.0 Now supports Plugins! Read this: [NextChat-Awesome-Plugins](https://github.com/ChatGPTNextWeb/NextChat-Awesome-Plugins)
-- 🚀 v2.14.0 Now supports  Artifacts & SD 
+- 🚀 v2.14.0 Now supports  Artifacts & SD
 - 🚀 v2.10.1 support Google Gemini Pro model.
 - 🚀 v2.9.11 you can use azure endpoint now.
 - 🚀 v2.8 now we have a client that runs across all platforms!
@@ -156,7 +156,7 @@ For enterprise inquiries, please contact: **[email protected]**
 
 1. Get [OpenAI API Key](https://platform.openai.com/account/api-keys);
 2. Click
-   [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web), remember that `CODE` is your page password;
+   [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fsiliconflow%2FChatGPT-Next-Web&env=NEXT_PUBLIC_SF_NEXT_CHAT_CLIENT_ID&env=SF_NEXT_CHAT_SECRET&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web), remember that `CODE` is your page password;
 3. Enjoy :)
 
 ## FAQ
@@ -358,7 +358,7 @@ Change default model
 ### `WHITE_WEBDAV_ENDPOINTS` (optional)
 
 You can use this option if you want to increase the number of webdav service addresses you are allowed to access, as required by the format：
-- Each address must be a complete endpoint 
+- Each address must be a complete endpoint
 > `https://xxxx/yyy`
 - Multiple addresses are connected by ', '
 

diff --git a/app/api/[provider]/[...path]/route.ts b/app/api/[provider]/[...path]/route.ts
@@ -1,3 +1,4 @@
+import { handle as oauthHandler } from "../../oauth_callback";
 import { ApiPath } from "@/app/constant";
 import { NextRequest } from "next/server";
 import { handle as openaiHandler } from "../../openai";
@@ -21,6 +22,8 @@ async function handle(
   const apiPath = `/api/${params.provider}`;
   console.log(`[${params.provider} Route] params `, params);
   switch (apiPath) {
+    case ApiPath.OAuth:
+      return oauthHandler(req, { params });
     case ApiPath.Azure:
       return azureHandler(req, { params });
     case ApiPath.Google:

diff --git a/app/api/oauth_callback.ts b/app/api/oauth_callback.ts
@@ -0,0 +1,66 @@
+import { NextRequest, NextResponse } from "next/server";
+import { redirect } from "next/navigation";
+import { cookies } from "next/headers";
+
+export async function handle(
+  req: NextRequest,
+  { params }: { params: { path: string[] } },
+) {
+  console.log("[SF] params ", params);
+
+  if (req.method === "OPTIONS") {
+    return NextResponse.json({ body: "OK" }, { status: 200 });
+  }
+  const url = new URL(req.url);
+  const queryParams = new URLSearchParams(url.search);
+  const code = queryParams.get("code");
+  let sfak = "";
+  console.log("[SF] code ", code);
+  try {
+    const tokenFetch = await fetch(
+      `${
+        process.env.NEXT_PUBLIC_SF_NEXT_CHAT_SF_ACCOUNT_ENDPOINT ||
+        "https://account.siliconflow.cn"
+      }/api/open/oauth`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          clientId: process.env.NEXT_PUBLIC_SF_NEXT_CHAT_CLIENT_ID,
+          secret: process.env.SF_NEXT_CHAT_SECRET,
+          code,
+        }),
+      },
+    );
+    if (!tokenFetch.ok)
+      return Response.json(
+        { status: false, message: "fetch error" },
+        { status: 500 },
+      );
+    const tokenJson = await tokenFetch.json();
+    const access_token = tokenJson.status ? tokenJson.data?.access_token : null;
+    console.log("access_token", access_token);
+    const apiKey = await fetch(
+      `${
+        process.env.NEXT_PUBLIC_SF_NEXT_CHAT_SF_CLOUD_ENDPOINT ||
+        "https://cloud.siliconflow.cn"
+      }/api/oauth/apikeys`,
+      {
+        method: "POST",
+        headers: {
+          Authorization: `token ${access_token}`,
+        },
+      },
+    );
+    const apiKeysData = await apiKey.json();
+    console.log("apiKeysData", apiKeysData);
+    sfak = apiKeysData.data[0].secretKey;
+  } catch (error) {
+    console.log("error", error);
+    return Response.json(
+      { status: false, message: "fetch error" },
+      { status: 500 },
+    );
+  }
+  cookies().set("sfak", sfak);
+  redirect(`/`);
+}
diff --git a/app/components/chat.tsx b/app/components/chat.tsx
@@ -59,6 +59,7 @@ import {
   DEFAULT_TOPIC,
   ModelType,
   usePluginStore,
+  DEFAULT_CONFIG,
 } from "../store";
 
 import {
@@ -114,6 +115,7 @@ import { ExportMessageModal } from "./exporter";
 import { getClientConfig } from "../config/client";
 import { useAllModels } from "../utils/hooks";
 import { MultimodalContent } from "../client/api";
+import { useCookies } from "react-cookie";
 
 import { ClientApi } from "../client/api";
 import { createTTSPlayer } from "../utils/audio";
@@ -1284,6 +1286,64 @@ function _Chat() {
     return session.mask.hideContext ? [] : session.mask.context.slice();
   }, [session.mask.context, session.mask.hideContext]);
 
+  const [cookies, setCookie, removeCookie] = useCookies(["sfak"], {
+    doNotParse: true,
+  });
+
+  type ModelInfo = { id: string };
+  const updateCustomModels = async (apiURL: String, token: String) => {
+    const options = {
+      method: "GET",
+      headers: { Authorization: `Bearer ${token}` },
+    };
+    const res = await fetch(
+      `${apiURL}/v1/models?type=text&sub_type=chat`,
+      options,
+    ).then((res) => res.json());
+    const models = res.data as ModelInfo[];
+    config.update((c) => {
+      c.customModels = models
+        .map((m) => m.id)
+        .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
+        .join(",");
+    });
+  };
+  const updateDefaultModelConfig = (modelConfig: {
+    model: any;
+    providerName: any;
+  }) => {
+    const FeaturedModel = "Qwen/Qwen2-7B-Instruct";
+    if (modelConfig.model == DEFAULT_CONFIG.modelConfig.model) {
+      modelConfig.model = FeaturedModel as ModelType;
+      modelConfig.providerName = FeaturedModel as ServiceProvider;
+    }
+  };
+  useEffect(() => {
+    config.update((config) => {
+      if (accessStore.openaiApiKey) {
+        updateCustomModels(accessStore.openaiUrl, accessStore.openaiApiKey);
+      }
+      updateDefaultModelConfig(config.modelConfig);
+    });
+    const sfakValue = cookies.sfak;
+    if (sfakValue) {
+      const apiURL =
+        process.env.NEXT_PUBLIC_SF_NEXT_CHAT_SF_API_ENDPOINT ||
+        "https://api.siliconflow.cn";
+      chatStore.updateTargetSession(session, (session) => {
+        updateDefaultModelConfig(session.mask.modelConfig);
+      });
+      updateCustomModels(apiURL, sfakValue);
+      accessStore.update((access) => {
+        console.log("update access store with SF API key");
+        access.useCustomConfig = true;
+        access.openaiApiKey = sfakValue;
+        access.openaiUrl = apiURL;
+      });
+      removeCookie("sfak");
+    }
+  }, []);
+
   if (
     context.length === 0 &&
     session.messages.at(0)?.content !== BOT_HELLO.content

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
@@ -1,10 +1,13 @@
+import { useCookies } from "react-cookie";
 import React, { useEffect, useRef, useMemo, useState, Fragment } from "react";
 
 import styles from "./home.module.scss";
 
 import { IconButton } from "./button";
 import SettingsIcon from "../icons/settings.svg";
 import GithubIcon from "../icons/github.svg";
+import SiliconFlowIcon from "../icons/sf.svg";
+import SiliconFlowActiveIcon from "../icons/sf.active.svg";
 import ChatGptIcon from "../icons/chatgpt.svg";
 import AddIcon from "../icons/add.svg";
 import DeleteIcon from "../icons/delete.svg";
@@ -14,7 +17,12 @@ import DiscoveryIcon from "../icons/discovery.svg";
 
 import Locale from "../locales";
 
-import { useAppConfig, useChatStore } from "../store";
+import {
+  DEFAULT_CONFIG,
+  useAccessStore,
+  useAppConfig,
+  useChatStore,
+} from "../store";
 
 import {
   DEFAULT_SIDEBAR_WIDTH,
@@ -223,6 +231,10 @@ export function SideBar(props: { className?: string }) {
   const navigate = useNavigate();
   const config = useAppConfig();
   const chatStore = useChatStore();
+  const accessStore = useAccessStore();
+  const [cookies, setCookie, removeCookie] = useCookies(["sfak"], {
+    doNotParse: true,
+  });
 
   return (
     <SideBarContainer
@@ -315,6 +327,56 @@ export function SideBar(props: { className?: string }) {
                 />
               </a>
             </div>
+            <div className={styles["sidebar-action"]}>
+              <a
+                rel="noopener noreferrer"
+                onClick={() => {
+                  if (accessStore.useCustomConfig && accessStore.openaiApiKey) {
+                    const confirmLogout = window.confirm(
+                      "Are you sure you want to log out?",
+                    );
+                    if (confirmLogout) {
+                      chatStore.updateTargetSession(
+                        chatStore.currentSession(),
+                        (session) => {
+                          session.mask.modelConfig.model =
+                            DEFAULT_CONFIG.modelConfig.model;
+                          session.mask.modelConfig.providerName =
+                            DEFAULT_CONFIG.modelConfig.providerName;
+                          accessStore.update((access) => {
+                            removeCookie("sfak");
+                            access.openaiApiKey = "";
+                            access.useCustomConfig = false;
+                            window.location.href = "/";
+                          });
+                        },
+                      );
+                    }
+                  } else {
+                    window.location.href = `${
+                      process.env
+                        .NEXT_PUBLIC_SF_NEXT_CHAT_SF_ACCOUNT_ENDPOINT ||
+                      "https://account.siliconflow.cn"
+                    }/oauth?client_id=${
+                      process.env.NEXT_PUBLIC_SF_NEXT_CHAT_CLIENT_ID
+                    }`;
+                  }
+                }}
+              >
+                <IconButton
+                  aria={Locale.Export.MessageFromChatGPT}
+                  key={accessStore.openaiApiKey + accessStore.openaiUrl}
+                  icon={
+                    accessStore.useCustomConfig && accessStore.openaiApiKey ? (
+                      <SiliconFlowActiveIcon />
+                    ) : (
+                      <SiliconFlowIcon />
+                    )
+                  }
+                  shadow
+                />
+              </a>
+            </div>
           </>
         }
         secondaryAction={

diff --git a/app/constant.ts b/app/constant.ts
@@ -50,6 +50,7 @@ export enum Path {
 }
 
 export enum ApiPath {
+  OAuth = "/api/oauth_callback",
   Cors = "",
   Azure = "/api/azure",
   OpenAI = "/api/openai",
@@ -249,7 +250,7 @@ You are ChatGPT, a large language model trained by {{ServiceProvider}}.
 Knowledge cutoff: {{cutoff}}
 Current model: {{model}}
 Current time: {{time}}
-Latex inline: \\(x^2\\) 
+Latex inline: \\(x^2\\)
 Latex block: $$e=mc^2$$
 `;
 

diff --git a/app/icons/sf.active.svg b/app/icons/sf.active.svg
diff --git a/app/icons/sf.svg b/app/icons/sf.svg