Update app.py

app.py

@@ -27,11 +27,15 @@ client = OpenAI(api_key = key)
 
 def genUsageStats(do_reset=False):
     result = []
-    ttotal4o = 0
-    ttotal4mini = 0
+    ttotal4o_in = 0
+    ttotal4o_out = 0
+    ttotal4mini_in = 0
+    ttotal4mini_out = 0
     for user in unames:
-        tokens4o = 0
-        tokens4mini = 0
+        tokens4o_in = 0
+        tokens4o_out = 0
+        tokens4mini_in = 0
+        tokens4mini_out = 0
         fp = dataDir + user + '_log.txt'
         if os.path.exists(fp):
             accessOk = False
@@ -45,22 +49,27 @@ def genUsageStats(do_reset=False):
                         for line in dataList:
                             (u, t) = line.split(':')
                             (t, m) = t.split('-')
-                            tcount = int(t)
+                            (tin, tout) = t.split('/')
+                            incount = int(tin)
+                            outcount = int(tout)
                             if 'mini' in m:
-                                tokens4mini += tcount
-                                ttotal4mini += tcount
+                                tokens4mini_in += incount
+                                tokens4mini_out += outcount
+                                ttotal4mini_in += incount
+                                ttotal4mini_out += outcount
                             else:
-                                tokens4o += tcount
-                                ttotal4o += tcount
+                                tokens4o_in += incount
+                                tokens4o_out += outcount
+                                ttotal4o_in += incount
+                                ttotal4o_out += outcount
                     accessOk = True
                     break
                 except:
                     sleep(3)
             if not accessOk:
                 return f'File access failed reading stats for user: {user}'
-        result.append([user, str(tokens4mini), str(tokens4o)])
-    gtotal = ttotal4mini + ttotal4o
-    result.append(['totals', str(ttotal4mini), str(ttotal4o), str(gtotal)])
+        result.append([user, f'{tokens4mini_in}/{tokens4mini_out}', f'{tokens4o_in}/{tokens4o_out}'])
+    result.append(['totals', f'{ttotal4mini_in}/{ttotal4mini_out}', f'{ttotal4o_in}/{ttotal4o_out}'])
     return result       
 
 def clear():
@@ -91,10 +100,12 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel):
         completion = client.chat.completions.create(model=gptModel,
                                             messages=past)
         reply = completion.choices[0].message.content
+        tokens_in = completion.usage.prompt_tokens
+        tokens_out = completion.usage.completion_tokens
         tokens = completion.usage.total_tokens
         response += "\n\nYOU: " + prompt + "\nGPT: " + reply
         if isBoss:
-            response += f"\n{gptModel}: {tokens} tokens"
+            response += f"\n{gptModel}: tokens in/out = {tokens_in}/{tokens_out}"
         if tokens > 40000:
             response += "\n\nTHIS DIALOG IS GETTING TOO LONG. PLEASE RESTART CONVERSATION SOON."
         past.append({"role":"assistant", "content": reply})
@@ -106,7 +117,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel):
                     m = '4o'
                     if 'mini' in gptModel:
                         m = '4omini'
-                    f.write(f'{user_window}: {tokens}-{m}\n')
+                    f.write(f'{user_window}:{tokens_in}/{tokens_out}-{m}\n')
                 accessOk = True
                 break
             except Exception as e: