Update app.py

Added mode dropdown and Brave search mode

app.py

@@ -36,6 +36,7 @@ pwdList = pwds.split(',')
 DEEPSEEK_KEY=os.getenv('DEEPSEEK_KEY')
 GROQ_KEY=os.getenv('GROQ_KEY')
 BRAVE_KEY=os.getenv('BRAVE_KEY')
+BRAVE_SEARCH_KEY=os.getenv('BRAVE_SEARCH_KEY')
 
 site = os.getenv('SITE')
 if site == 'local':
@@ -49,6 +50,7 @@ else:
 stock_data_path = dataDir + 'Stocks.txt'
 
 braveNewsEndpoint = "https://api.search.brave.com/res/v1/news/search"
+braveSearchEndpoint = "https://api.search.brave.com/res/v1/web/search"
 
 speak_file = dataDir + "speek.wav"
 
@@ -70,6 +72,24 @@ class MathReasoning(BaseModel):
     steps: list[Step]
     final_answer: str
 
+def get_brave_search_results(query: str):
+    rv = ''
+    url = f'{braveSearchEndpoint}?q={quote(query)}&count=20'
+    response = requests.get(
+        url,
+        headers= {"Accept": "application/json",
+                  "X-Subscription-Token": BRAVE_SEARCH_KEY
+                  },
+        )
+    jdata = response.json()
+    web_results = jdata['web']['results']
+    for item in web_results:
+        title = item['title']
+        description = item['description']
+        rv += f'{title}: {description} --'
+    return rv
+
+
 def get_brave_news(query: str, interval: str = 'pd'):
     url = f'{braveNewsEndpoint}?q={quote(query)}&count=20&extra_snippets=true&freshness={interval}' 
     response = requests.get(
@@ -78,7 +98,9 @@ def get_brave_news(query: str, interval: str = 'pd'):
                   "X-Subscription-Token": BRAVE_KEY
                   },
         )
-    rv = ''
+    rv ='''Following are list items delineated by *item separator*
+At the end of each item is (item source, item age)
+*item separator*  '''
     jdata = response.json()
     for item in jdata['results']:
         title = item['title']
@@ -99,7 +121,6 @@ def get_brave_news(query: str, interval: str = 'pd'):
             age = 'unknown'
         rv += f' (Item source: {host}, Item age: {age})'
         rv += ' *item separator* '
-
     return rv
 
 def Client():
@@ -624,7 +645,7 @@ def new_conversation(user):
             os.remove(fpath)
     return [None, [], gr.Markdown(value='', label='Dialog', container=True),
             gr.Image(visible=False, value=None),  gr.Image(visible=False, value=None), '',
-            gr.LinePlot(visible=False), gr.Dropdown(value="None")]
+            gr.LinePlot(visible=False), gr.Dropdown(value="None"), gr.Dropdown(value='Chat')]
 
 def updatePassword(txt):
     password = txt.lower().strip()
@@ -648,7 +669,8 @@ def updatePassword(txt):
 #             ref = len(txt[ref:loc]) + len(frag)
 #     return txt
 
-def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_image_file='', plot=None, news_interval = 'none'):
+def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_image_file='',
+        plot=None, news_interval = 'none', mode = 'Chat'):
     image_gen_model = 'gpt-4o-2024-08-06'
     user_window = user_window.lower().strip()
     isBoss = False
@@ -714,7 +736,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
         using_groq = False
         reasoning = False
         prompt = prompt.strip()
-        news_prompt = prompt
+        augmented_prompt = prompt
         finish_reason = 'ok'
         if prompt.lower().startswith('dsr1 '):
             deepseek = True
@@ -750,10 +772,16 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             prompt = prompt[6:]
         if deepseek:
             prompt = prompt + '. Do not use Latex for math expressions.'
-        if news_interval != "None" and past==[]:
-            news = get_brave_news(prompt, news_interval)
-            news_prompt = f'{news}\n{prompt}\nGive highest priority to information just provided\n'
-        past.append({"role":"user", "content":news_prompt})
+        if past == []:
+            if mode == 'News':
+                if news_interval != "None":
+                    news = get_brave_news(prompt, news_interval)
+                    augmented_prompt = f'{news}\n{prompt}\nGive highest priority to information just provided\n'
+                    augmented_prompt += 'Mention item source and item age for each item used\n'
+            elif mode == 'Search':
+                news = get_brave_search_results(prompt)
+                augmented_prompt = f'{news}\n{prompt}\nGive highest priority to information just provided\n'
+        past.append({"role":"user", "content":augmented_prompt})
         gen_image = (uploaded_image_file != '')
         if chatType in special_chat_types:
            (reply, tokens_in, tokens_out, tokens) = solve(prompt, chatType)
@@ -1222,7 +1250,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         speak_output = gr.Button(value="Speak Dialog", visible=True)
         submit_button = gr.Button(value="Submit Prompt/Question")
     with gr.Row():
-        prompt_window = gr.Textbox(label = "Prompt or Question", scale=5)
+        prompt_window = gr.Textbox(label = "Prompt or Question", scale=7)
+        mode = gr.Dropdown(choices=['Chat', 'News', 'Search'], label='Mode', scale=1, interactive=True)
         news_period = gr.Dropdown(choices=news_interval_choices, interactive=True,label='News Window',scale=1)
     gr.Markdown('### **Dialog:**')
     #output_window = gr.Text(container=True, label='Dialog')
@@ -1236,10 +1265,12 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         # plot = gr.Plot(visible=False)
         plot = gr.LinePlot(test_plot_df(), x="month", y="value", visible=False, label="Portfolio Value History")
     submit_button.click(chat,
-             inputs=[prompt_window, user_window, password, history, output_window, model, uploaded_image_file, plot, news_period],
+             inputs=[prompt_window, user_window, password, history, output_window, model,
+                    uploaded_image_file, plot, news_period, mode],
              outputs=[history, output_window, prompt_window, model, uploaded_image_file, plot])
     clear_button.click(fn=new_conversation, inputs=user_window,
-                      outputs=[prompt_window, history, output_window, image_window, image_window2, uploaded_image_file, plot, news_period])
+                      outputs=[prompt_window, history, output_window, image_window, image_window2,
+                              uploaded_image_file, plot, news_period, mode])
     audio_widget.stop_recording(fn=transcribe, inputs=[user_window, password, audio_widget],
                                 outputs=[prompt_window])
     audio_widget.pause_recording(fn=pause_message, outputs=[prompt_window])