Merge pull request #83 from ashinnotfound/feat/dall-3

Feat/dall-3 & TTS

Author: ashinnotfound

README.md

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.ashin</groupId>
     <artifactId>ChatGPT-YourChatRobot</artifactId>
-    <version>3.8</version>
+    <version>3.9</version>
     <name>myGPT</name>
     <description>快来把你的qq或微信变为chatgpt</description>
     <properties>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.theokanning.openai-gpt3-java</groupId>
             <artifactId>service</artifactId>
-            <version>0.16.1</version>
+            <version>0.18.2</version>
         </dependency>
         <dependency>
             <groupId>com.knuddels</groupId>

pom.xml

@@ -1,7 +1,13 @@
 package com.ashin.client;
 
+import cn.zhouyafeng.itchat4j.Wechat;
+import com.ashin.config.KeywordConfig;
 import com.ashin.config.QqConfig;
+import com.ashin.config.WechatConfig;
 import com.ashin.handler.QqMessageHandler;
+import com.ashin.handler.WechatMessageHandler;
+import com.ashin.service.InteractService;
+import com.ashin.util.BotUtil;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.mamoe.mirai.BotFactory;
@@ -14,19 +20,30 @@
 
 @Component
 @Slf4j
-public class QqBotClient {
-
-    @Resource
-    private QqMessageHandler qqMessageHandler;
+public class BotClient {
     @Resource
     private QqConfig qqConfig;
-
-    // qq机器人实例
     @Getter
     private net.mamoe.mirai.Bot qqBot;
+    @Resource
+    private WechatConfig wechatConfig;
+    @Getter
+    private Wechat wechatBot;
+    @Resource
+    private InteractService interactService;
+    @Resource
+    private KeywordConfig keywordConfig;
+    @Resource
+    private BotUtil botUtil;
 
     @PostConstruct
     public void init() {
+        //微信
+        if (wechatConfig.getEnable()){
+            log.info("正在登录微信,请按提示操作：");
+            wechatBot = new Wechat(new WechatMessageHandler(interactService, keywordConfig, botUtil), wechatConfig.getQrPath());
+            wechatBot.start();
+        }
         if (qqConfig.getEnable()) {
             //登陆协议有ANDROID_PHONE, ANDROID_PAD, ANDROID_WATCH, IPAD, MACOS
             //若登陆失败可尝试更换协议
@@ -39,7 +56,7 @@ public void init() {
                 qqBot.login();
                 log.info("成功登录账号为 {} 的qq, 登陆协议为 {}", qqConfig.getAccount(), miraiProtocol);
                 //订阅监听事件
-                qqBot.getEventChannel().registerListenerHost(qqMessageHandler);
+                qqBot.getEventChannel().registerListenerHost(new QqMessageHandler(interactService, qqConfig, keywordConfig, botUtil));
             } catch (Exception e) {
                 log.error("登陆失败, qq账号为 {}, 登陆协议为 {}, 可尝试更换登陆协议, 具体原因: {}", qqConfig.getAccount(), miraiProtocol, e.getMessage());
             }

src/main/java/com/ashin/client/QqBotClient.java renamed to src/main/java/com/ashin/client/BotClient.java

@@ -22,4 +22,9 @@ public class GptConfig {
     private List<String> basicPrompt;
     private List<String> apiKey;
     private Long ofSeconds;
+    private String imageQuality;
+    private String imageStyle;
+    private String audioModel;
+    private String audioVoice;
+    private Double audioSpeed;
 }

src/main/java/com/ashin/client/WechatBotClient.java

@@ -15,5 +15,6 @@
 @ConfigurationProperties("keyword")
 public class KeywordConfig {
     private String reset;
-    private String draw;
+    private String image;
+    private String audio;
 }

src/main/java/com/ashin/config/GptConfig.java

@@ -18,5 +18,4 @@ public class QqConfig {
     private Long account;
     private Boolean acceptNewFriend;
     private Boolean acceptNewGroup;
-    private Boolean returnDrawByURL;
 }

src/main/java/com/ashin/config/KeywordConfig.java

@@ -0,0 +1,7 @@
+package com.ashin.constant;
+
+public enum ChatType {
+    TEXT,
+    IMAGE,
+    AUDIO,
+}

src/main/java/com/ashin/config/QqConfig.java

@@ -1,5 +1,6 @@
 package com.ashin.entity.bo;
 
+import com.ashin.constant.ChatType;
 import lombok.Data;
 
 /**
@@ -21,5 +22,5 @@ public class ChatBO {
     /**
      * 是否ai画图功能
      */
-    private boolean isAiDraw;
+    private ChatType chatType;
 }

src/main/java/com/ashin/constant/ChatType.java

@@ -0,0 +1,12 @@
+package com.ashin.entity.dto;
+
+import lombok.Data;
+
+import java.io.InputStream;
+
+@Data
+public class ChatResultDTO {
+    String StringResult;
+    InputStream inputStreamResult;
+    byte[] bytesResult;
+}

src/main/java/com/ashin/entity/bo/ChatBO.java

@@ -2,48 +2,52 @@
 
 import com.ashin.config.KeywordConfig;
 import com.ashin.config.QqConfig;
+import com.ashin.constant.ChatType;
 import com.ashin.entity.bo.ChatBO;
-import com.ashin.exception.ChatException;
+import com.ashin.entity.dto.ChatResultDTO;
 import com.ashin.service.InteractService;
 import com.ashin.util.BotUtil;
-import com.ashin.util.ImageUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.mamoe.mirai.contact.Contact;
-import net.mamoe.mirai.contact.MessageTooLargeException;
+import net.mamoe.mirai.contact.Friend;
+import net.mamoe.mirai.contact.Group;
 import net.mamoe.mirai.event.EventHandler;
 import net.mamoe.mirai.event.ListenerHost;
 import net.mamoe.mirai.event.events.*;
 import net.mamoe.mirai.message.data.*;
+import net.mamoe.mirai.utils.ExternalResource;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.io.File;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * QQ消息处理程序
  *
  * @author ashinnotfound
  * @date 2023/2/1
  */
-@Component
 @Slf4j
 public class QqMessageHandler implements ListenerHost {
-    @Resource
-    private InteractService interactService;
-    @Resource
-    private QqConfig qqConfig;
-    @Resource
-    private KeywordConfig keywordConfig;
-    @Resource
-    private BotUtil botUtil;
+    private final InteractService interactService;
+    private final QqConfig qqConfig;
+    private final KeywordConfig keywordConfig;
+    private final BotUtil botUtil;
+
+    public QqMessageHandler(InteractService interactService, QqConfig qqConfig, KeywordConfig keywordConfig, BotUtil botUtil) {
+        this.interactService = interactService;
+        this.qqConfig = qqConfig;
+        this.keywordConfig = keywordConfig;
+        this.botUtil = botUtil;
+    }
 
     /**
      * 好友消息事件
      *
      * @param event 事件
      */
     @EventHandler
-    public void onFriendMessageEvent(FriendMessageEvent event){
+    public void onFriendMessageEvent(FriendMessageEvent event) {
         ChatBO chatBO = new ChatBO();
         chatBO.setSessionId(String.valueOf(event.getSubject().getId()));
         String prompt = event.getMessage().contentToString().trim();
@@ -56,7 +60,7 @@ public void onFriendMessageEvent(FriendMessageEvent event){
      * @param event 事件
      */
     @EventHandler
-    public void onGroupMessageEvent(GroupMessageEvent event){
+    public void onGroupMessageEvent(GroupMessageEvent event) {
         ChatBO chatBO = new ChatBO();
         chatBO.setSessionId(String.valueOf(event.getSubject().getId()));
         if (event.getMessage().contains(new At(event.getBot().getId()))) {
@@ -66,37 +70,80 @@ public void onGroupMessageEvent(GroupMessageEvent event){
             response(event, chatBO, prompt);
         }
     }
+
     private void response(@NotNull MessageEvent event, ChatBO chatBO, String prompt) {
         if (keywordConfig.getReset().equals(prompt)) {
             //检测到重置会话指令
             botUtil.resetPrompt(chatBO.getSessionId());
             event.getSubject().sendMessage("重置会话成功");
         } else {
-            String response;
-            try {
+            if (prompt.startsWith(keywordConfig.getImage())) {
+                chatBO.setPrompt(prompt.replaceFirst(keywordConfig.getImage() + " ", ""));
+                chatBO.setChatType(ChatType.IMAGE);
+            } else if (prompt.startsWith(keywordConfig.getAudio())) {
+                chatBO.setPrompt(prompt.replaceFirst(keywordConfig.getAudio() + " ", ""));
+                chatBO.setChatType(ChatType.AUDIO);
+            } else {
                 chatBO.setPrompt(prompt);
-                chatBO.setAiDraw(prompt.startsWith(keywordConfig.getDraw()));
-                response = interactService.chat(chatBO);
-            }catch (ChatException e){
-                response = e.getMessage();
+                chatBO.setChatType(ChatType.TEXT);
             }
-            try {
-                if (chatBO.isAiDraw() && !qqConfig.getReturnDrawByURL()){
-                    File file = ImageUtil.download(response);
-                    Contact.sendImage(event.getSubject(), file);
-                    if (!file.delete()){
-                        log.warn("图片({})删除失败, 请注意存储空间", file.getAbsolutePath());
+            ChatResultDTO response = interactService.chat(chatBO);
+            switch (chatBO.getChatType()) {
+                case TEXT:
+                    event.getSubject().sendMessage(
+                            new MessageChainBuilder()
+                                    .append(new QuoteReply(event.getMessage()))
+                                    .append(response.getStringResult())
+                                    .build()
+                    );
+                    break;
+                case IMAGE:
+                    if (response.getInputStreamResult() == null) {
+                        event.getSubject().sendMessage(
+                                new MessageChainBuilder()
+                                        .append(new QuoteReply(event.getMessage()))
+                                        .append("ai画图失败, 以下图片url: ").append(response.getStringResult())
+                                        .build()
+                        );
+                    }
+                    try (InputStream inputStream = response.getInputStreamResult()) {
+                        event.getSubject().sendMessage(
+                                new MessageChainBuilder()
+                                        .append(new QuoteReply(event.getMessage()))
+                                        .append(Contact.uploadImage(event.getSubject(), inputStream))
+                                        .build()
+                        );
+                    } catch (IOException e) {
+                        event.getSubject().sendMessage(
+                                new MessageChainBuilder()
+                                        .append(new QuoteReply(event.getMessage()))
+                                        .append("ai画图失败, 以下图片url: ").append(response.getStringResult())
+                                        .build()
+                        );
+                    }
+                    break;
+                case AUDIO:
+                    if (response.getBytesResult() == null) {
+                        event.getSubject().sendMessage("语音回复失败, 以下为文本回复: " + response.getStringResult());
+                    }
+                    OfflineAudio audio = null;
+                    byte[] audioBytes = response.getBytesResult();
+                    try (ExternalResource externalResource = ExternalResource.create(audioBytes)) {
+                        if (event.getSubject() instanceof Group) {
+                            Group group = (Group) event.getSubject();
+                            audio = group.uploadAudio(externalResource);
+                        } else if (event.getSubject() instanceof Friend) {
+                            Friend user = (Friend) event.getSubject();
+                            audio = user.uploadAudio(externalResource);
+                        }
+                        if (audio != null) {
+                            event.getSubject().sendMessage(audio);
+                        } else {
+                            event.getSubject().sendMessage("语音回复失败, 以下为文本回复: " + response.getStringResult());
+                        }
+                    } catch (IOException e) {
+                        event.getSubject().sendMessage("语音回复失败, 以下为文本回复: " + response.getStringResult());
                     }
-                }else {
-                    MessageChain messages = new MessageChainBuilder()
-                            .append(new QuoteReply(event.getMessage()))
-                            .append(response)
-                            .build();
-                    event.getSubject().sendMessage(messages);
-                }
-            }catch (MessageTooLargeException e){
-                //信息太大，无法引用，采用直接回复
-                event.getSubject().sendMessage(response);
             }
         }
     }
@@ -107,8 +154,8 @@ private void response(@NotNull MessageEvent event, ChatBO chatBO, String prompt)
      * @param event 事件
      */
     @EventHandler
-    public void onNewFriendRequestEvent(NewFriendRequestEvent event){
-        if (qqConfig.getAcceptNewFriend()){
+    public void onNewFriendRequestEvent(NewFriendRequestEvent event) {
+        if (qqConfig.getAcceptNewFriend()) {
             event.accept();
         }
     }
@@ -119,8 +166,8 @@ public void onNewFriendRequestEvent(NewFriendRequestEvent event){
      * @param event 事件
      */
     @EventHandler
-    public void onNewGroupRequestEvent(BotInvitedJoinGroupRequestEvent event){
-        if (qqConfig.getAcceptNewGroup()){
+    public void onNewGroupRequestEvent(BotInvitedJoinGroupRequestEvent event) {
+        if (qqConfig.getAcceptNewGroup()) {
             event.accept();
         }
     }