diff --git a/Makefile b/Makefile
index 35b78d5..51e569a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: build-frontend start-backend
build-frontend:
@echo "Building frontend..."
- @cd $(FRONTEND_DIR) && yarn install --network-timeout 1000000 && DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) yarn build
+ @cd $(FRONTEND_DIR) && yarn install --network-timeout 1000000 && DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat VERSION) yarn build
start-backend:
@echo "Starting backend dev server..."
diff --git a/relay/channel/gemini/adaptor.go b/relay/channel/gemini/adaptor.go
index a275175..daaadc5 100644
--- a/relay/channel/gemini/adaptor.go
+++ b/relay/channel/gemini/adaptor.go
@@ -18,16 +18,28 @@ type Adaptor struct {
func (a *Adaptor) Init(info *relaycommon.RelayInfo, request dto.GeneralOpenAIRequest) {
}
+// 定义一个映射，存储模型名称和对应的版本
+var modelVersionMap = map[string]string{
+ "gemini-1.5-pro-latest": "v1beta",
+ "gemini-ultra": "v1beta",
+}
+
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
- version := "v1"
- if info.ApiVersion != "" {
- version = info.ApiVersion
- }
- action := "generateContent"
- if info.IsStream {
- action = "streamGenerateContent"
- }
- return fmt.Sprintf("%s/%s/models/%s:%s", info.BaseUrl, version, info.UpstreamModelName, action), nil
+ // 从映射中获取模型名称对应的版本，如果找不到就使用 info.ApiVersion 或默认的版本 "v1"
+ version, beta := modelVersionMap[info.UpstreamModelName]
+ if !beta {
+ if info.ApiVersion != "" {
+ version = info.ApiVersion
+ } else {
+ version = "v1"
+ }
+ }
+
+ action := "generateContent"
+ if info.IsStream {
+ action = "streamGenerateContent"
+ }
+ return fmt.Sprintf("%s/%s/models/%s:%s", info.BaseUrl, version, info.UpstreamModelName, action), nil
}
func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *relaycommon.RelayInfo) error {
diff --git a/relay/channel/gemini/constant.go b/relay/channel/gemini/constant.go
index 582f4c0..5e833bc 100644
--- a/relay/channel/gemini/constant.go
+++ b/relay/channel/gemini/constant.go
@@ -5,8 +5,8 @@ const (
)
var ModelList = []string{
- "gemini-pro", "gemini-1.0-pro-001", "gemini-1.5-pro",
- "gemini-pro-vision", "gemini-1.0-pro-vision-001",
+ "gemini-1.0-pro-latest", "gemini-1.0-pro-001", "gemini-1.5-pro-latest", "gemini-ultra",
+ "gemini-1.0-pro-vision-latest", "gemini-1.0-pro-vision-001",
}
var ChannelName = "google gemini"
diff --git a/relay/channel/xunfei/relay-xunfei.go b/relay/channel/xunfei/relay-xunfei.go
index da86002..1690e96 100644
--- a/relay/channel/xunfei/relay-xunfei.go
+++ b/relay/channel/xunfei/relay-xunfei.go
@@ -179,7 +179,13 @@ func xunfeiHandler(c *gin.Context, textRequest dto.GeneralOpenAIRequest, appId s
case stop = <-stopChan:
}
}
-
+ if len(xunfeiResponse.Payload.Choices.Text) == 0 {
+ xunfeiResponse.Payload.Choices.Text = []XunfeiChatResponseTextItem{
+ {
+ Content: "",
+ },
+ }
+ }
xunfeiResponse.Payload.Choices.Text[0].Content = content
response := responseXunfei2OpenAI(&xunfeiResponse)
diff --git a/web/src/components/ChannelsTable.js b/web/src/components/ChannelsTable.js
index 0d2ed57..3e3930c 100644
--- a/web/src/components/ChannelsTable.js
+++ b/web/src/components/ChannelsTable.js
@@ -254,6 +254,19 @@ const ChannelsTable = () => {
>
编辑
+ {
+ copySelectedChannel(record.id);
+ }}
+ >
+
+
),
},
@@ -340,6 +353,33 @@ const ChannelsTable = () => {
setLoading(false);
};
+ const copySelectedChannel = async (id) => {
+ const channelToCopy = channels.find(
+ (channel) => String(channel.id) === String(id),
+ );
+ console.log(channelToCopy);
+ channelToCopy.name += '_复制';
+ channelToCopy.created_time = null;
+ channelToCopy.balance = 0;
+ channelToCopy.used_quota = 0;
+ if (!channelToCopy) {
+ showError('渠道未找到，请刷新页面后重试。');
+ return;
+ }
+ try {
+ const newChannel = { ...channelToCopy, id: undefined };
+ const response = await API.post('/api/channel/', newChannel);
+ if (response.data.success) {
+ showSuccess('渠道复制成功');
+ await refresh();
+ } else {
+ showError(response.data.message);
+ }
+ } catch (error) {
+ showError('渠道复制失败: ' + error.message);
+ }
+ };
+
const refresh = async () => {
await loadChannels(activePage - 1, pageSize, idSort);
};
diff --git a/web/src/components/HeaderBar.js b/web/src/components/HeaderBar.js
index a5da4df..5510d42 100644
--- a/web/src/components/HeaderBar.js
+++ b/web/src/components/HeaderBar.js
@@ -1,6 +1,7 @@
import React, { useContext, useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import { UserContext } from '../context/User';
+import { useSetTheme, useTheme } from '../context/Theme';
import { API, getLogo, getSystemName, showSuccess } from '../helpers';
import '../index.css';
@@ -34,10 +35,8 @@ const HeaderBar = () => {
let navigate = useNavigate();
const [showSidebar, setShowSidebar] = useState(false);
- const [dark, setDark] = useState(false);
const systemName = getSystemName();
const logo = getLogo();
- var themeMode = localStorage.getItem('theme-mode');
const currentDate = new Date();
// enable fireworks on new year(1.1 and 2.9-2.24)
const isNewYear =
@@ -66,26 +65,19 @@ const HeaderBar = () => {
}, 3000);
};
+ const theme = useTheme();
+ const setTheme = useSetTheme();
+
useEffect(() => {
- if (themeMode === 'dark') {
- switchMode(true);
+ if (theme === 'dark') {
+ document.body.setAttribute('theme-mode', 'dark');
}
+
if (isNewYear) {
console.log('Happy New Year!');
}
}, []);
- const switchMode = (model) => {
- const body = document.body;
- if (!model) {
- body.removeAttribute('theme-mode');
- localStorage.setItem('theme-mode', 'light');
- } else {
- body.setAttribute('theme-mode', 'dark');
- localStorage.setItem('theme-mode', 'dark');
- }
- setDark(model);
- };
return (
<>
@@ -132,9 +124,11 @@ const HeaderBar = () => {
{
+ setTheme(checked);
+ }}
/>
{userState.user ? (
<>
diff --git a/web/src/components/OperationSetting.js b/web/src/components/OperationSetting.js
index 14b70d7..7a112e5 100644
--- a/web/src/components/OperationSetting.js
+++ b/web/src/components/OperationSetting.js
@@ -8,6 +8,8 @@ import {
verifyJSON,
} from '../helpers';
+import { useTheme } from '../context/Theme';
+
const OperationSetting = () => {
let now = new Date();
let [inputs, setInputs] = useState({
@@ -77,6 +79,9 @@ const OperationSetting = () => {
}
};
+ const theme = useTheme();
+ const isDark = theme === 'dark';
+
useEffect(() => {
getOptions().then();
}, []);
@@ -219,8 +224,10 @@ const OperationSetting = () => {
return (
-