Update regex

main.py

@@ -408,38 +408,60 @@ You are a helpful assistant with the following skills, use them, as necessary. I
 
 import re
 
-def parse_followup_response(response):
-    response_parts = response.split("<response>")
-    if len(response_parts) > 1:
-        response_content = response_parts[1].split("</response>")[0].strip()
-    else:
-        response_content = ""
-
-    clarification_parts = response.split("<clarification>")
-    if len(clarification_parts) > 1:
-        clarification_text = clarification_parts[1].split("</clarification>")[0].strip()
-        clarification = parse_clarification(clarification_text)
-    else:
-        clarification = None
-
-    return response_content, clarification
-
-
-def parse_clarification(text):
-    questions = []
-    current_question = None
-
-    for line in text.split('\n'):
-        line = line.strip()
-        if line.startswith('- text:'):
-            if current_question:
-                questions.append(current_question)
-            current_question = {'text': line[7:].strip(), 'options': []}
-        elif line.startswith('- ') and current_question:
-            current_question['options'].append(line[2:].strip())
-
-    if current_question:
-        questions.append(current_question)
+def parse_followup_response(input_text):
+    # Define patterns for response and clarification
+    response_pattern = re.compile(r'<response>(.*?)<\/response>', re.DOTALL)
+    clarification_pattern = re.compile(r'<clarification>(.*?)<\/clarification>', re.DOTALL)
+
+    # Find all matches for response and clarification
+    response_matches = response_pattern.finditer(input_text)
+    clarification_matches = clarification_pattern.finditer(input_text)
+
+    # Initialize variables to keep track of the position
+    last_end = 0
+    combined_response = ""
+    parsed_clarifications = []
+
+    # Combine responses and capture everything in between
+    for response_match in response_matches:
+        # Capture text before the current response tag
+        combined_response += input_text[last_end:response_match.start()].strip() + "\n"
+        # Add the response content
+        combined_response += response_match.group(1).strip() + "\n"
+        # Update the last end position
+        last_end = response_match.end()
+
+    # Check for clarifications and parse them
+    for clarification_match in clarification_matches:
+        # Capture text before the current clarification tag
+        combined_response += input_text[last_end:clarification_match.start()].strip() + "\n"
+        # Process the clarification block
+        clarification_text = clarification_match.group(1).strip()
+        if clarification_text:
+            # Split by "text:" to separate each question block
+            question_blocks = clarification_text.split("- text:")
+            
+            # Loop through each block and extract the question and its options
+            for block in question_blocks[1:]:
+                # Extract the question using regex (up to the "options:" part)
+                question_match = re.search(r'^(.*?)\s*options:', block, re.DOTALL)
+                if question_match:
+                    question = question_match.group(1).strip()
+                    
+                    # Extract the options using regex
+                    options_match = re.search(r'options:\s*(.*?)$', block, re.DOTALL)
+                    if options_match:
+                        options = [option.strip() for option in options_match.group(1).split('-') if option.strip()]
+                        
+                        # Add the parsed question and options to the list
+                        parsed_clarifications.append({'question': question, 'options': options})
+        # Update the last end position
+        last_end = clarification_match.end()
+
+    # Capture any remaining text after the last tag
+    combined_response += input_text[last_end:].strip()
+
+    return combined_response.strip(), parsed_clarifications
 
 
 @app.post("/followup-agent")