Update app.py

added file uploads pdf and txt

app.py

@@ -723,7 +723,7 @@ def new_conversation(user):
     clean_up(user)  # .wav files
     flist = []
     for ext in ['png','docx','xlsx','pdf','pptx', 'csv']:
-        flist.extend(glob(f'{dataDir}{user}.{ext}'))
+        flist.extend(glob(f'{dataDir}{user}*.{ext}'))
     flist.extend(glob(f'{dataDir}{user}_image.b64'))
     for fpath in flist:
         if os.path.exists(fpath):
@@ -735,7 +735,9 @@ def new_conversation(user):
     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='pd', visible=False),
-            gr.Dropdown(choices=mode_list, value=mode_list[0]), gr.DownloadButton(label='Download File', visible=False, value=None)]
+            gr.Dropdown(choices=mode_list, value=mode_list[0]),
+            gr.DownloadButton(label='Download File', visible=False, value=None), None,
+            gr.File(label='Upload File', visible=False)]
 
 def updatePassword(txt):
     password = txt.lower().strip()
@@ -763,7 +765,7 @@ def updatePassword(txt):
 #             ref = len(txt[ref:loc]) + len(frag)
 #     return txt
 
-def get_response(inputs, previous_response_id, container_id, image_file):
+def get_response(inputs, previous_response_id, container_id, image_file, uploaded_file_path):
     instructions = '''
 You are a helpful assistant who knows how to browse the web for info and to write and run python
 code. 
@@ -775,6 +777,25 @@ If a powerpoint slide is created, return it as an image but do not offer a downl
 If the user asks you to output a file, You must include the file you generate in the annotation
 of the output text.
 '''
+    if uploaded_file_path != '' and uploaded_file_path.casefold().split('.')[-1] == 'pdf':
+        pdf_b64 = ''
+        with open(uploaded_file_path, 'rb') as fp:
+            data = fp.read()
+            b64data = base64.b64encode(data)
+            pdf_b64 = b64data.decode('utf-8')
+        inputs.append(
+            {
+               "role" :"user",
+               "content": [
+                   {
+                   "type": "input_file",
+                   "filename": f'{os.path.basename(uploaded_file_path)}',
+                   "file_data": f'data:application/pdf;base64,{pdf_b64}',
+                   }
+                ]
+            }
+        )
+        
     if image_file != '':
         with open(image_file, 'rt') as fp:
             b64data = fp.read()
@@ -823,7 +844,7 @@ of the output text.
     return response
 
 def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_image_file='',
-        plot=None, news_interval = 'pd', mode = 'Chat'):
+        plot=None, news_interval = 'pd', mode = 'Chat', uploaded_file_path=''):
     image_out = gr.Image(visible=False, value=None)
     file_out = gr.DownloadButton(value=None)
     image_gen_model = 'gpt-4o-2024-08-06'
@@ -838,10 +859,10 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
         isBoss = True
         if prompt == 'stats':
             response = genUsageStats()
-            return [past, str(response), None, gptModel, uploaded_image_file, plot, image_out, file_out]
+            return [past, str(response), None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         if prompt == 'reset':
             response = genUsageStats(True)
-            return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out]
+            return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         if prompt.startswith('gpt4'):
             gptModel = 'gpt-4o-2024-08-06'
             prompt = prompt[5:]
@@ -852,31 +873,31 @@ 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, plot, image_out, file_out]
+            return [past, response, None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         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, plot, image_out, file_out]
+            return [past, response, None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         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, image_out, file_out]
+                return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
             elif num == 2:
                 if args[1] == 'alerts':
                     response = get_alerts()
-                    return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out]
+                    return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
                 else:
                     response = get_stock_report()
                     if args[1] == 'value':
-                        return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out]
+                        return [past, md(response), None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
                     elif args[1] == 'history':
                         (plot_df, ymax) = get_total_daily_closing_sequence(40)   #stock_history_df(12)
                         # ymax = float(ymax)
                         return [past, md(response), None, gptModel, uploaded_image_file, # plot]
                                gr.LinePlot(plot_df, x="date", y="value", visible=True, x_label_angle=270,
-                                          y_lim=[400000, 800000], label="Portfolio Value History"), image_out, file_out]
+                                          y_lim=[400000, 800000], label="Portfolio Value History"), image_out, file_out, uploaded_file_path]
             elif num >= 3:
                 if args[1] == 'news':
                     symbol = ' '.join(args[2:])
@@ -884,15 +905,15 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
                     ymax *= 1.1
                     mdtxt = md(f'News for {symbol}:\nTrends: Month = {dm:.1f}%, Week = {dw:.1f}%, Day = {dd:.1f}%\n\n' + response)
                     if plot_df.empty:
-                        return [past, mdtxt, None, gptModel, uploaded_image_file, plot, image_out, file_out]
+                        return [past, mdtxt, None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
                     else:
                         return [past, mdtxt, None, gptModel, uploaded_image_file,
                                     gr.LinePlot(plot_df, x="date", y="value", visible=True, x_label_angle=270,
                                                     y_lim=[0, ymax],label=f"{symbol.upper()} Recent Prices",
-                                                    color_map={''}), image_out, file_out]
+                                                    color_map={''}), image_out, file_out, uploaded_file_path]
         if prompt.startswith('stockload'):
             create_stock_data_file(prompt[9:].lstrip())
