✨ feat: add SenseNova (商汤) model provider #4162

hezhijie0327 · 2024-09-26T16:18:23Z

💻 变更类型 | Change Type

🔀 变更说明 | Description of Change

使用 OpenAI 兼容模式，初步实现对话
覆写 frequency_penalty 及 top_p 范围 ~~[TODO]~~ https://console.sensecore.cn/help/docs/model-as-a-service/nova/chat/ChatCompletions/ChatCompletion
禁用客户端模式，不支持
更新模型列表，版本 ~~[TODO]~~
添加商汤图标 ~~[TODO]~~ [Request] 帮忙增加下 SenseChat (SenseNova / SenseCore) 模型 Icon lobe-icons#43
APIToken 计算逻辑如下
a. 输入 AccessKeyID 及 AccessKeySecret，使用 : 进行拼接存入 apiKey
b. 计算时以 : 进行拆分，并按照官网文档参数进行 JWT 计算，并返回 apiKey
c. APIToken 有效期为当前时间的 -5s 至 +1800s，每次对话前会重新计算

Note:
~~1. 获取临时 TOKEN：https://console.sensecore.cn/iam/Security/private-security~~
~~2. 创建有效期 TOKEN: https://console.sensecore.cn/help/docs/model-as-a-service/nova/overview/Authorization~~
3. SenseChat-Vision 不支持 Base64 URL

📝 补充信息 | Additional Information

对话

工具调用

多模态

模型列表

vercel · 2024-09-26T16:18:28Z

@hezhijie0327 is attempting to deploy a commit to the LobeHub Pro Team on Vercel.

A member of the Team first needs to authorize it.

lobehubbot · 2024-09-26T16:18:38Z

👍 @hezhijie0327

Thank you for raising your pull request and contributing to our Community
Please make sure you have followed our contributing guidelines. We will review it as soon as possible.
If you encounter any problems, please feel free to connect with us.
非常感谢您提出拉取请求并为我们的社区做出贡献，请确保您已经遵循了我们的贡献指南，我们会尽快审查它。
如果您遇到任何问题，请随时与我们联系。

codecov · 2024-09-26T16:28:53Z

Codecov Report

Attention: Patch coverage is 92.50000% with 24 lines in your changes missing coverage. Please review.

Project coverage is 92.21%. Comparing base (04b58f8) to head (91bc2d2).

Files with missing lines	Patch %	Lines
src/services/_auth.ts	14.28%	12 Missing ⚠️
src/server/modules/AgentRuntime/index.ts	10.00%	9 Missing ⚠️
src/libs/agent-runtime/AgentRuntime.ts	57.14%	3 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff            @@
##             main    #4162    +/-   ##
========================================
  Coverage   92.21%   92.21%            
========================================
  Files         493      496     +3     
  Lines       35390    35710   +320     
  Branches     3403     3430    +27     
========================================
+ Hits        32634    32930   +296     
- Misses       2756     2780    +24

Flag	Coverage Δ
app	`92.21% <92.50%> (+<0.01%)`	⬆️
server	`97.37% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lobehubbot · 2024-09-26T16:29:08Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Codecov Report

Attention: Patch coverage is 94.88636% with 9 lines in your changes missing coverage. Please review.

Project coverage is 92.49%. Comparing base (40d347f) to head (68dd185).

Files with missing lines	Patch %	Lines
src/app/api/chat/agentRuntime.ts	14.28%	6 Missing ⚠️
src/libs/agent-runtime/AgentRuntime.ts	57.14%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4162      +/-   ##
==========================================
+ Coverage   92.48%   92.49%   +0.01%     
==========================================
  Files         482      484       +2     
  Lines       34488    34664     +176     
  Branches     3231     2139    -1092     
==========================================
+ Hits        31896    32063     +167     
- Misses       2592     2601       +9

Flag	Coverage Δ
app	`92.49% <94.88%> (+0.01%)`	⬆️
server	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

LovelyGuYiMeng · 2024-09-26T17:17:14Z

商汤的话，根据模型和体量，我建议放在零一万物和阶跃星辰中间
模型排序推荐如下样式：
SenseChat 5.5
SenseChat 5.5 Vision
SenseChat 5.0 Cantonese
SenseChat 5.0 Turbo
SenseChat 4.0
SenseChat 4.0 32k
SenseChat 4.0 128k
SenseChat Character
SenseChat Character Pro
默认开启就除了Cantonese和Character都开吧

lobehubbot · 2024-09-26T17:17:32Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

As for Shangtang, based on the model and volume, I suggest placing it between Zero One Thing and Stepping Stars.
The following style is recommended for model sorting:
SenseChat 5.5
SenseChat 5.0 (128K)
SenseChat 5.0 Cantonese
SenseChat 5.0 Turbo
SenseChat 5.0 Vision
SenseChat 4.0
SenseChat 4.0 32k
SenseChat Character
SenseChat Character Pro
5.5, 5.0 (except Cantonese), 4.0 and Character are not enabled by default.

…top_p` value range

