Merge pull request #69 from insea-connect/cross-issue

fix: fix the source problem with chat responses and added more time t…
insea-connect · Jun 6, 2024 · 65c6fc6 · 65c6fc6
2 parents d6bbeb5 + 6f2742d
commit 65c6fc6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...-connect-backend/src/main/java/ma/insea/connect/chatbot/controller/ChatbotController.java b/...-connect-backend/src/main/java/ma/insea/connect/chatbot/controller/ChatbotController.java
@@ -1,6 +1,7 @@
 package ma.insea.connect.chatbot.controller;
 
 
+import lombok.extern.slf4j.Slf4j;
 import ma.insea.connect.chatbot.DTO.groupDTO.ChatbotGroupMessageRequestDTO;
 import ma.insea.connect.chatbot.DTO.groupDTO.ChatbotGroupMessageResponseDTO;
 import ma.insea.connect.chatbot.service.ChatbotService;
@@ -20,6 +21,7 @@
 import java.util.regex.Pattern;
 
 
+@Slf4j
 @RestController
 @RequestMapping("api/v1/chatbot")
 public class ChatbotController {
@@ -35,6 +37,7 @@ private String cleanResponseMessage(String message) {
         String regex = "【\\d+:\\d+†source】";
         Pattern pattern = Pattern.compile(regex);
         Matcher matcher = pattern.matcher(message);
+        log.info("Formatted text without crosses "+matcher.replaceAll("") );
         return matcher.replaceAll("");
     }
 
@@ -71,6 +74,9 @@ public SseEmitter sendToBotConversationStream(@RequestBody ChatbotMessageRequest
     public ResponseEntity<ChatbotMessageResponseDTO> sendToBotConversation(@RequestBody ChatbotMessageRequestDTO requestDTO) {
         try {
             ChatbotMessageResponseDTO chatbotMessageResponseDTO= chatbotService.sendToBotConversation(requestDTO);
+            chatbotMessageResponseDTO.setMessage(cleanResponseMessage(chatbotMessageResponseDTO.getMessage()));
+            log.info("the formated text included in the message body "+ chatbotMessageResponseDTO.getMessage());
+            log.info("the text it should have is  "+cleanResponseMessage(chatbotMessageResponseDTO.getMessage()));
             return ResponseEntity.ok(chatbotMessageResponseDTO);
         }
 

diff --git a/.../insea-connect-backend/src/main/java/ma/insea/connect/chatbot/service/ChatbotService.java b/.../insea-connect-backend/src/main/java/ma/insea/connect/chatbot/service/ChatbotService.java
@@ -21,10 +21,20 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Slf4j
 @Service
 public class ChatbotService {
+
+    private String cleanResponseMessage(String message) {
+        String regex = "【\\d+:\\d+†source】";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(message);
+        log.info("Formatted text without crosses "+matcher.replaceAll("") );
+        return matcher.replaceAll("");
+    }
     @Autowired
     ChatMessageService chatMessageService;
     @Value("${chatbotServer}")
@@ -44,7 +54,7 @@ public ChatbotMessageResponseDTO addInteractionInConversation(ChatbotMessageRequ
             ChatMessageDTO botResponse = new ChatMessageDTO();
             botResponse.setRecipientId(chatbotMessageRequestDTO.getSenderId());
             botResponse.setSenderId(chatbotMessageRequestDTO.getRecipientId());
-            botResponse.setContent(responseContent);
+            botResponse.setContent(cleanResponseMessage(responseContent));
             botResponse.setTimestamp(date);
             chatMessageService.saveusermessage(userRequest);
             chatMessageService.saveusermessage(botResponse);

diff --git a/packages/insea-connect-chatbot/main.py b/packages/insea-connect-chatbot/main.py
@@ -175,7 +175,7 @@ def process_request_stream():
         conversation['expires_at'] = datetime.now() + timedelta(minutes=15)
 
     # Wait for the run to complete or time out
-    timeout_seconds = 5 * 60  # 5 minutes timeout
+    timeout_seconds = 300 * 60  # 5 minutes timeout
     start_time = time.time()
 
     while run.status != "completed":