Cleaned up discussion_id being extracted and removed, and corrected a…

…n issue with its removal.

Middleware/core/open_ai_api.py

@@ -162,4 +162,4 @@ def handle_user_prompt(prompt_collection: List[Dict[str, str]], stream: bool) ->
         else:
             print("handle_user_prompt workflow exists")
             workflow_manager: WorkflowManager = WorkflowManager(get_active_custom_workflow_name())
-            return workflow_manager.run_workflow(prompt_collection, request_id, stream)
+            return workflow_manager.run_workflow(prompt_collection, request_id, stream=stream)

Middleware/utilities/prompt_extraction_utils.py

@@ -122,7 +122,7 @@ def remove_discussion_id_tag_from_string(message: str) -> str:
     Returns:
     str: The message string with the discussion ID tag removed.
     """
-    pattern = f'{re.escape(discussion_identifiers["discussion_id_start"])}\\d+{re.escape(discussion_identifiers["discussion_id_end"])}'
+    pattern = f'{re.escape(discussion_identifiers["discussion_id_start"])}.*?{re.escape(discussion_identifiers["discussion_id_end"])}'
     return re.sub(pattern, '', message)
 
 

Middleware/workflows/categorization/prompt_categorizer.py

@@ -11,7 +11,7 @@ class PromptCategorizer:
     """
 
     @staticmethod
-    def conversational_method(prompt, request_id, stream=False):
+    def conversational_method(prompt, request_id, discussion_id: str = None, stream=False):
         """
         Run the default conversational workflow.
 
@@ -22,7 +22,9 @@ def conversational_method(prompt, request_id, stream=False):
         Returns:
             str: The result of the workflow execution.
         """
-        return WorkflowManager(workflow_config_name='_DefaultWorkflow').run_workflow(prompt, request_id, stream=stream)
+        return WorkflowManager(workflow_config_name='_DefaultWorkflow').run_workflow(prompt, request_id,
+                                                                                     discussionId=discussion_id,
+                                                                                     stream=stream)
 
     @staticmethod
     def _configure_workflow_manager(category_data):
@@ -62,7 +64,7 @@ def initialize(self):
             print("Error decoding JSON from routing configuration file.")
             raise
 
-    def get_prompt_category(self, prompt, stream, request_id):
+    def get_prompt_category(self, prompt, stream, request_id, discussion_id: str = None):
         """
         Get the category of the prompt and run the appropriate workflow.
 
@@ -73,17 +75,17 @@ def get_prompt_category(self, prompt, stream, request_id):
         Returns:
             str: The result of the workflow execution.
         """
-        category = self._categorize_request(prompt)
+        category = self._categorize_request(prompt, request_id)
         print("Category: ", category)
 
         if category in self.categories:
             print("Response initiated")
             workflow_name = self.categories[category]['workflow']
             workflow = WorkflowManager(workflow_config_name=workflow_name)
-            return workflow.run_workflow(prompt, request_id, stream=stream)
+            return workflow.run_workflow(prompt, request_id, discussionId=discussion_id, stream=stream)
         else:
             print("Default response initiated")
-            return self.conversational_method(prompt, request_id, stream)
+            return self.conversational_method(prompt, request_id, discussion_id, stream)
 
     def _initialize_categories(self):
         """