LovelyGuYiMeng · 2024-09-27T02:52:04Z

128K模型是4.0，vision模型是5.5

lobehubbot · 2024-09-27T02:52:16Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

The 128K model is 4.0 and the vision model is 5.5

hezhijie0327 · 2024-09-27T07:27:08Z

欸这个等计算 API_TOKEN 这个做完并过去再改，先放 TODO...

商汤这个非固定 API Key 有点意思

lobehubbot · 2024-09-27T07:27:21Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Well, wait until the calculation of API_TOKEN is completed and then change it. Put TODO first...

SenseTime’s non-fixed API Key is a bit interesting

hezhijie0327 · 2024-09-27T13:51:39Z

@LovelyGuYiMeng 这个模型版本有点歧义，官网的几个文档信息貌似没同步... 由于模型广场中有更新时间，采信度较高，目前以这个为主

https://console.sensecore.cn/help/docs/model-as-a-service/nova/model/llm/GeneralLLM

https://platform.sensenova.cn/doc?path=/model/llm/GeneralLLM.md

https://console.sensecore.cn/aistudio/plaza?sort=sort_default&page=1&size=24

lobehubbot · 2024-09-27T13:51:52Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

@LovelyGuYiMeng This model version is a bit ambiguous. Several document information on the official website seems to be out of sync... Since there is an update time in the model square, it has a high degree of acceptance. Currently, this is the main one.

https://console.sensecore.cn/help/docs/model-as-a-service/nova/model/llm/GeneralLLM

https://platform.sensenova.cn/doc?path=/model/llm/GeneralLLM.md

https://console.sensecore.cn/aistudio/plaza?sort=sort_default&page=1&size=24

LovelyGuYiMeng · 2024-09-27T14:39:29Z

我个人感觉https://platform.sensenova.cn/doc?path=/model/llm/GeneralLLM.md 的正确
另外你再看这个价格列表的模型版本号，也是一样https://platform.sensenova.cn/pricing
再不确定的话我已经发邮件问商汤支持了，等回复看看也行

lobehubbot · 2024-09-27T14:39:43Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

I personally feel that https://platform.sensenova.cn/doc?path=/model/llm/GeneralLLM.md is correct
In addition, if you look at the model version number of this price list, it is the same https://platform.sensenova.cn/pricing
If you are still unsure, I have already sent an email to ask SenseTime for support. I will wait and see for the reply.

hezhijie0327 · 2024-09-30T23:40:07Z

已更新 i18n

src/services/_auth.ts

arvinxx · 2024-10-12T03:11:05Z

src/libs/agent-runtime/sensenova/authToken.ts

@@ -0,0 +1,34 @@
+import CryptoJS from 'crypto-js';


crypto-js 是 Nodejs 的模块吗？

外部模块，原生的 crypto 不支持 edge 环境...

jose 能生成 token 但是异步调用有点问题，暂时想不出来该咋解了...

jose 可能会有个问题是不支持 http 协议？如果直接用 jose 的话感觉可以试试我之前给 zhipu 做的方案：

