Update app.py

added speech logging

app.py

@@ -48,6 +48,7 @@ def genUsageStats(do_reset=False):
     ttotal4mini_in = 0
     ttotal4mini_out = 0
     totalAudio = 0
+    totalSpeech = 0
     for user in unames:
         tokens4o_in = 0
         tokens4o_out = 0
@@ -106,18 +107,39 @@ def genUsageStats(do_reset=False):
                     sleep(3)
             if not accessOk:
                 return f'File access failed reading audio stats for user: {user}'
-        result.append([user, f'{tokens4mini_in}/{tokens4mini_out}', f'{tokens4o_in}/{tokens4o_out}', f'audio:{userAudio}'])
-    result.append(['totals', f'{ttotal4mini_in}/{ttotal4mini_out}', f'{ttotal4o_in}/{ttotal4o_out}', f'audio:{totalAudio}'])
+        userSpeech = 0
+        fp = dataDir + user + '_speech.txt'
+        if os.path.exists(fp):
+            accessOk = False
+            for i in range(3):
+                try:
+                    with open(fp) as f:
+                        dataList = f.readlines()
+                    if do_reset:
+                        os.remove(fp)
+                    else:
+                        for line in dataList:
+                            (dud, len) = line.split(':')
+                            userSpeech += int(len)
+                        totalSpeech += int(len)
+                    accessOk = True
+                    break
+                except:
+                    sleep(3)
+            if not accessOk:
+                return f'File access failed reading speech stats for user: {user}'
+        result.append([user, f'{tokens4mini_in}/{tokens4mini_out}', f'{tokens4o_in}/{tokens4o_out}', f'audio:{userAudio}',f'speech:{userSpeech}'])
+    result.append(['totals', f'{ttotal4mini_in}/{ttotal4mini_out}', f'{ttotal4o_in}/{ttotal4o_out}', f'audio:{totalAudio}',f'speech:{totalSpeech}'])
     return result       
 
 def clear():
-    return [None, [], None]
-
-def updatePassword(txt):
     while not qdelete.empty():
         fname = qdelete.get()
         if os.path.exists(fname):
             os.remove(fname)
+    return [None, [], None]
+
+def updatePassword(txt):
     return [txt.lower().strip(), "*********"]
 
 # def setModel(val):
@@ -225,7 +247,7 @@ def speech_worker(chunks=[]):
 
 
 with gr.Blocks() as demo:
-    def initial_audio_output(txt):
+    def initial_audio_output(txt, user):
         global digits
         global abbrevs
         while not qspeech.empty():
@@ -280,6 +302,11 @@ with gr.Blocks() as demo:
                 line = number + chunk
                 if line != '"':
                     chunklist.append(line)
+        total_speech = 0
+        for chunk in chunklist:
+            total_speech += len(chunk)
+        with open(dataDir + user + '_speech.txt','a') as f:
+            f.write(f'speech:{str(total_speech)}\n')
         chunk = chunklist[0]
         if chunk.strip() == '':
             return gr.Audio(sources=None)
@@ -332,7 +359,7 @@ with gr.Blocks() as demo:
     reset_button.add(audio_widget)
     audio_out = gr.Audio(autoplay=True, visible=False)
     audio_out.stop(fn=gen_output_audio, inputs=None, outputs = audio_out)
-    speak_output.click(fn=initial_audio_output, inputs=output_window, outputs=audio_out)
+    speak_output.click(fn=initial_audio_output, inputs=[output_window, user_window], outputs=audio_out)
     output_window.change(fn=set_speak_button, inputs=output_window,outputs=speak_output)
     demo.unload(clean_up)
 demo.launch(share=True)