chore: remove sample before async def clean_sample_answers(text):

Project.py

@@ -228,8 +228,8 @@ class Project:
         # Execute prompt with appropriate model
         result = (
             await async_call_4o_mini(prompt) 
-            # if config.model == ModelType.O1_MINI
-            # else await async_call_o1_mini(prompt)
+            if config.model == ModelType.O1_MINI
+            else await async_call_o1_mini(prompt)
         )
         # print(f"Result from executing prompt: {result[:800]}")
         

app.py

@@ -394,9 +394,7 @@ with gr.Blocks(title="Quotation Chatbot (with SOW)", css=custom_css) as demo:
 
         with gr.Row():
             with gr.Column(scale=1):
-                current_question = gr.Textbox(label="Edit Area", lines=20)
-                submit_btn = gr.Button("Submit")
-                clear_btn = gr.Button("Clear Chat")
+                current_question = gr.Textbox(label="Edit Area", lines=30, interactive=True)
             with gr.Column(scale=1):
                 chatbot = gr.Chatbot(height=580 ,elem_classes=["chatbot-container"])
                 gr.ChatInterface(
@@ -455,17 +453,7 @@ with gr.Blocks(title="Quotation Chatbot (with SOW)", css=custom_css) as demo:
             outputs=[current_question, current_session_display]
         )
         
-        submit_btn.click(
-            fn=lambda answer, history: (*process_response(answer, history), *get_project_state()),
-            inputs=[current_question, chatbot],
-            outputs=[chatbot, current_question]
-        )
-        
-        clear_btn.click(
-            fn=lambda: ([], ""),
-            outputs=[chatbot, current_question]
-        )
-        
+
         fetch_btn.click(
             fn=fetch_session,
             inputs=[session_input],

common_functions_v4.py

@@ -23,6 +23,7 @@ no_active_session = "**Current Session**:None"
 class SLEEP_TIME(Enum):
     """Enum class containing sleep time constants."""
     ONE_AND_HALF_SEC = 1.5  # Default sleep time in seconds
+    TWO_SEC = 1.8  # Default sleep time in seconds
     THREE_SEC = 3  # Default sleep time in seconds
 
 load_dotenv()
@@ -271,16 +272,57 @@ async def clean_sample_answers(text):
     try:
         if not text:
             return text
-        
+        print("Starting to clean sample answers...")
         # Updated regex to handle optional parentheses
+        # pattern = r'\(?\s*Sample(?:\s*Answer)?\s*:\\s*.*?\)?'
+        # cleaned_text = re.sub(pattern, 'Answer:', text, flags=re.IGNORECASE | re.DOTALL)
+        
+        # pattern = re.compile(
+        #     r'\(?\s*(?:Sample(?:\s*Answer)?):\s*.*?\)?',
+        #     flags=re.IGNORECASE | re.DOTALL
+        # )
+        # cleaned_text = re.sub(pattern, 'Answer:', text)
+
+        # cleaned_text = re.sub(
+        #     r'(?i)[\(\[]?\s*Sample\s*:\s*"[^"]*"\s*[\)\]]?',
+        #     'Answer:',
+        #     text,
+        #     flags=re.MULTILINE
+        # )
+
+        # cleaned_text = re.sub(r'(?i)\s*Sample\s*:\s*"[^"]*"', '\nAnswer:', text, flags=re.MULTILINE)
+        # cleaned_text = re.sub(
+        #     r'(?i)\s*\(?\s*Sample\s*:\s*"[^"]*"\)?',
+        #     '\nAnswer:',
+        #     cleaned_text,
+        #     flags=re.MULTILINE
+        # )
+
+        # Case 1 : overs both quoted and unquoted cases, with or without parentheses:
+        # cleaned_text = re.sub(
+        #     r'(?i)\s*\(?\s*Sample\s*:\s*(?:"[^"]*"|[^)\n]*)\)?',
+        #     '\nAnswer:',
+        #     text,
+        #     flags=re.MULTILINE
+        # )
+
+        # this works
         cleaned_text = re.sub(
-            r'(?i)[\(\[]?\s*Sample\s*:\s*"[^"]*"\s*[\)\]]?',
-            'Answer:',
+            r'(?i)\s*(?:\(|\*)?\s*Sample(?:\s*Answer)?\s*:\s*(?:"[^"]*"|[^\)\*\n]*)\s*(?:\)|\*)?',
+            '\nAnswer:',
             text,
-            flags=re.MULTILINE | re.IGNORECASE
+            flags=re.MULTILINE
         )
-        
+
+        cleaned_text = re.sub(
+            r'(?i)\s*(?:\(|\*)?\s*Sample(?:\s*Answers?)?\s*:\s*(?:"[^"]*"|[^\)\*\n]*)\s*(?:\)|\*)?',
+            '\nAnswer:',
+            text,
+            flags=re.MULTILINE
+        )
+        print("Sample answers cleaned successfully.")
         return cleaned_text
+        # return cleaned_text
     except Exception as e:
         print(f"Error cleaning sample answers: {e}")
         return text
@@ -307,8 +349,8 @@ async def async_process_response(answer, history):
         sanitized_answer = sanitize_text(str(answer))
         
         # print("[DEBUG] Adding project detail")
-        state.quotation_project.add_project_detail(sanitized_answer)
-                    
+        if sanitized_answer is not None and len(sanitized_answer) > 0:
+            state.quotation_project.add_project_detail(sanitized_answer)
                 
         start_time = time.time()
         
@@ -319,24 +361,24 @@ async def async_process_response(answer, history):
         )
         yield response, ""
 