await LobeZhipuAI.fromAPIKey(params.zhipu);

lobe-chat/src/libs/agent-runtime/zhipu/index.ts

Lines 27 to 46 in b7258b9

static async fromAPIKey({ apiKey, baseURL = DEFAULT_BASE_URL, ...res }: ClientOptions = {}) {

const invalidZhipuAPIKey = AgentRuntimeError.createError(

AgentRuntimeErrorType.InvalidProviderAPIKey,

);

if (!apiKey) throw invalidZhipuAPIKey;

let token: string;

try {

token = await generateApiToken(apiKey);

} catch {

throw invalidZhipuAPIKey;

}

const header = { Authorization: `Bearer ${token}` };

const llm = new OpenAI({ apiKey, baseURL, defaultHeaders: header, ...res });

return new LobeZhipuAI(llm);

}

jose 走异步，createRuntime 这里方法就调用不了，仅实现了从环境变量生成，暂时回退回去用 crypto-js

为啥要走 createRuntime 呢？之前我给zhipu 初始化就是用的异步方案。 Wenxin 创建独立runtime 是因为它的sdk不支持edge runtime。如果能用 jose 解决签名问题，感觉没有必要用createRuntime 吧？

哎有点绕不出来了，没啥思路...

…erateJWTToken`

…-es`" This reverts commit 9655c92.

…t 1)

…now (Part 1)"

✨ feat: add SenseCore (商汤) model provider

68dd185

💄 style: update model list, fix frequency_penalty, temperature, `…

6eb44e1

…top_p` value range

hezhijie0327 added 7 commits September 27, 2024 15:55

🔨 chore: add jwt api token calculate

60b1518

Merge branch 'main' into sensecore

4f66f4a

🔨 chore: remove SENSECORE_API_KEY ENV

ba7936b

Update authToken.ts

5ab9382

🔨 chore: add debug logs

561a685

Merge branch 'lobehub:main' into sensecore

c265d27

♻️ refactor: rollback changes, remove JWT

558a3b9

hezhijie0327 mentioned this pull request Sep 27, 2024

[Request] 帮忙增加下 SenseChat (SenseNova / SenseCore) 模型 Icon lobehub/lobe-icons#43

Closed

Merge branch 'main' into sensecore

7906e66

hezhijie0327 marked this pull request as ready for review September 27, 2024 14:11

dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. 🌠 Feature Request New feature or request | 特性与建议 labels Sep 27, 2024

👷 build: add docker ENV, SENSECORE_API_KEY & SENSECORE_MODEL_LIST

1dbfa3a

🔨 chore: cleanup

ccf6fdd

hezhijie0327 added 2 commits October 1, 2024 00:36

🐛 fix: fix build error

d8a0960

🔨 chore: add i18n

a9b62a7

hezhijie0327 added 7 commits October 1, 2024 13:25

Merge branch 'main' into sensecore

a185f88

Merge branch 'main' into sensecore

3bee90b

🐛 fix: fix PR conflicts

bbd9233

Merge branch 'main' into sensecore

3d4544b

🐛 fix: fix route ci error

858001c

🐛 fix: fix PR conflicts

f1b9af7

Merge branch 'main' into sensecore

fd8230d

arvinxx reviewed Oct 12, 2024

View reviewed changes

hezhijie0327 added 5 commits October 12, 2024 16:35

Merge branch 'lobehub:main' into sensecore

2807828

♻️ refactor: move generateJwtTokenSenseNova to `LobeSenseNovaAI.gen…

57613c4

…erateJWTToken`

Update index.ts

5777b22

rollback changes, submit wrong branch

6bf15a7

Merge branch 'main' into sensecore

c658cc4

dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels Oct 12, 2024

hezhijie0327 added 12 commits October 13, 2024 06:34

🐛 fix: fix CI error, refactor the chat webapi

debaca5

♻️ refactor: replace deprecated module crypto-js to crypto-es

9655c92

Revert "♻️ refactor: replace deprecated module crypto-js to `crypto…

e1c12f8

