Update app.py

OpenAI client no longer global.

app.py

@@ -37,7 +37,7 @@ else:
 
 speak_file = dataDir + "speek.wav"
 
-client = OpenAI(api_key = key)
+# client = OpenAI(api_key = key)
 
 #digits = ['zero: ','one: ','two: ','three: ','four: ','five: ','six: ','seven: ','eight: ','nine: ']
 
@@ -52,7 +52,9 @@ class Step(BaseModel):
 class MathReasoning(BaseModel):
     steps: list[Step]
     final_answer: str
-    
+
+def Client():
+    return OpenAI(api_key = key)
 
 def solve(prompt, chatType):
     tokens_in = 0
@@ -63,7 +65,7 @@ def solve(prompt, chatType):
     elif chatType == "logic":
         instruction = "you are an expert in logic and reasoning.  Guide the user through the solution step by step"
     try:
-        completion = client.beta.chat.completions.parse(
+        completion = Client().beta.chat.completions.parse(
             model = 'gpt-4o-2024-08-06',
             messages = [
                 {"role": "system", "content": instruction},
@@ -277,7 +279,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, uploaded_ima
            (reply, tokens_in, tokens_out, tokens) = solve(prompt, chatType)
            reporting_model = image_gen_model
         elif not gen_image:
-            completion = client.chat.completions.create(model=gptModel,
+            completion = Client().chat.completions.create(model=gptModel,
                                             messages=past)
             reporting_model = gptModel
         else:
@@ -335,7 +337,7 @@ def transcribe(user, pwd, fpath):
             with open(dataDir + user + '_audio.txt','a') as f:
                 f.write(f'audio:{str(duration)}\n')
     with open(fpath,'rb') as audio_file:
-        transcript = client.audio.transcriptions.create(
+        transcript = Client().audio.transcriptions.create(
             model='whisper-1', file = audio_file ,response_format = 'text' )
     reply = transcript
     return str(reply)
@@ -346,7 +348,7 @@ def pause_message():
 # def gen_output_audio(txt):
 #     if len(txt) < 10:
 #         txt = "This dialog is too short to mess with!"
-#     response = client.audio.speech.create(model="tts-1", voice="fable", input=txt)
+#     response = Client().audio.speech.create(model="tts-1", voice="fable", input=txt)
 #     with open(speak_file, 'wb') as fp:
 #         fp.write(response.content)
 #     return speak_file
@@ -370,7 +372,7 @@ def update_user(user_win):
 def speech_worker(chunks=[],q=[]):
     for chunk in chunks:
         fpath = q.pop(0)
-        response = client.audio.speech.create(model="tts-1", voice="fable", input=chunk, speed=0.85, response_format='wav')
+        response = Client().audio.speech.create(model="tts-1", voice="fable", input=chunk, speed=0.85, response_format='wav')
         with open(fpath, 'wb') as fp:
             fp.write(response.content)
 
@@ -431,7 +433,7 @@ def make_image(prompt, user, pwd):
         if len(prompt.strip()) == 0:
             return [gr.Image(value=None, visible=False), 'You must provide a prompt describing image you desire']
         try:
-            response = client.images.generate(model='dall-e-2', prompt=prompt,size='512x512',
+            response = Client().images.generate(model='dall-e-2', prompt=prompt,size='512x512',
                quality='standard', response_format='b64_json')
         except Exception as ex:
             msg = ex.message
@@ -520,7 +522,7 @@ def analyze_image(user, model, prompt):
         status = "base64 image file not found"
         return [None, status]
 
-    completion = client.chat.completions.create(
+    completion = Client().chat.completions.create(
         model=model,
         messages=[
             { "role": "user",
@@ -640,7 +642,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         fname = q.pop(0)
         if len(chunklist) > 0:
             threading.Thread(target=speech_worker, daemon=True, args=(chunklist[1:],fname_list[1:])).start()
-        response = client.audio.speech.create(model="tts-1", voice="fable", input=chunk, speed=0.85, response_format='wav')
+        response = Client().audio.speech.create(model="tts-1", voice="fable", input=chunk, speed=0.85, response_format='wav')
         with open(fname, 'wb') as fp:
             fp.write(response.content)
         return [fname, q]
@@ -654,7 +656,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         if not os.path.exists(fname):
             sleep(3)
             if not os.path.exists(fname):
-                response = client.audio.speech.create(model="tts-1", voice="fable",
+                response = Client().audio.speech.create(model="tts-1", voice="fable",
                     input='Sorry, text-to-speech is responding too slow right now', speed=0.85, response_format='wav')
                 with open(fname, 'wb') as fp:
                     fp.write(response.content)
@@ -689,8 +691,9 @@ 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')
-    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])
+    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])
     clear_button.click(fn=new_conversation, inputs=user_window,
                       outputs=[prompt_window, history, output_window, image_window, image_window2, uploaded_image_file])
     audio_widget.stop_recording(fn=transcribe, inputs=[user_window, password, audio_widget],