Revert "Merge branch 'songquanpeng:main' into main"

This reverts commit b2cc54fc5f, reversing changes made to e187fe0490.
2025-11-11 02:43:44 +08:00 · 2024-11-09 20:18:14 +08:00
parent e5fff395f5
commit d0b11a99b9
21 changed files with 38 additions and 114 deletions
--- a/web/air/src/components/TokensTable.js
+++ b/web/air/src/components/TokensTable.js
@@ -395,7 +395,7 @@ const TokensTable = () => {
        url = mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
        break;
      case 'lobechat':
-        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
        break;
      default:
        if (!chatLink) {
--- a/web/air/src/pages/Channel/EditChannel.js
+++ b/web/air/src/pages/Channel/EditChannel.js
@@ -63,7 +63,7 @@ const EditChannel = (props) => {
            let localModels = [];
            switch (value) {
                case 14:
-                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20241022"];
+                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-sonnet-20240620"];
                    break;
                case 11:
                    localModels = ['PaLM-2'];
@@ -78,7 +78,7 @@ const EditChannel = (props) => {
                    localModels = ['chatglm_pro', 'chatglm_std', 'chatglm_lite'];
                    break;
                case 18:
-                    localModels = ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v3.5-32K', 'SparkDesk-v4.0'];
+                    localModels = ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v4.0'];
                    break;
                case 19:
                    localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1'];
--- a/web/berry/src/views/Channel/type/Config.js
+++ b/web/berry/src/views/Channel/type/Config.js
@@ -91,7 +91,7 @@ const typeConfig = {
      other: '版本号'
    },
    input: {
-      models: ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v3.5-32K', 'SparkDesk-v4.0']
+      models: ['SparkDesk', 'SparkDesk-v1.1', 'SparkDesk-v2.1', 'SparkDesk-v3.1', 'SparkDesk-v3.1-128K', 'SparkDesk-v3.5', 'SparkDesk-v4.0']
    },
    prompt: {
      key: '按照如下格式输入：APPID|APISecret|APIKey',
--- a/web/berry/src/views/Token/component/TableRow.js
+++ b/web/berry/src/views/Token/component/TableRow.js
@@ -33,7 +33,7 @@ const COPY_OPTIONS = [
  },
  { key: 'ama', text: 'BotGem', url: 'ama://set-api-key?server={serverAddress}&key=sk-{key}', encode: true },
  { key: 'opencat', text: 'OpenCat', url: 'opencat://team/join?domain={serverAddress}&token=sk-{key}', encode: true },
-  { key: 'lobechat', text: 'LobeChat', url: 'https://lobehub.com/?settings={"keyVaults":{"openai":{"apiKey":"sk-{key}","baseURL":"{serverAddress}"}}}', encode: true }
+  { key: 'lobechat', text: 'LobeChat', url: 'https://lobehub.com/?settings={"keyVaults":{"openai":{"apiKey":"user-key","baseURL":"https://your-proxy.com/v1"}}}', encode: true }
 ];

 function replacePlaceholders(text, key, serverAddress) {
--- a/web/default/src/components/ChannelsTable.js
+++ b/web/default/src/components/ChannelsTable.js
@@ -59,12 +59,6 @@ function renderBalance(type, balance) {
  }
 }

-function isShowDetail() {
-  return localStorage.getItem("show_detail") === "true";
-}
-
-const promptID = "detail"
-
 const ChannelsTable = () => {
  const [channels, setChannels] = useState([]);
  const [loading, setLoading] = useState(true);
@@ -72,8 +66,7 @@ const ChannelsTable = () => {
  const [searchKeyword, setSearchKeyword] = useState('');
  const [searching, setSearching] = useState(false);
  const [updatingBalance, setUpdatingBalance] = useState(false);
-  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt(promptID));
-  const [showDetail, setShowDetail] = useState(isShowDetail());
+  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt("channel-test"));

  const loadChannels = async (startIdx) => {
    const res = await API.get(`/api/channel/?p=${startIdx}`);
@@ -127,11 +120,6 @@ const ChannelsTable = () => {
    await loadChannels(activePage - 1);
  };

-  const toggleShowDetail = () => {
-    setShowDetail(!showDetail);
-    localStorage.setItem("show_detail", (!showDetail).toString());
-  }
-
  useEffect(() => {
    loadChannels(0)
      .then()
@@ -376,13 +364,11 @@ const ChannelsTable = () => {
        showPrompt && (
          <Message onDismiss={() => {
            setShowPrompt(false);
-            setPromptShown(promptID);
+            setPromptShown("channel-test");
          }}>
            OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
            <br/>
            渠道测试仅支持 chat 模型，优先使用 gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。
-            <br/>
-            点击下方详情按钮可以显示余额以及设置额外的测试模型。
          </Message>
        )
      }
@@ -442,7 +428,6 @@ const ChannelsTable = () => {
              onClick={() => {
                sortChannel('balance');
              }}
-              hidden={!showDetail}
            >
              余额
            </Table.HeaderCell>
@@ -454,7 +439,7 @@ const ChannelsTable = () => {
            >
              优先级
            </Table.HeaderCell>
-            <Table.HeaderCell hidden={!showDetail}>测试模型</Table.HeaderCell>
+            <Table.HeaderCell>测试模型</Table.HeaderCell>
            <Table.HeaderCell>操作</Table.HeaderCell>
          </Table.Row>
        </Table.Header>
@@ -482,7 +467,7 @@ const ChannelsTable = () => {
                      basic
                    />
                  </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                    <Popup
                      trigger={<span onClick={() => {
                        updateChannelBalance(channel.id, channel.name, idx);
@@ -509,7 +494,7 @@ const ChannelsTable = () => {
                      basic
                    />
                  </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                    <Dropdown
                      placeholder='请选择测试模型'
                      selection
@@ -588,7 +573,7 @@ const ChannelsTable = () => {

        <Table.Footer>
          <Table.Row>
-            <Table.HeaderCell colSpan={showDetail ? "10" : "8"}>
+            <Table.HeaderCell colSpan='9'>
              <Button size='small' as={Link} to='/channel/add' loading={loading}>
                添加新的渠道
              </Button>
@@ -626,7 +611,6 @@ const ChannelsTable = () => {
                }
              />
              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
-              <Button size='small' onClick={toggleShowDetail}>{showDetail ? "隐藏详情" : "详情"}</Button>
            </Table.HeaderCell>
          </Table.Row>
        </Table.Footer>
--- a/web/default/src/components/TokensTable.js
+++ b/web/default/src/components/TokensTable.js
@@ -117,7 +117,7 @@ const TokensTable = () => {
        url = nextUrl;
        break;
      case 'lobechat':
-        url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
        break;
      default:
        url = `sk-${key}`;
@@ -160,7 +160,7 @@ const TokensTable = () => {
        break;

      case 'lobechat':
-        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}"/v1"}}}`;
        break;

      default:
--- a/web/default/src/pages/Channel/index.js
+++ b/web/default/src/pages/Channel/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Header, Segment } from 'semantic-ui-react';
 import ChannelsTable from '../../components/ChannelsTable';

-const Channel = () => (
+const File = () => (
  <>
    <Segment>
      <Header as='h3'>管理渠道</Header>
@@ -11,4 +11,4 @@ const Channel = () => (
  </>
 );

-export default Channel;
+export default File;