-            return [past, 'Stock data file created', None, gptModel, uploaded_image_file, plot, image_out, file_out]
+            return [past, 'Stock data file created', None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
     if user_window in unames and pwd_window == pwdList[unames.index(user_window)]:
         chatType = 'normal'
         deepseek = False
@@ -914,19 +935,28 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
             need_turn = False
             if len(past) == 0:
                 container_id = create_openai_container('My Container')
+                file_text = ''
+                if uploaded_file_path != '':
+                    upfile_ext = uploaded_file_path.casefold().split('.')[-1]
+                    if upfile_ext == 'txt':
+                        with open(uploaded_file_path, 'rt') as fp:
+                            file_text = fp.read() + '\n'
+                        uploaded_file_path = ''
                 inputs.append(
-                    {"role": "user", "content": f"{prompt}"}
+                    {"role": "user", "content": f"{file_text + prompt}"}
                     )
             else:
                 (prev_id, container_id) = past.pop()
                 for item in past:
                     response += item
             try:
-                result = get_response(inputs, prev_id, container_id, uploaded_image_file)
+                result = get_response(inputs, prev_id, container_id,
+                                     uploaded_image_file, uploaded_file_path)
                 uploaded_image_file = ''
+                uploaded_file_path = ''
             except:
                 return [[], "Sorry, there was an error getting the AI response",
-                       prompt, gptModel, uploaded_image_file, plot, image_out, file_out]
+                       prompt, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
 
             image_done = False
             ann_files = [] # (container_id, file_id, filename)
@@ -1046,7 +1076,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
                 f.write(f'{user_window}:{tokens_in}/{tokens_out}-4omini\n')
             if isBoss:
                 response += md(f"\n\ngpt-5-mini: tokens in/out = {tokens_in}/{tokens_out}\n")
-            return [past, response , None, gptModel, uploaded_image_file, plot, image_out, file_out]
+            return [past, response , None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         if mode == 'Search':
             loc = prompt.find('q:')
             if loc > -1:
@@ -1136,7 +1166,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, plot, image_out, file_out]
+                return [past, msg, None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
         if not chatType in special_chat_types:
             reply = completion.choices[0].message.content
             # if 'groq' in reporting_model:
@@ -1179,9 +1209,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, plot, image_out, file_out]
+        return [past, response , None, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
     else:
-        return [[], "User name and/or password are incorrect", prompt, gptModel, uploaded_image_file, plot, image_out, file_out]
+        return [[], "User name and/or password are incorrect", prompt, gptModel, uploaded_image_file, plot, image_out, file_out, uploaded_file_path]
 
 def new_func(user):
     dataFile = dataDir + user + '_log.txt'
@@ -1384,6 +1414,7 @@ def show_help():
              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 str(txt).replace('```', ' ').replace('  ', '&nbsp;&nbsp;').replace('  ', '&nbsp;&nbsp;').replace('  ', '&nbsp;&nbsp;').replace('\n','<br>')
+
 def upload_image(prompt, user, password, mode):
     if not (user in unames and password == pwdList[unames.index(user)]):
         return [gr.Image(visible=False, interactive=True), "Incorrect user name and/or password"]
@@ -1442,6 +1473,24 @@ def mode_change(mode):
     else:
         return gr.Dropdown(visible=True, value='pd')
 
+def upload_file(user, password):
+    if not (user in unames and password == pwdList[unames.index(user)]):
+        return [gr.File(visible=False, label='Upload File'), 'Incorrect user and/or password']
+    return [gr.File(visible=True, label='UploadFile'), '']
+
+def load_file(file, user):
+    fname = os.path.basename(file.name)
+    out_path = dataDir + user + '-' + fname
+    with open(file.name, 'rb') as fp:
+        data = fp.read()
+        with open(out_path, 'wb') as fp2:
+            fp2.write(data)
+    return [out_path, f'File {fname} uploaded\n']
+
+#     return [value
+
+# outputs=[uploaded_file_path, output_window]
+
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     history = gr.State([])
     password = gr.State("")
@@ -1450,6 +1499,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     q = gr.State([])
     qsave = gr.State([])
     uploaded_image_file = gr.State('')
+    uploaded_file_path = gr.State('')
 
     def clean_up(user):
         flist = glob(dataDir + f'{user}_speech*.wav')
@@ -1575,6 +1625,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         # gpt_chooser=gr.Radio(choices=[("GPT-3.5","gpt-3.5-turbo"),("GPT-4o","gpt-4o-mini")],
         #                      value="gpt-3.5-turbo", label="GPT Model", interactive=True)
         button_do_image = gr.Button(value='Make Image')
+        button_upload_file = gr.Button(value='Upload Input File')
         button_get_image = gr.Button(value='Upload Image to Analyze')
         speak_output = gr.Button(value="Speak Dialog", visible=True)
         submit_button = gr.Button(value="Submit Prompt/Question")
@@ -1592,16 +1643,19 @@ 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():
+        file_uploader = gr.File(visible=False, label='Upload File', type='filepath')
     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, plot, news_period, mode],
+                    uploaded_image_file, plot, news_period, mode, uploaded_file_path],
              outputs=[history, output_window, prompt_window, model, uploaded_image_file, plot,
-                     image_window, file_download])
+                     image_window, file_download, uploaded_file_path])
     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, mode, file_download])
+                      uploaded_image_file, plot, news_period, mode, file_download, uploaded_file_path,
+                      file_uploader])
     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])
@@ -1618,6 +1672,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     image_window2.upload(fn=load_image, inputs=[image_window2, user], outputs=[uploaded_image_file, output_window])
     mode.change(fn=mode_change, inputs=mode,outputs=news_period)
     pwd_window.blur(updatePassword, inputs = pwd_window, outputs = [password, pwd_window, mode])
-
+    button_upload_file.click(fn=upload_file, inputs=[user, password],
+                            outputs=[file_uploader, output_window])
+    file_uploader.upload(fn=load_file, inputs=[file_uploader, user], outputs=[uploaded_file_path, output_window])
     # demo.unload(final_clean_up(user))
 demo.launch(share=True, allowed_paths=[dataDir], ssr_mode=False)