Update app.py

Output window is markdown. Stock stuff improved.

app.py

@@ -70,6 +70,10 @@ def test_plot_df():
         }
     return pd.DataFrame(data)
 
+def md(txt):
+    return str(txt).replace('```', ' ').replace('  ', '&nbsp;&nbsp;').replace('  ', '&nbsp;&nbsp;').replace('  ', '&nbsp;&nbsp;').replace('\n','<br>')
+    # return txt
+
 def etz_now():
     eastern = pytz.timezone('US/Eastern')
     ltime = datetime.now(eastern)
@@ -81,24 +85,39 @@ def date_from_utime(utime):
     eastern = pytz.timezone('US/Eastern')
     return dt.astimezone(eastern).strftime('%Y-%m-%d')
 
-def get_stock_news(search_symbol):
-    name_dict = {}
+def stock_list():
+    rv = ''
     with open(stock_data_path, 'rt') as fp:
         lines = fp.readlines()
         for line in lines:
             (name, symbol, shares) = line.rstrip().split(',')
             name = name.strip()
             symbol = symbol.strip()
-            name_dict[symbol] = name
+            rv += f'{symbol}  {name}\n'
+    return rv
+
+def get_stock_news(search_symbol):
+    name_list = []
+    fuzzy = True
+    with open(stock_data_path, 'rt') as fp:
+        lines = fp.readlines()
+        for line in lines:
+            (name, symbol, shares) = line.rstrip().split(',')
+            name = name.strip()
+            name_list.append(name)
+    search_term = search_symbol.strip().upper()
+    if search_symbol in name_list:
+        fuzzy = False
     try:
-        news = yf.Search(name_dict[search_symbol.upper()], news_count=5).news
+        news = yf.Search(search_term, news_count=5, enable_fuzzy_query=fuzzy).news
     except:
-        return f'No results for symbol {search_symbol}, check spelling'
+        return f'No results for search term {search_term}, check spelling'
     rv = ''
     for item in news:
         rv += f'Title: {item["title"]}\n'
         rv += f'Publisher: {item["publisher"]}\n'
-        rv += f'Date published: {date_from_utime(item["providerPublishTime"])}\n\n'
+        rv += f'Date published: {date_from_utime(item["providerPublishTime"])}\n'
+        rv += f'Link: [URL]({item["link"]})\n\n'
     return rv
 
 def stock_history_df(num_weeks):
@@ -381,12 +400,14 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
     image_gen_model = 'gpt-4o-2024-08-06'
     user_window = user_window.lower().strip()
     isBoss = False
+    if not response:
+        response = ''
     plot = gr.LinePlot(visible=False)
     if user_window == unames[0] and pwd_window == pwdList[0]:
         isBoss = True
         if prompt == 'stats':
             response = genUsageStats()
-            return [past, response, None, gptModel, uploaded_image_file, plot]
+            return [past, md(response), None, gptModel, uploaded_image_file, plot]
         if prompt == 'reset':
             response = genUsageStats(True)
             return [past, response, None, gptModel, uploaded_image_file, plot]
@@ -402,20 +423,46 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             (log_cnt, wav_cnt, other_cnt, others, log_list) = list_permanent_files()
             response = f'{log_cnt} log files\n{wav_cnt} .wav files\n{other_cnt} Other files:\n{others}\nlogs: {str(log_list)}'
             return [past, response, None, gptModel, uploaded_image_file, plot]
