ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-17 12:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-07-15 19:36:01 +08:00
parent a2b35415f9
commit 8d4bbdebc2
2 changed files with 144 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
modules/ai/src/main/java/com/bytedesk/ai/springai/providers/zhipuai/SpringAIZhipuaiService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-02-26 16:58:56
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-07-15 19:00:30
* @LastEditTime: 2025-07-15 19:33:33
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -343,7 +343,91 @@ public class SpringAIZhipuaiService extends BaseSpringAIService {
// 2. usage.completion_tokens
// 3. usage.total_tokens
Object usage = metadata.get("usage");
// 尝试从metadata中直接获取usage对象
Object usage = null;
// 方法1: 尝试通过反射获取usage字段
try {
java.lang.reflect.Field usageField = metadata.getClass().getDeclaredField("usage");
usageField.setAccessible(true);
usage = usageField.get(metadata);
log.info("Zhipuai API found usage field via reflection: {}", usage);
} catch (Exception e) {
log.debug("Could not get usage field via reflection: {}", e.getMessage());
}
// 方法2: 如果反射失败，尝试从metadata的toString()中解析
if (usage == null) {
String metadataStr = metadata.toString();
log.info("Zhipuai API parsing metadata string: {}", metadataStr);
// 查找usage信息，格式通常是: DefaultUsage{promptTokens=16, completionTokens=14, totalTokens=30}
if (metadataStr.contains("DefaultUsage{") || metadataStr.contains("usage:")) {
// 提取promptTokens
int promptStart = metadataStr.indexOf("promptTokens=");
int promptEnd = metadataStr.indexOf(",", promptStart);
if (promptEnd == -1) promptEnd = metadataStr.indexOf("}", promptStart);
// 提取completionTokens
int completionStart = metadataStr.indexOf("completionTokens=");
int completionEnd = metadataStr.indexOf(",", completionStart);
if (completionEnd == -1) completionEnd = metadataStr.indexOf("}", completionStart);
// 提取totalTokens
int totalStart = metadataStr.indexOf("totalTokens=");
int totalEnd = metadataStr.indexOf("}", totalStart);
long promptTokens = 0;
long completionTokens = 0;
long totalTokens = 0;
if (promptStart > 0 && promptEnd > promptStart) {
try {
promptTokens = Long.parseLong(metadataStr.substring(promptStart + 13, promptEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse promptTokens from: {}", metadataStr.substring(promptStart + 13, promptEnd));
}
}
if (completionStart > 0 && completionEnd > completionStart) {
try {
completionTokens = Long.parseLong(metadataStr.substring(completionStart + 17, completionEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse completionTokens from: {}", metadataStr.substring(completionStart + 17, completionEnd));
}
}
if (totalStart > 0 && totalEnd > totalStart) {
try {
totalTokens = Long.parseLong(metadataStr.substring(totalStart + 12, totalEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse totalTokens from: {}", metadataStr.substring(totalStart + 12, totalEnd));
}
}
// 如果没有total_tokens，计算它
if (totalTokens == 0 && (promptTokens > 0 || completionTokens > 0)) {
totalTokens = promptTokens + completionTokens;
}
// 如果只有total_tokens，估算prompt和completion
if (totalTokens > 0 && (promptTokens == 0 || completionTokens == 0)) {
if (promptTokens == 0) {
promptTokens = (long) (totalTokens * 0.3);
}
if (completionTokens == 0) {
completionTokens = totalTokens - promptTokens;
}
}
log.info("Zhipuai API manual token extraction result from string parsing - prompt: {}, completion: {}, total: {}",
promptTokens, completionTokens, totalTokens);
return new TokenUsage(promptTokens, completionTokens, totalTokens);
}
}
// 方法3: 尝试从usage对象中提取（如果通过反射获取到了）
if (usage != null) {
log.info("Zhipuai API found usage field: {}", usage);
@@ -355,19 +439,19 @@ public class SpringAIZhipuaiService extends BaseSpringAIService {
long totalTokens = 0;
// 提取prompt_tokens
Object promptObj = usageMap.get("prompt_tokens");
Object promptObj = usageMap.get("promptTokens");
if (promptObj instanceof Number) {
promptTokens = ((Number) promptObj).longValue();
}
// 提取completion_tokens
Object completionObj = usageMap.get("completion_tokens");
Object completionObj = usageMap.get("completionTokens");
if (completionObj instanceof Number) {
completionTokens = ((Number) completionObj).longValue();
}
// 提取total_tokens
Object totalObj = usageMap.get("total_tokens");
Object totalObj = usageMap.get("totalTokens");
if (totalObj instanceof Number) {
totalTokens = ((Number) totalObj).longValue();
}

60
modules/ai/src/main/java/com/bytedesk/ai/springai/service/BaseSpringAIService.java
View File

@@ -1152,12 +1152,62 @@ public abstract class BaseSpringAIService implements SpringAIService {
key, value, value != null ? value.getClass().getName() : "null");
}
// 尝试从metadata的toString()中解析usage信息
String metadataStr = metadata.toString();
log.info("BaseSpringAIService extractTokenUsage parsing metadata string: {}", metadataStr);
// 查找usage信息，格式通常是: DefaultUsage{promptTokens=16, completionTokens=14, totalTokens=30}
if (metadataStr.contains("DefaultUsage{") || metadataStr.contains("usage:")) {
// 提取promptTokens
int promptStart = metadataStr.indexOf("promptTokens=");
int promptEnd = metadataStr.indexOf(",", promptStart);
if (promptEnd == -1) promptEnd = metadataStr.indexOf("}", promptStart);
// 提取completionTokens
int completionStart = metadataStr.indexOf("completionTokens=");
int completionEnd = metadataStr.indexOf(",", completionStart);
if (completionEnd == -1) completionEnd = metadataStr.indexOf("}", completionStart);
// 提取totalTokens
int totalStart = metadataStr.indexOf("totalTokens=");
int totalEnd = metadataStr.indexOf("}", totalStart);
if (promptStart > 0 && promptEnd > promptStart) {
try {
prompt = Long.parseLong(metadataStr.substring(promptStart + 13, promptEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse promptTokens from: {}", metadataStr.substring(promptStart + 13, promptEnd));
}
}
if (completionStart > 0 && completionEnd > completionStart) {
try {
completion = Long.parseLong(metadataStr.substring(completionStart + 17, completionEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse completionTokens from: {}", metadataStr.substring(completionStart + 17, completionEnd));
}
}
if (totalStart > 0 && totalEnd > totalStart) {
try {
total = Long.parseLong(metadataStr.substring(totalStart + 12, totalEnd));
} catch (NumberFormatException e) {
log.warn("Could not parse totalTokens from: {}", metadataStr.substring(totalStart + 12, totalEnd));
}
}
log.info("BaseSpringAIService extractTokenUsage parsed from string - prompt: {}, completion: {}, total: {}",
prompt, completion, total);
}
// 尝试从response的其他部分提取token信息
total = extractTokenUsageFromResponse(chatResponse);
if (total > 0) {
// 简单估算：假设prompt占30%，completion占70%
prompt = (long) (total * 0.3);
completion = total - prompt;
if (total == 0) {
total = extractTokenUsageFromResponse(chatResponse);
if (total > 0) {
// 简单估算：假设prompt占30%，completion占70%
prompt = (long) (total * 0.3);
completion = total - prompt;
}
}
}
}