Update app.py

added stock history plot

app.py

@@ -63,12 +63,38 @@ class MathReasoning(BaseModel):
 def Client():
     return OpenAI(api_key = key)
 
+def test_plot_df():
+    data = {
+        "month": ['2024-01','2024-02','2024-03'],
+        "value": [22.4, 30.1, 25.6]
+        }
+    return pd.DataFrame(data)
+
 def etz_now():
     eastern = pytz.timezone('US/Eastern')
     ltime = datetime.now(eastern)
     return ltime
 
-def get_stock_report():
+def stock_history_df(num_weeks):
+    values = []
+    dates = []
+    xmax = 0
+    for offset in range(num_weeks+1):
+        (value, date) = get_stock_report(False, offset)
+        date = date[5:]
+        values.append(value)
+        dates.append(date)
+        if float(value) > xmax:
+            xmax = float(value)
+    values.reverse()
+    dates.reverse()
+    data = {
+        "date": dates,
+        "value" : values
+        }
+    return (pd.DataFrame(data), f'{int(xmax + 10000)}')
+
+def get_stock_report(verbose = True, offset = 0):
     try:
         stock_data = {}
         global stock_data_path
@@ -82,28 +108,35 @@ def get_stock_report():
             shares = shares.strip()
             stock_data[symbol] = {"symbol": symbol, "name": name, "shares": shares, "closing": '0'}
         for symbol in stock_data.keys():
-            (closing_price, closing_date) = get_last_closing(symbol)
+            (closing_price, closing_date) = get_last_closing(symbol, offset)
             if closing_price == 0:
                 error_msg += f'Error getting closing for {symbol}\n'
             stock_data[symbol]['closing'] = f'{closing_price:.2f}'
         total_value = 0.0
-        rv = f'At closing on {closing_date}:\n'
-        for item in stock_data.values():
-            rv += str(item) + '\n'
-            total_value += float(item['closing']) * float(item['shares'])
-        rv += (f'\nTotal value = {total_value:.2f}\n')
-        if len(error_msg) > 0:
-            rv += error_msg
-        rv += f'Eastern time is: {etz_now()}'
+        if verbose:
+            rv = f'At closing on {closing_date}:\n'
+            for item in stock_data.values():
+                rv += str(item) + '\n'
+                total_value += float(item['closing']) * float(item['shares'])
+            rv += (f'\nTotal value = {total_value:.2f}\n')
+            if len(error_msg) > 0:
+                rv += error_msg
+            rv += f'Eastern time is: {etz_now()}'
+        else:
+            for item in stock_data.values():
+                total_value += float(item['closing']) * float(item['shares'])
+            return (total_value, closing_date)
     except:
         rv = 'Error getting stock report'
     return rv
 
-def get_last_closing(symbol, timeout=10):
+def get_last_closing(symbol, offset=0, timeout=10):
     try:
         etime = etz_now()
         if etime.hour >= 16:
             etime = etime + timedelta(days=1)
+        if offset > 0:
+            etime = etime - timedelta(weeks=offset)
         five_days_ago = etime - timedelta(days=6)
         end = etime.strftime('%Y-%m-%d')
         start = five_days_ago.strftime('%Y-%m-%d')
@@ -293,7 +326,8 @@ def new_conversation(user):
     for fpath in flist:
         if os.path.exists(fpath):
             os.remove(fpath)
-    return [None, [], None, gr.Image(visible=False, value=None),  gr.Image(visible=False, value=None), '']
+    return [None, [], None, gr.Image(visible=False, value=None),  gr.Image(visible=False, value=None), '',
+            gr.LinePlot(visible=False)]
 
 def updatePassword(txt):
     password = txt.lower().strip()
@@ -317,18 +351,19 @@ 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=''):
+def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_image_file='', plot=None):
     image_gen_model = 'gpt-4o-2024-08-06'
     user_window = user_window.lower().strip()
     isBoss = False
+    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]
+            return [past, response, None, gptModel, uploaded_image_file, plot]
         if prompt == 'reset':
             response = genUsageStats(True)
-            return [past, response, None, gptModel, uploaded_image_file]
+            return [past, response, None, gptModel, uploaded_image_file, plot]
         if prompt.startswith('gpt4'):
             gptModel = 'gpt-4o-2024-08-06'
             prompt = prompt[5:]
@@ -336,17 +371,24 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             user = prompt[6:]
             response = f'cleaned all .wav and .b64 files for {user}'
             final_clean_up(user, True)
-            return [past, response, None, gptModel, uploaded_image_file]
+            return [past, response, None, gptModel, uploaded_image_file, plot]
         if prompt.startswith('files'):
             (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]
+            return [past, response, None, gptModel, uploaded_image_file, plot]
         if prompt.startswith('stocks'):
             response = get_stock_report()
-            return [past, response, None, gptModel, uploaded_image_file]
+            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('stockload'):
             create_stock_data_file(prompt[9:].lstrip())
-            return [past, 'Stock data file created', None, gptModel, uploaded_image_file]
+            return [past, 'Stock data file created', None, gptModel, uploaded_image_file, plot]
     if user_window in unames and pwd_window == pwdList[unames.index(user_window)]:
         chatType = 'normal'
         prompt = prompt.strip()
@@ -370,7 +412,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             uploaded_image_file= ''
             reporting_model = image_gen_model
             if not msg == 'ok':
-                return [past, msg, None, gptModel, uploaded_image_file]
+                return [past, msg, None, gptModel, uploaded_image_file, plot]
         if not chatType in special_chat_types:
             reply = completion.choices[0].message.content
             tokens_in = completion.usage.prompt_tokens
@@ -397,9 +439,9 @@ 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]
+        return [past, response , None, gptModel, uploaded_image_file, plot]
     else:
-        return [[], "User name and/or password are incorrect", prompt, gptModel, uploaded_image_file]
+        return [[], "User name and/or password are incorrect", prompt, gptModel, uploaded_image_file, plot]
 
 def new_func(user):
     dataFile = dataDir + user + '_log.txt'
@@ -787,11 +829,13 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             image_window2 = gr.Image(visible=False, interactive=True, label='Image to Analyze', type='filepath')
         with gr.Column():
             image_window = gr.Image(visible=False, label='Generated Image')
+    with gr.Row():
+        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],
-             outputs=[history, output_window, prompt_window, model, uploaded_image_file])
+             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])
+                      outputs=[prompt_window, history, output_window, image_window, image_window2, uploaded_image_file, plot])
     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])