remove threadInfo

lhpqaq · Nov 19, 2024 · d4e100f · d4e100f
1 parent 16b8a40
commit d4e100f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 35 deletions.
diff --git a/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/factory/AIAssistant.java b/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/factory/AIAssistant.java
@@ -27,9 +27,6 @@
 import dev.langchain4j.store.memory.chat.ChatMemoryStore;
 import reactor.core.publisher.Flux;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public interface AIAssistant {
 
     /**
@@ -59,14 +56,6 @@ public interface AIAssistant {
      */
     PlatformType getPlatform();
 
-    /**
-     * This is used to create a thread
-     * @return
-     */
-    default Map<String, String> createThread() {
-        return new HashMap<>();
-    }
-
     /**
      * This is used to set system prompt
      * @return

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatThreadPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatThreadPO.java
@@ -34,9 +34,6 @@ public class ChatThreadPO extends BasePO implements Serializable {
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "thread_info")
-    private String threadInfo;
-
     @Column(name = "user_id", nullable = false)
     private Long userId;
 

diff --git a/...r/src/main/java/org/apache/bigtop/manager/server/model/converter/ChatThreadConverter.java b/...r/src/main/java/org/apache/bigtop/manager/server/model/converter/ChatThreadConverter.java
@@ -37,10 +37,8 @@ public interface ChatThreadConverter {
     @Mapping(source = "id", target = "threadId")
     ChatThreadVO fromPO2VO(ChatThreadPO platformAuthorizedPO);
 
-    @Mapping(source = "threadInfo", target = "threadInfo", qualifiedByName = "map2String")
     ChatThreadPO fromDTO2PO(ChatThreadDTO chatThreadDTO);
 
-    @Mapping(source = "threadInfo", target = "threadInfo", qualifiedByName = "jsonString2Map")
     ChatThreadDTO fromPO2DTO(ChatThreadPO chatThreadPO);
 
     ChatThreadDTO fromReq2DTO(ChatbotThreadReq chatbotThreadReq);

diff --git a/...anager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ChatThreadDTO.java b/...anager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ChatThreadDTO.java
@@ -33,6 +33,4 @@ public class ChatThreadDTO {
     private String name;
 
     private Map<String, String> authCredentials;
-
-    private Map<String, String> threadInfo;
 }
diff --git a/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java b/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java
@@ -104,13 +104,11 @@ private AuthPlatformPO getActiveAuthPlatform() {
         return null;
     }
 
-    private AIAssistantConfig getAIAssistantConfig(
-            String model, Map<String, String> credentials, Map<String, String> configs) {
+    private AIAssistantConfig getAIAssistantConfig(String model, Map<String, String> credentials) {
         return AIAssistantConfig.builder()
                 .setModel(model)
                 .setLanguage(LocaleContextHolder.getLocale().toString())
                 .addCredentials(credentials)
-                .addConfigs(configs)
                 .build();
     }
 
@@ -119,13 +117,9 @@ private PlatformType getPlatformType(String platformName) {
     }
 
     private AIAssistant buildAIAssistant(
-            String platformName,
-            String model,
-            Map<String, String> credentials,
-            Long threadId,
-            Map<String, String> configs) {
+            String platformName, String model, Map<String, String> credentials, Long threadId) {
         return getAIAssistantFactory()
-                .create(getPlatformType(platformName), getAIAssistantConfig(model, credentials, configs), threadId);
+                .create(getPlatformType(platformName), getAIAssistantConfig(model, credentials), threadId);
     }
 
     @Override
@@ -141,10 +135,6 @@ public ChatThreadVO createChatThread(ChatThreadDTO chatThreadDTO) {
         chatThreadDTO.setPlatformId(platformPO.getId());
         chatThreadDTO.setAuthId(authPlatformPO.getId());
 
-        AIAssistant aiAssistant = buildAIAssistant(
-                platformPO.getName(), authPlatformDTO.getModel(), authPlatformDTO.getAuthCredentials(), null, null);
-        Map<String, String> threadInfo = aiAssistant.createThread();
-        chatThreadDTO.setThreadInfo(threadInfo);
         ChatThreadPO chatThreadPO = ChatThreadConverter.INSTANCE.fromDTO2PO(chatThreadDTO);
         chatThreadPO.setUserId(userId);
         chatThreadDao.save(chatThreadPO);
@@ -213,8 +203,7 @@ public SseEmitter talk(Long threadId, String message) {
                 platformPO.getName(),
                 authPlatformDTO.getModel(),
                 authPlatformDTO.getAuthCredentials(),
-                chatThreadPO.getId(),
-                chatThreadDTO.getThreadInfo());
+                chatThreadPO.getId());
         Flux<String> stringFlux = aiAssistant.streamAsk(message);
 
         SseEmitter emitter = new SseEmitter();

diff --git a/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql b/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql
@@ -330,7 +330,6 @@ CREATE TABLE `llm_chat_thread`
     `auth_id`     BIGINT(20) UNSIGNED NOT NULL,
     `user_id`     BIGINT(20) UNSIGNED NOT NULL,
     `is_deleted`  TINYINT(1)          DEFAULT 0 NULL,
-    `thread_info` TEXT                DEFAULT NULL,
     `name`        VARCHAR(255)        DEFAULT NULL,
     `create_time` DATETIME            DEFAULT CURRENT_TIMESTAMP,
     `update_time` DATETIME            DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

diff --git a/bigtop-manager-server/src/main/resources/ddl/PostgreSQL-DDL-CREATE.sql b/bigtop-manager-server/src/main/resources/ddl/PostgreSQL-DDL-CREATE.sql
@@ -341,7 +341,6 @@ CREATE TABLE llm_chat_thread
     id          BIGINT CHECK (id > 0)          NOT NULL GENERATED ALWAYS AS IDENTITY,
     auth_id     BIGINT CHECK (auth_id > 0)     NOT NULL,
     user_id     BIGINT CHECK (user_id > 0)     NOT NULL,
-    thread_info TEXT         DEFAULT NULL,
     name        VARCHAR(255) DEFAULT NULL,
     is_deleted  BOOLEAN      DEFAULT FALSE,
     create_time TIMESTAMP(0) DEFAULT CURRENT_TIMESTAMP,