Update main.py

main.py

@@ -13,7 +13,7 @@ import time
 from datetime import datetime, timedelta
 import asyncio
 import requests
-from prompts import CODING_ASSISTANT_PROMPT, NEWS_ASSISTANT_PROMPT, generate_news_prompt, SEARCH_ASSISTANT_PROMPT, generate_search_prompt
+from prompts import *
 from fastapi_cache import FastAPICache
 from fastapi_cache.backends.inmemory import InMemoryBackend
 from fastapi_cache.decorator import cache
@@ -402,60 +402,6 @@ class FollowupQueryModel(BaseModel):
             }
         }
 
-FOLLOWUP_AGENT_PROMPT = """
-You are a helpful, intelligent assistant who can create interactive buttons and markdown responses.
-
-If the user request needs further clarification, provide clarifying questions using <interact> to assist the user.
-Else respond with a helpful answer using <response>.   
-The options in <interact> tags will be rendered as buttons so that user can interact with it. Hence make sure to use it for engaging with the user with Next Steps, followup questions, quizzes etc. whichever appropriate 
-
-Your output format: # Use the following <response>,<interact> tags in any order as many times required.
-<response>response to user request formatted using markdown</response>
-<interact>
-questions:
-  - text: [First interaction question]
-    options:
-      - [Option 1]
-      - [Option 2]
-      - [Option 3]
-      - [Option 4 (if needed)]
-  - text: [Second interaction question]
-    options:
-      - [Option 1]
-      - [Option 2]
-      - [Option 3]
-  # Add more questions as needed 
-  # make sure this section is in valid YAML format
-</interact>
-"""
-
-FOLLOWUP_DIGIYATRA_PROMPT = """
-You are a helpful, assistant tasked to assist digiyatra users, who can create interactive buttons and markdown responses. Provide youtube links to the user if relevant links are given in the context.
-
-If the user request needs further clarification, provide clarifying questions using <interact> to assist the user.
-Else respond with a helpful answer using <response>.   
-The options in <interact> tags will be rendered as buttons so that user can interact with it. Hence make sure to use it for engaging with the user with Next Steps, followup questions, quizzes etc. whichever appropriate 
-
-Your output format: # Use the following <response>,<interact> tags in any order as many times required.
-<response>response to user request formatted using markdown</response>
-<interact>
-questions:
-  - text: [First interaction question]
-    options:
-      - [Option 1]
-      - [Option 2]
-      - [Option 3]
-      - [Option 4 (if needed)]
-  - text: [Second interaction question]
-    options:
-      - [Option 1]
-      - [Option 2]
-      - [Option 3]
-  # Add more questions as needed 
-  # make sure this section is in valid YAML format
-</interact>
-"""
-
 import re
 
 def parse_followup_response(input_text):
@@ -514,6 +460,44 @@ def parse_followup_response(input_text):
     return combined_response.strip(), parsed_interacts
 
 
+import re
+
+def parse_followup_and_tools(input_text):
+    # Remove extra brackets, excess quotes, and excessive whitespace
+    cleaned_text = re.sub(r'\[|\]|"+|\s+', ' ', input_text).strip()
+    
+    # Extract response content
+    response_pattern = re.compile(r'<response>(.*?)</response>', re.DOTALL)
+    response_parts = response_pattern.findall(cleaned_text)
+    combined_response = ' '.join(response_parts).strip()
+    
+    parsed_interacts = []
+    parsed_tools = []
+    
+    # Parse interacts and tools
+    blocks = re.finditer(r'<(interact|tool)>(.*?)</\1>', cleaned_text, re.DOTALL)
+    for block in blocks:
+        block_type, content = block.groups()
+        content = content.strip()
+        
+        if block_type == 'interact':
+            question_blocks = re.split(r'\s*-\s*text:', content)[1:]
+            for qblock in question_blocks:
+                parts = re.split(r'\s*options:\s*', qblock, maxsplit=1)
+                if len(parts) == 2:
+                    question = parts[0].strip()
+                    options = [opt.strip() for opt in re.split(r'\s*-\s*', parts[1]) if opt.strip()]
+                    parsed_interacts.append({'question': question, 'options': options})
+        
+        elif block_type == 'tool':
+            tool_match = re.search(r'text:\s*(.*?)\s*options:\s*-\s*(.*)', content, re.DOTALL)
+            if tool_match:
+                tool_name = tool_match.group(1).strip()
+                option = tool_match.group(2).strip()
+                parsed_tools.append({'name': tool_name, 'input': option})
+    
+    return combined_response, parsed_interacts, parsed_tools
+
 @app.post("/followup-agent")
 async def followup_agent(query: FollowupQueryModel, background_tasks: BackgroundTasks, api_key: str = Depends(verify_api_key)):
     """