…-es`" This reverts commit 9655c92.

♻️ refactor: replace crypto-js to jose, only support ENV now (Par…

0592472

…t 1)

Merge branch 'main' into sensecore

d843f48

Revert "♻️ refactor: replace crypto-js to jose, only support ENV …

721984e

…now (Part 1)"

♻️ refactor: using jose to generate the APIToken

7874ba5

Merge branch 'main' into sensecore

50b5c6a

🔨 chore: remove debug code

833b1c0

🔨 chore: cleanup package, remove crypto-js

fd214fb

🔨 chore: add unit test

ffcb623

🔨 chore: optimize jwt generate process

91bc2d2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ feat: add SenseNova (商汤) model provider #4162

✨ feat: add SenseNova (商汤) model provider #4162

hezhijie0327 commented Sep 26, 2024 •

edited

Loading

vercel bot commented Sep 26, 2024

lobehubbot commented Sep 26, 2024

codecov bot commented Sep 26, 2024 •

edited

Loading

lobehubbot commented Sep 26, 2024

LovelyGuYiMeng commented Sep 26, 2024 •

edited

Loading

lobehubbot commented Sep 26, 2024

LovelyGuYiMeng commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

LovelyGuYiMeng commented Sep 27, 2024 •

edited

Loading

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 30, 2024

arvinxx Oct 12, 2024

hezhijie0327 Oct 12, 2024

arvinxx Oct 12, 2024

hezhijie0327 Oct 13, 2024

arvinxx Oct 13, 2024

hezhijie0327 Oct 13, 2024

hezhijie0327 Oct 14, 2024

	static async fromAPIKey({ apiKey, baseURL = DEFAULT_BASE_URL, ...res }: ClientOptions = {}) {
	const invalidZhipuAPIKey = AgentRuntimeError.createError(
	AgentRuntimeErrorType.InvalidProviderAPIKey,
	);

	if (!apiKey) throw invalidZhipuAPIKey;

	let token: string;

	try {
	token = await generateApiToken(apiKey);
	} catch {
	throw invalidZhipuAPIKey;
	}

	const header = { Authorization: `Bearer ${token}` };
	const llm = new OpenAI({ apiKey, baseURL, defaultHeaders: header, ...res });

	return new LobeZhipuAI(llm);
	}

✨ feat: add SenseNova (商汤) model provider #4162

Are you sure you want to change the base?

✨ feat: add SenseNova (商汤) model provider #4162

Conversation

hezhijie0327 commented Sep 26, 2024 • edited Loading

💻 变更类型 | Change Type

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

vercel bot commented Sep 26, 2024

lobehubbot commented Sep 26, 2024

codecov bot commented Sep 26, 2024 • edited Loading

Codecov Report

lobehubbot commented Sep 26, 2024

Codecov Report

LovelyGuYiMeng commented Sep 26, 2024 • edited Loading

lobehubbot commented Sep 26, 2024

LovelyGuYiMeng commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 27, 2024

lobehubbot commented Sep 27, 2024

LovelyGuYiMeng commented Sep 27, 2024 • edited Loading

lobehubbot commented Sep 27, 2024

hezhijie0327 commented Sep 30, 2024

arvinxx Oct 12, 2024

Choose a reason for hiding this comment

hezhijie0327 Oct 12, 2024

Choose a reason for hiding this comment

arvinxx Oct 12, 2024

Choose a reason for hiding this comment

hezhijie0327 Oct 13, 2024

Choose a reason for hiding this comment

arvinxx Oct 13, 2024

Choose a reason for hiding this comment

hezhijie0327 Oct 13, 2024

Choose a reason for hiding this comment

hezhijie0327 Oct 14, 2024

Choose a reason for hiding this comment

hezhijie0327 commented Sep 26, 2024 •

edited

Loading

codecov bot commented Sep 26, 2024 •

edited

Loading

LovelyGuYiMeng commented Sep 26, 2024 •

edited

Loading

LovelyGuYiMeng commented Sep 27, 2024 •

edited

Loading