Date: Mon, 6 May 2024 17:18:04 +0800
Subject: [PATCH 7/9] --amend
---
web/src/components/MjLogsTable.js | 34 +++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js
index f22ddae..e86ee31 100644
--- a/web/src/components/MjLogsTable.js
+++ b/web/src/components/MjLogsTable.js
@@ -236,6 +236,31 @@ const renderTimestamp = (timestampInSeconds) => {
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 格式化输出
};
+// 修改renderDuration函数以包含颜色逻辑
+function renderDuration(submit_time, finishTime) {
+ // 确保startTime和finishTime都是有效的时间戳
+ if (!submit_time || !finishTime) return 'N/A';
+
+ // 将时间戳转换为Date对象
+ const start = new Date(submit_time);
+ const finish = new Date(finishTime);
+
+ // 计算时间差（毫秒）
+ const durationMs = finish - start;
+
+ // 将时间差转换为秒，并保留一位小数
+ const durationSec = (durationMs / 1000).toFixed(1);
+
+ // 设置颜色：大于60秒则为红色，小于等于60秒则为绿色
+ const color = durationSec > 60 ? 'red' : 'green';
+
+ // 返回带有样式的颜色标签
+ return (
+
+ {durationSec} 秒
+
+ );
+}
const LogsTable = () => {
const [isModalOpen, setIsModalOpen] = useState(false);
@@ -248,6 +273,15 @@ const LogsTable = () => {
return {renderTimestamp(text / 1000)}
;
},
},
+ {
+ title: '花费时间',
+ dataIndex: 'finish_time', // 以finish_time作为dataIndex
+ key: 'finish_time',
+ render: (finish, record) => {
+ // 假设record.start_time是存在的，并且finish是完成时间的时间戳
+ return renderDuration(record.submit_time, finish);
+ },
+ },
{
title: '渠道',
dataIndex: 'channel_id',
From 2bf404507ffce05a771299a8d396b71dfb60ddc2 Mon Sep 17 00:00:00 2001
From: "1808837298@qq.com" <1808837298@qq.com>
Date: Wed, 8 May 2024 16:46:06 +0800
Subject: [PATCH 8/9] fix: update user (#230)
---
model/user.go | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/model/user.go b/model/user.go
index 3e7169a..eab8ced 100644
--- a/model/user.go
+++ b/model/user.go
@@ -253,14 +253,17 @@ func (user *User) Edit(updatePassword bool) error {
}
}
newUser := *user
- DB.First(&user, user.Id)
- err = DB.Model(user).Updates(map[string]interface{}{
+ updates := map[string]interface{}{
"username": newUser.Username,
- "password": newUser.Password,
"display_name": newUser.DisplayName,
"group": newUser.Group,
"quota": newUser.Quota,
- }).Error
+ }
+ if updatePassword {
+ updates["password"] = newUser.Password
+ }
+ DB.First(&user, user.Id)
+ err = DB.Model(user).Updates(updates).Error
if err == nil {
if common.RedisEnabled {
_ = common.RedisSet(fmt.Sprintf("user_group:%d", user.Id), user.Group, time.Duration(UserId2GroupCacheSeconds)*time.Second)
From d7a343e2f686fba0aa1cb3294dcf2f9c5bbe51c0 Mon Sep 17 00:00:00 2001
From: "1808837298@qq.com" <1808837298@qq.com>
Date: Wed, 8 May 2024 16:57:11 +0800
Subject: [PATCH 9/9] feat: update model ratio
---
common/model-ratio.go | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/model-ratio.go b/common/model-ratio.go
index 9d6c446..b0a97c0 100644
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -111,6 +111,8 @@ var DefaultModelRatio = map[string]float64{
"command-light-nightly": 0.5,
"command-r": 0.25,
"command-r-plus ": 1.5,
+ "deepseek-chat": 0.07,
+ "deepseek-coder": 0.07,
}
var DefaultModelPrice = map[string]float64{
@@ -240,6 +242,9 @@ func GetCompletionRatio(name string) float64 {
return 2
}
}
+ if strings.HasPrefix(name, "deepseek") {
+ return 2
+ }
switch name {
case "llama2-70b-4096":
return 0.8 / 0.7