-        if prompt.startswith('stocks'):
-            response = get_stock_report()
-            if 'history' in prompt:
-                (plot_df, ymax) = stock_history_df(12)
-                ymax = float(ymax)
-                return [past, response, None, gptModel, uploaded_image_file,
-                       gr.LinePlot(plot_df, x="date", y="value", visible=True,
-                                  y_lim=[500000, 700000], label="Portfolio Value History")]
-            else:
-                return [past, response, None, gptModel, uploaded_image_file, plot]
-        if prompt.startswith('stock news'):
-                symbol = prompt[11:]
-                response = get_stock_news(symbol)
-                return [past, response, None, gptModel, uploaded_image_file, plot]
+        if prompt.startswith('stock'):
+            args = prompt.split(' ')
+            num = len(args)
+            if num == 1:
+                response = stock_list()
+                return [past, md(response), None, gptModel, uploaded_image_file, plot]
+            elif num == 2:
+                response = get_stock_report()
+                if args[1] == 'value':
+                    return [past, md(response), None, gptModel, uploaded_image_file, plot]
+                elif args[1] == 'history':
+                    (plot_df, ymax) = stock_history_df(12)
+                    # ymax = float(ymax)
+                    return [past, md(response), None, gptModel, uploaded_image_file,
+                           gr.LinePlot(plot_df, x="date", y="value", visible=True,
+                                      y_lim=[500000, 700000], label="Portfolio Value History")]
+            elif num >= 3:
+                if args[1] == 'news':
+                    symbol = ' '.join(args[2:])
+                    response = get_stock_news(symbol)
+                    return [past, md(response), None, gptModel, uploaded_image_file, plot]
+                # elif arg[1] == 'history':
+                #     symbol = arg[2]
+                #     response = 'ok' # get_
+
+
+        # if prompt.startswith('stock values'):
+        #     response = get_stock_report()
+        #     if 'history' in prompt:
+        #         (plot_df, ymax) = stock_history_df(12)
+        #         ymax = float(ymax)
+        #         return [past, response, None, gptModel, uploaded_image_file,
+        #                gr.LinePlot(plot_df, x="date", y="value", visible=True,
+        #                           y_lim=[500000, 700000], label="Portfolio Value History")]
+        #     else:
+        #         return [past, response, None, gptModel, uploaded_image_file, plot]
+        # if prompt.startswith('stock news'):
+        #         symbol = prompt[11:]
+        #         response = get_stock_news(symbol)
+        #         return [past, response, None, gptModel, uploaded_image_file, plot]
         if prompt.startswith('stockload'):
             create_stock_data_file(prompt[9:].lstrip())
             return [past, 'Stock data file created', None, gptModel, uploaded_image_file, plot]
@@ -448,9 +495,9 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             tokens_in = completion.usage.prompt_tokens
             tokens_out = completion.usage.completion_tokens
             tokens = completion.usage.total_tokens
-        response += "\n\nYOU: " + prompt + "\nGPT: " + reply
+        response += md("\n\nYOU: " + prompt + "\nGPT: " + reply)
         if isBoss:
-            response += f"\n{reporting_model}: tokens in/out = {tokens_in}/{tokens_out}"
+            response += md(f"\n{reporting_model}: tokens in/out = {tokens_in}/{tokens_out}")
         if tokens > 40000:
             response += "\n\nTHIS DIALOG IS GETTING TOO LONG. PLEASE RESTART CONVERSATION SOON."
         past.append({"role":"assistant", "content": reply})
@@ -469,7 +516,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
                 sleep(3)
         if not accessOk:
             response += f"\nDATA LOG FAILED, path = {dataFile}"
-        return [past, response , None, gptModel, uploaded_image_file, plot]
+        return [past, md(response) , None, gptModel, uploaded_image_file, plot]
     else:
         return [[], "User name and/or password are incorrect", prompt, gptModel, uploaded_image_file, plot]
 
@@ -511,7 +558,7 @@ def pause_message():
 
 def set_speak_button(txt):
     vis = False
-    if len(txt) > 2:
+    if txt and len(txt) > 2:
         vis = True
     return gr.Button(visible=vis)
 
@@ -623,7 +670,7 @@ def make_image(prompt, user, pwd):
     return [gr.Image(visible=True, value=fpath), msg]
 
 def show_help():
-    return '''
+    txt = '''
     1.  Gemeral:
         1.1 Login with user name and password (not case-sensitive)
         1.2 Type prompts (questions, instructions) into "Prompt or Question" window (OR) you can speak prompts by
@@ -661,6 +708,7 @@ def show_help():
         4. "Speak Dialog" will voice whatever is currently in the Dialog window.  You can repeat it and you
              can edit what's to be spoken.  Except:  In a chat conversation, spoken dialog will only include
              the latest prompt/response ("YOU:/GPT:") sequence.'''
+    return md(txt)
 
 def upload_image(prompt, user, password):
     if not (user in unames and password == pwdList[unames.index(user)]):
@@ -853,7 +901,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         submit_button = gr.Button(value="Submit Prompt/Question")
         speak_output = gr.Button(value="Speak Dialog", visible=False)
     prompt_window = gr.Textbox(label = "Prompt or Question")
-    output_window = gr.Textbox(label = "Dialog")
+    output_window = gr.Markdown(label = "Dialog")
     with gr.Row():
         with gr.Column():
             image_window2 = gr.Image(visible=False, interactive=True, label='Image to Analyze', type='filepath')