-        function_to_run = state.quotation_project.generate_client_initial_question
-        current_thoughts = PROMPTS["client_initial_question"].thoughts
+        # function_to_run = state.quotation_project.generate_client_follow_up
+        # current_thoughts = PROMPTS["generate_client_follow_up"].thoughts
 
         project_detail_len = len(state.quotation_project.project_detail)
         
-        if project_detail_len == 2:
+        if project_detail_len == 1:
             function_to_run = state.quotation_project.generate_client_follow_up
             current_thoughts = PROMPTS["generate_client_follow_up"].thoughts
 
-        elif project_detail_len == 3:
+        elif project_detail_len == 2:
             function_to_run = lambda: run_question_agent(state.quotation_project)
             current_thoughts = PROMPTS["generate_client_follow_up"].thoughts
 
-        elif project_detail_len == 4:
+        elif project_detail_len == 3:
             function_to_run = state.quotation_project.generate_general_questions
             current_thoughts = PROMPTS["generate_general_questions"].thoughts
 
-        elif project_detail_len >= 5:
+        elif project_detail_len >= 4:
             function_to_run = state.quotation_project.generate_further_follow_up_questions
             current_thoughts = PROMPTS["generate_further_follow_up_questions"].thoughts
 
@@ -359,7 +401,7 @@ async def async_process_response(answer, history):
             thought_index += 1
             # print(f"[DEBUG] Current thought: {thought}")
             
-            await asyncio.sleep(SLEEP_TIME.ONE_AND_HALF_SEC.value)
+            await asyncio.sleep(SLEEP_TIME.TWO_SEC.value)
             accumulated_thoughts += f"- {thought}\n\n"
             response.content = accumulated_thoughts.strip()
             # print(f"[DEBUG] Yielding updated thoughts: {response.content}")
@@ -446,30 +488,30 @@ def calculate_mvp_mandays_and_costs(generated_mvp_results):
 def create_new_session():
     """Create a new session in the database and return the session_id"""
     try:
-        conn = get_db_connection()
-        cur = conn.cursor()
-        
-        # Insert new session with start time
-        cur.execute("""
-            INSERT INTO sessions (start_time)
-            VALUES (CURRENT_TIMESTAMP)
-            RETURNING session_id
-        """)
-        
-        session_id = cur.fetchone()[0]
-        
-        # Insert session_base_project record for "Page"
-        cur.execute("""
-            INSERT INTO session_base_project (session_id, base_project_name)
-            VALUES (%s, 'Page')
-        """, (session_id,))
-        
-        conn.commit()
-        cur.close()
-        conn.close()
-        
-        return session_id
-        # return 151
+        # conn = get_db_connection()
+        # cur = conn.cursor()
+        
+        # # Insert new session with start time
+        # cur.execute("""
+        #     INSERT INTO sessions (start_time)
+        #     VALUES (CURRENT_TIMESTAMP)
+        #     RETURNING session_id
+        # """)
+        
+        # session_id = cur.fetchone()[0]
+        
+        # # Insert session_base_project record for "Page"
+        # cur.execute("""
+        #     INSERT INTO session_base_project (session_id, base_project_name)
+        #     VALUES (%s, 'Page')
+        # """, (session_id,))
+        
+        # conn.commit()
+        # cur.close()
+        # conn.close()
+        
+        # return session_id
+        return 161
     except Exception as e:
         print(f"Error creating new session: {str(e)}")
         return None

prompt_configs.py

@@ -292,7 +292,7 @@ PROMPTS = {
     "client_initial_question": PromptConfig(
         prompt=
         """
-        # Client Information Gathering Questions
+        Client Information Gathering Questions
         
         ### Company Background and Industry
         1. Can you provide some background about your company?