Update app.py

app.py

@@ -28,8 +28,8 @@ client = OpenAI(api_key = key)
 def genUsageStats(do_reset=False):
     result = []
     for user in unames:
-        tokens3 = 0
-        tokens4 = 0
+        tokens4o = 0
+        tokens4mini = 0
         fp = dataDir + user + '_log.txt'
         if os.path.exists(fp):
             accessOk = False
@@ -43,41 +43,42 @@ def genUsageStats(do_reset=False):
                         for line in dataList:
                             (u, t) = line.split(':')
                             (t, m) = t.split('-')
-                            if '4' in m:
-                                tokens4 += int(t)
+                            if 'mini' in m:
+                                tokens4mini += int(t)
                             else:
-                                tokens3 += int(t)
+                                tokens4o += int(t)
                     accessOk = True
                     break
                 except:
                     sleep(3)
             if not accessOk:
                 return f'File access failed reading stats for user: {user}'
-        # else:
-        #     total = 0
-        result.append([user, str(tokens3), str(tokens4)])
+        result.append([user, str(tokens4mini), str(tokens4o)])
     return result       
 
 def clear():
     return [None, [], None]
 
 def updatePassword(txt):
-    return [txt.lower(), "*********"]
+    return [txt.lower().strip(), "*********"]
 
 # def setModel(val):
 #     return val
 
 def chat(prompt, user_window, pwd_window, past, response, gptModel):
-    user_window = user_window.lower()
+    user_window = user_window.lower().strip()
     isBoss = False
     if user_window == unames[0] and pwd_window == pwdList[0]:
         isBoss = True
         if prompt == 'stats':
             response = genUsageStats()
-            return [past, response, None]
+            return [past, response, None, gptModel]
         if prompt == 'reset':
             response = genUsageStats(True)
-            return [past, response, None]
+            return [past, response, None, gptModel]
+        if prompt.startswith('gpt4'):
+            gptModel = 'gpt-4o'
+            prompt = prompt[5:]
     if user_window in unames and pwd_window in pwdList:
         past.append({"role":"user", "content":prompt})
         completion = client.chat.completions.create(model=gptModel,
@@ -95,9 +96,9 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel):
             try:
                 dataFile = new_func(user_window)
                 with open(dataFile, 'a') as f:
-                    m = '3'
-                    if '4' in gptModel:
-                        m = '4'
+                    m = '4o'
+                    if 'mini' in gptModel:
+                        m = '4omini'
                     f.write(f'{user_window}: {tokens}-{m}\n')
                 accessOk = True
                 break
@@ -105,9 +106,9 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel):
                 sleep(3)
         if not accessOk:
             response += f"\nDATA LOG FAILED, path = {dataFile}"
-        return [past, response , None]
+        return [past, response , None, gptModel]
     else:
-        return [[], "User name and/or password are incorrect", prompt]
+        return [[], "User name and/or password are incorrect", prompt, gptModel]
 
 def new_func(user_window):
     dataFile = dataDir + user_window + '_log.txt'
@@ -132,7 +133,7 @@ with gr.Blocks() as demo:
     prompt_window = gr.Textbox(label = "Prompt or Question")
     output_window = gr.Textbox(label = "Dialog")
     submit_window.click(chat, inputs=[prompt_window, user_window, password, history, output_window, model],
-                         outputs=[history, output_window, prompt_window])
+                         outputs=[history, output_window, prompt_window, model])
     clear_button.click(clear, inputs=[], outputs=[prompt_window, history, output_window])
     # gpt_chooser.input(fn=setModel, inputs=gpt_chooser, outputs=model)
 demo.launch()