JavaWeb/QQBot
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(gpt): 支持硅基大模型并优化 GPT功能

Browse Source 
- 新增对硅基大模型的支持，可通过指令切换使用
- 优化 GPT 模型切换逻辑，支持更多自定义选项
- 优化日志级别和网络请求超时设置
This commit is contained in:
Yutou 2025-02-10 13:44:31 +08:00
parent 864d5960a7
commit 068964145f
6 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yutou/okhttp/api/BaseApi.java
View File

@ -18,6 +18,7 @@ import retrofit2.Retrofit;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
public class BaseApi {
@ -97,6 +98,10 @@ public class BaseApi {
loggingInterceptor.setPrintLevel(HttpLoggingInterceptor.Level.BODY);
OkHttpClient.Builder builder = new OkHttpClient()
.newBuilder()
.callTimeout(2, TimeUnit.MINUTES)
.readTimeout(2, TimeUnit.MINUTES)
.connectTimeout(2, TimeUnit.MINUTES)
.writeTimeout(2, TimeUnit.MINUTES)
.addInterceptor(initQuery())
.addInterceptor(loggingInterceptor);
return create(builder.build(),

2
src/main/java/com/yutou/qqbot/QQBotApplication.java
View File

@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class QQBotApplication {
public static final String version = "QQBot v.1.7.10";
public static final String version = "QQBot v.1.7.11.4";
public static void main(String[] args) {
System.out.println("version = " + version);

4
src/main/java/com/yutou/qqbot/gpt/AbsGPTManager.java
View File

@ -92,7 +92,7 @@ public abstract class AbsGPTManager {
* @param tClass GPT管理器的具体实现类。
* @return GPT管理器实例。
*/
public static <T extends AbsGPTManager> AbsGPTManager getManager(Class<T> tClass) {
public static <T extends AbsGPTManager> AbsGPTManager getManager(Class<?> tClass) {
if (tClass == BaiduGPTManager.class) {
return BaiduGPTManager.getManager();
}else if(tClass== SiliconGPTManager.class){
@ -131,7 +131,7 @@ public abstract class AbsGPTManager {
};
}
protected AbsGPTManager setModel(String model) {
public AbsGPTManager setModel(String model) {
this.model=model;
return this;
}

2
src/main/java/com/yutou/qqbot/gpt/SiliconGPTManager.java
View File

@ -19,6 +19,7 @@ public class SiliconGPTManager extends AbsGPTManager {
private volatile static SiliconGPTManager instance = new SiliconGPTManager();
private SiliconGPTManager() {
setModel("deepseek-ai/DeepSeek-R1-Distill-Qwen-7B");
}
public static SiliconGPTManager getInstance() {
@ -37,7 +38,6 @@ public class SiliconGPTManager extends AbsGPTManager {
// 获取或创建用户锁
AtomicBoolean lock = userLocks.computeIfAbsent(user, k -> new AtomicBoolean(false));
try {
GPTApi.setLog(false);
// 尝试加锁（如果已被锁定则立即返回提示）
if (!lock.compareAndSet(false, true)) {
return Message.create("您有请求正在处理中，请稍后再试", true);

76
src/main/java/com/yutou/qqbot/models/Commands/BaiduGPT.java
View File

@ -6,6 +6,7 @@ import com.yutou.qqbot.Annotations.UseModel;
import com.yutou.qqbot.QQBotManager;
import com.yutou.qqbot.data.baidu.Message;
import com.yutou.qqbot.gpt.AbsGPTManager;
import com.yutou.qqbot.gpt.SiliconGPTManager;
import com.yutou.qqbot.interfaces.DownloadInterface;
import com.yutou.qqbot.models.Model;
import com.yutou.qqbot.gpt.BaiduGPTManager;
@ -20,6 +21,7 @@ import java.util.List;
@UseModel
public class BaiduGPT extends Model {
private Class<?> gptManager = SiliconGPTManager.class;
@Override
public boolean isUserPublic() {
@ -43,19 +45,28 @@ public class BaiduGPT extends Model {
public void onMessage(Long qq, MessageEvent event, boolean isGroup) {
super.onMessage(qq, event, isGroup);
if (event.getTextMessage().equals(QQGroupCommands.GPT_CLEAR)) {
BaiduGPTManager.getManager().clear();
AbsGPTManager.getManager(gptManager).clear();
QQBotManager.getInstance().sendMessage(event.isUser(), qq, new Text("已经失忆捏"));
} else if (event.isAtMe()) {
if (event.getTextMessage().contains("省流") || event.getTextMessage().contains("总结")) {
return;
}
if ("GPT切换到4.0".equals(event.getTextMessage())) {
if (event.getTextMessage().contains("画画")) {
val file = BaiduGPTManager.getManager().textToImage(String.valueOf(qq), event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").replace("画画", "").trim());
if (file == null) {
QQBotManager.getInstance().sendMessage(event.isUser(), qq, new Text("画不出"));
} else {
QQBotManager.getInstance().sendMessage(file, qq, event.getMessageId().toString(), "好嘞");
}
return;
} else if (event.getTextMessage().contains("GPT切换到")) {
val text = event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").replace("切换到", "").trim();
List<BaseHandle<?>> list = new ArrayList<>();
if (isAdmin()) {
list.add(new At(user));
list.add(new Text("切换为4.0了"));
BaiduGPTManager.getManager().clear();
BaiduGPTManager.getManager().setModelFor40();
list.add(new Text("切换为" + text));
AbsGPTManager.getManager(gptManager).clear();
AbsGPTManager.getManager(gptManager).setModel(text);
QQBotManager.getInstance().sendMessage(event.isUser(), qq, list);
} else {
list.add(new At(user));
@ -63,62 +74,57 @@ public class BaiduGPT extends Model {
QQBotManager.getInstance().sendMessage(event.isUser(), qq, list);
}
return;
} else if ("GPT切换到3.5".equals(event.getTextMessage())) {
}else if(event.getTextMessage().contains("大模型切换到")){
List<BaseHandle<?>> list = new ArrayList<>();
if (isAdmin()) {
list.add(new At(user));
list.add(new Text("切换为3.5了"));
BaiduGPTManager.getManager().clear();
BaiduGPTManager.getManager().setModelFor35();
QQBotManager.getInstance().sendMessage(event.isUser(), qq, list);
}else {
list.add(new At(user));
list.add(new Text("你没有权限"));
QQBotManager.getInstance().sendMessage(event.isUser(), qq, list);
val text = event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").replace("大模型切换到", "").trim();
if(text.contains("baidu")|| text.contains("百度")){
gptManager= BaiduGPTManager.class;
}else if(text.contains("silicon")||text.contains("硅基")){
gptManager= SiliconGPTManager.class;
}
return;
}else if(event.getTextMessage().contains("画画")){
val file = BaiduGPTManager.getManager().textToImage(String.valueOf(qq), event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").replace("画画", "").trim());
if(file==null){
QQBotManager.getInstance().sendMessage(event.isUser(), qq, new Text("画不出"));
}else{
QQBotManager.getInstance().sendMessage(file,qq, event.getMessageId().toString(), "好嘞");
}
return;
list.add(new At(user));
list.add(new Text("切换为" + text));
AbsGPTManager.getManager(gptManager).clear();
AbsGPTManager.getManager(gptManager).setModel(text);
QQBotManager.getInstance().sendMessage(event.isUser(), qq, list);
}
if(checkImage()) {
if (checkImage()) {
parseImage(event, qq);
return;
}
Message message = BaiduGPTManager.getManager().sendMessage(
Message message = AbsGPTManager.getManager(gptManager).sendMessage(
String.valueOf(qq),
event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").trim());
String sb = "调用版本:" +
BaiduGPTManager.getManager().getGPTVersion() +
gptManager.getSimpleName()+
"\n" +
"使用模型:"+
AbsGPTManager.getManager(gptManager).getGPTVersion() +
"\n"+
message.getContent();
QQBotManager.getInstance().sendMessage(event.isUser(), qq, new Text(sb));
}
}
private void parseImage(MessageEvent event, Long qq) {
Image imageHandle = event.findType(Image.class);
val replyHandle = event.findType(Reply.class);
if (replyHandle != null &&imageHandle==null) {
imageHandle = getReply(replyHandle.getData().getId()).findType(Image.class);
if (replyHandle != null && imageHandle == null) {
imageHandle = getReply(replyHandle.getData().getId()).findType(Image.class);
}
if (imageHandle == null) {
return;
}
if(imageHandle==null){
return;
}
HttpTools.download(imageHandle.getData().getUrl(), "gpt_parse_image.png", new DownloadInterface() {
@Override
public void onDownload(File file) {
super.onDownload(file);
if(file==null){
if (file == null) {
return;
}
val text = BaiduGPTManager.getManager().imageToText(String.valueOf(qq), file);
QQBotManager.getInstance().sendMessage(event.isUser(),qq,new Reply(event.getMessageId()),new Text(text));
QQBotManager.getInstance().sendMessage(event.isUser(), qq, new Reply(event.getMessageId()), new Text(text));
}
});

2
src/main/resources/log4j2.xml
View File

@ -28,7 +28,7 @@
<!-- 屏蔽 org.apache.hc.client5 包下的所有日志 -->
<Logger name="org.apache.hc.client5" level="OFF"/>
<!-- 根日志记录器 -->
<Root level="debug">
<Root level="info">
<AppenderRef ref="ConsoleAppender"/>
<AppenderRef ref="RoutingAppender"/>
</Root>