Update app.py

Added plot to stock news. Fixed: quotes were highs rather than closes

app.py

@@ -97,28 +97,36 @@ def stock_list():
     return rv
 
 def get_stock_news(search_symbol):
-    name_list = []
+    stock_list = {}
     fuzzy = True
+    have_symbol = False
+    search_symbol = search_symbol.strip().upper()
     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
+            stock_list[symbol.strip()] = name.strip()
+    search_term = search_symbol
+    if search_symbol in stock_list.keys():
+        have_symbol = True
+        search_term = stock_list[search_symbol]
     try:
         news = yf.Search(search_term, news_count=5, enable_fuzzy_query=fuzzy).news
     except:
-        return f'No results for search term {search_term}, check spelling'
+        return (f'No results for search term {search_term}, check spelling', None)
     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'
         rv += f'Link: [URL]({item["link"]})\n\n'
-    return rv
+
+    if have_symbol:
+        (plot_df, ymax) = stock_week_df(search_symbol)
+    else:
+        (plot_df, ymax) = (pd.DataFrame(), 0.0)
+
+    return (rv, plot_df, ymax)
 
 def stock_history_df(num_weeks):
     values = []
@@ -139,6 +147,60 @@ def stock_history_df(num_weeks):
         }
     return (pd.DataFrame(data), f'{int(xmax + 10000)}')
 
+def stock_week_df(symbol):
+    try:
+        dates = []
+        values = []
+        ymax = 0
+        etime = etz_now()
+        if etime.hour >= 16:
+            etime = etime + timedelta(days=1)
+        week_ago = etime - timedelta(days=8)
+        end = etime.strftime('%Y-%m-%d')
+        start = week_ago.strftime('%Y-%m-%d')
+        df = yf.download(symbol.upper(),
+                        start = start,
+                        end = end,
+                        progress = False,
+                        )
+        vals2d = df.values.tolist()
+        valsTxt = []
+        numDays = len(vals2d)
+        for i in range(numDays):
+            valsTxt.append(vals2d[i][0])
+        for val in valsTxt:
+            v = float(val)
+            values.append(v)
+            if v > ymax:
+                ymax = v
+        for row in df.index:
+            dates.append(row.strftime('%Y-%m-%d'))
+        data = {
+            "date": dates,
+            "value" : values
+            }
+        return (pd.DataFrame(data), ymax)
+    except:
+        return (pd.DataFrame(), ymax)
+
+
+    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 = {}
@@ -197,7 +259,7 @@ def get_last_closing(symbol, offset=0, timeout=10):
         for row in data_top.index:
             closing_date = row.strftime('%Y-%m-%d')
             # print(closing_date)
-        return (df.iat[-1,1], closing_date)
+        return (df.iat[-1,0], closing_date)
     except:
         return (0.0, "0000-00-00")
 
@@ -442,8 +504,14 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             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]
+                    (response, plot_df, ymax) = get_stock_news(symbol)
+                    ymax *= 1.1
+                    if plot_df.empty:
+                        return [past, md(response), None, gptModel, uploaded_image_file, plot]
+                    else:
+                        return [past, md(response), None, gptModel, uploaded_image_file,
+                                    gr.LinePlot(plot_df, x="date", y="value", visible=True,
+                                                    y_lim=[0, ymax],label=f"{symbol} Recent Prices")]
                 # elif arg[1] == 'history':
                 #     symbol = arg[2]
                 #     response = 'ok' # get_
@@ -898,8 +966,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         #                      value="gpt-3.5-turbo", label="GPT Model", interactive=True)
         button_do_image = gr.Button(value='Make Image')
         button_get_image = gr.Button(value='Upload Image to Analyze')
-        submit_button = gr.Button(value="Submit Prompt/Question")
         speak_output = gr.Button(value="Speak Dialog", visible=True)
+        submit_button = gr.Button(value="Submit Prompt/Question")
     prompt_window = gr.Textbox(label = "Prompt or Question")
     gr.Markdown('### **Dialog:**')
     output_window = gr.Markdown(container=True)