Update app.py

app.py

@@ -64,68 +64,6 @@ def get_current_time_and_date():
 current_time_and_date = get_current_time_and_date()
 
 
-# def fetch_local_events():
-#     api_key = os.environ['SERP_API']
-#     url = f'https://serpapi.com/search.json?engine=google_events&q=Events+in+Birmingham&hl=en&gl=us&api_key={api_key}'
-#     response = requests.get(url)
-#     if response.status_code == 200:
-#         events_results = response.json().get("events_results", [])
-#         events_html = """
-#         <h2 style="font-family: 'Georgia', serif; color: #ff0000; background-color: #f8f8f8; padding: 10px; border-radius: 10px;">Local Events</h2>
-#         <style>
-#             table {
-#                 font-family: 'Verdana', sans-serif;
-#                 color: #333;
-#                 border-collapse: collapse;
-#                 width: 100%;
-#             }
-#             th, td {
-#                 border: 1px solid #ddd;
-#                 padding: 8px;
-#             }
-#             th {
-#                 background-color: #f2f2f2;
-#                 color: #333;
-#                 text-align: left;
-#             }
-#             tr:hover {
-#                 background-color: #f5f5f5;
-#             }
-#             .event-link {
-#                 color: #1E90FF;
-#                 text-decoration: none;
-#             }
-#             .event-link:hover {
-#                 text-decoration: underline;
-#             }
-#         </style>
-#         <table>
-#             <tr>
-#                 <th>Title</th>
-#                 <th>Date and Time</th>
-#                 <th>Location</th>
-#             </tr>
-#         """
-#         for event in events_results:
-#             title = event.get("title", "No title")
-#             date_info = event.get("date", {})
-#             date = f"{date_info.get('start_date', '')} {date_info.get('when', '')}".replace("{", "").replace("}", "")
-#             location = event.get("address", "No location")
-#             if isinstance(location, list):
-#                 location = " ".join(location)
-#             location = location.replace("[", "").replace("]", "")
-#             link = event.get("link", "#")
-#             events_html += f"""
-#             <tr>
-#                 <td><a class='event-link' href='{link}' target='_blank'>{title}</a></td>
-#                 <td>{date}</td>
-#                 <td>{location}</td>
-#             </tr>
-#             """
-#         events_html += "</table>"
-#         return events_html
-#     else:
-#         return "<p>Failed to fetch local events</p>"
 
 def fetch_local_events():
    
@@ -351,52 +289,22 @@ def generate_answer(message, choice):
     addresses = extract_addresses(response['output'])
     return response['output'], addresses
 
-# def bot(history, choice, tts_choice):
-#     if not history:
-#         return history
-#     response, addresses = generate_answer(history[-1][0], choice)
-#     history[-1][1] = ""
-    
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         if tts_choice == "Alpha":
-#             audio_future = executor.submit(generate_audio_elevenlabs, response)
-#         elif tts_choice == "Beta":
-#             audio_future = executor.submit(generate_audio_parler_tts, response)
-#         elif tts_choice == "Gamma":
-#             audio_future = executor.submit(generate_audio_mars5, response)
-#         elif tts_choice == "Delta":
-#             audio_future = executor.submit(generate_audio_fishaudio, response)
-        
-#         for character in response:
-#             history[-1][1] += character
-#             time.sleep(0.05)
-#             yield history, None
-        
-#         audio_path = audio_future.result()
-#         yield history, audio_path
-
 def bot(history, choice, tts_choice):
     if not history:
         return history
+    response, addresses = generate_answer(history[-1][0], choice)
+    history[-1][1] = ""
     
-    user_message = history[-1][0]
-    response_text, addresses = generate_answer(user_message, choice)
-    
-    # Ensure history has the correct format
-    if len(history[-1]) == 1:
-        history[-1].append(response_text)
-    else:
-        history[-1][1] = response_text
-
     with concurrent.futures.ThreadPoolExecutor() as executor:
         if tts_choice == "Alpha":
-            audio_future = executor.submit(generate_audio_elevenlabs, response_text)
+            audio_future = executor.submit(generate_audio_elevenlabs, response)
         elif tts_choice == "Beta":
-            audio_future = executor.submit(generate_audio_parler_tts, response_text)
+            audio_future = executor.submit(generate_audio_parler_tts, response)
         elif tts_choice == "Gamma":
-            audio_future = executor.submit(generate_audio_mars5, response_text)
+            audio_future = executor.submit(generate_audio_mars5, response)
         
-        for character in response_text:
+        
+        for character in response:
             history[-1][1] += character
             time.sleep(0.05)
             yield history, None
@@ -404,15 +312,14 @@ def bot(history, choice, tts_choice):
         audio_path = audio_future.result()
         yield history, audio_path
 
-# def add_message(history, message):
-#     history.append((message, None))
-#     return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
+
 
 def add_message(history, message):
-    history = history or []
-    history.append([message, ""])  # Ensure it is a list with two elements: message and empty response
+    history.append((message, None))
     return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
 
+
+
 # def generate_voice_response(history, tts_choice):
 #     if not history:
 #         return None
@@ -584,26 +491,6 @@ pipe_asr = pipeline("automatic-speech-recognition", model=model, tokenizer=proce
 
 base_audio_drive = "/data/audio"
 
-# def transcribe_function(stream, new_chunk):
-#     try:
-#         sr, y = new_chunk[0], new_chunk[1]
-#     except TypeError:
-#         print(f"Error chunk structure: {type(new_chunk)}, content: {new_chunk}")
-#         return stream, "", None
-
-#     y = y.astype(np.float32) / np.max(np.abs(y))
-
-#     if stream is not None:
-#         stream = np.concatenate([stream, y])
-#     else:
-#         stream = y
-
-#     result = pipe_asr({"array": stream, "sampling_rate": sr}, return_timestamps=False)
-
-#     full_text = result.get("text","")
-    
-#     return stream, full_text, result
-
 def transcribe_function(stream, new_chunk):
     try:
         sr, y = new_chunk[0], new_chunk[1]
@@ -624,6 +511,7 @@ def transcribe_function(stream, new_chunk):
     
     return stream, full_text, result
 
+
 def update_map_with_response(history):
     if not history:
         return ""