Update app.py

app.py

@@ -67,7 +67,7 @@ if SAVE_LOGS:
 GET_LOG_CMD = os.environ.get("GET_LOG_CMD", "").strip()
 
 print(f'SAVE_LOGS: {SAVE_LOGS} | {LOG_PATH}')
-print(f'GET_LOG_CMD: {GET_LOG_CMD}')
+# print(f'GET_LOG_CMD: {GET_LOG_CMD}')
 
 # ! !! Whether to delete the folder, ONLY SET THIS IF YOU WANT TO DELETE SAVED MODEL ON PERSISTENT DISC
 DELETE_FOLDER = os.environ.get("DELETE_FOLDER", "")
@@ -885,10 +885,12 @@ def _setup_events(self) -> None:
 
     def update_time(c_time, chatbot_state):
         # if chatbot_state is empty, register a new conversaion with the current timestamp
-        assert len(chatbot_state) > 0, f'empty chatbot state'
-        if len(chatbot_state) == 1:
-            assert chatbot_state[-1][-1] is None, f'invalid [[message, None]] , got {chatbot_state}'
+        # assert len(chatbot_state) > 0, f'empty chatbot state'
+        if len(chatbot_state) <= 1:
             return gr.Number(value=time.time(), label='current_time', visible=False), chatbot_state
+        # elif len(chatbot_state) == 1:
+        #     # assert chatbot_state[-1][-1] is None, f'invalid [[message, None]] , got {chatbot_state}'
+        #     return gr.Number(value=time.time(), label='current_time', visible=False), chatbot_state
         else:
             return c_time, chatbot_state
 
@@ -985,10 +987,18 @@ def _setup_events(self) -> None:
     #     )
 
 
+def _display_input(
+        self, message: str, history: list[list[str | None]]
+    ) -> tuple[list[list[str | None]], list[list[str | None]]]:
+    if message is not None and message.strip() != "":
+        history.append([message, None])
+    return history, history
+
+
 # replace
 gr.ChatInterface._setup_stop_events = _setup_stop_events
 gr.ChatInterface._setup_events = _setup_events
-
+gr.ChatInterface._display_input = _display_input
 
 
 @document()
@@ -1218,7 +1228,7 @@ def chat_response_stream_multiturn(
 
     message = message.strip()
 
-    if message.strip() == GET_LOG_CMD:
+    if GET_LOG_CMD != "" and message.strip() == GET_LOG_CMD:
         print_log_file()
         yield "Finish printed log. Please clear the chatbox now."
         return 
@@ -1313,15 +1323,36 @@ def format_conversation(history):
     return _str
 
 
+def aggregate_convos():
+    from datetime import datetime
+    global LOG_FILE, DATA_SET_REPO_PATH, SAVE_LOGS
+    assert os.path.exists(LOG_PATH), f'{LOG_PATH} not found'
+    convos = None
+    irregular_count = 1
+    with open(LOG_PATH, 'r', encoding='utf-8') as f:
+        convos = {}
+        for i, l in enumerate(f):
+            if l:
+                item = json.loads(l)
+                key = item['key']
+                try:
+                    key = float(key)
+                except Exception as e:
+                    key = -1
+                if key > 0.0:
+                    item_key = datetime.fromtimestamp(key).strftime("%Y-%m-%d %H:%M:%S")
+                else:
+                    key = item_key = f'e{irregular_count}'
+                    irregular_count += 1
+                item['key'] = item_key
+                convos[key] = item
+    return convos
+
 def maybe_upload_to_dataset():
+    from datetime import datetime
     global LOG_FILE, DATA_SET_REPO_PATH, SAVE_LOGS
     if SAVE_LOGS and os.path.exists(LOG_PATH) and DATA_SET_REPO_PATH != "":
-        with open(LOG_PATH, 'r', encoding='utf-8') as f:
-            convos = {}
-            for l in f:
-                if l:
-                    item = json.loads(l)
-                    convos[item['key']] = item
+        convos = aggregate_convos()
         AGG_LOG_PATH = LOG_PATH + ".agg.json"
         with open(AGG_LOG_PATH, 'w', encoding='utf-8') as fo:
             json.dump(convos, fo, indent=4, ensure_ascii=False)
@@ -1345,15 +1376,12 @@ def print_log_file():
     global LOG_FILE, LOG_PATH
     if SAVE_LOGS and os.path.exists(LOG_PATH):
         with open(LOG_PATH, 'r', encoding='utf-8') as f:
-            convos = {}
-            for l in f:
-                if l:
-                    item = json.loads(l)
-                    convos[item['key']] = item
+            convos = aggregate_convos()
             print(f'Printing log from {LOG_PATH}')
-            for k, v in convos.items():
+            items = list(convos.items())
+            for k, v in items[-10:]:
                 history = v.pop('history')
-                print(f'######--{v}--##')
+                print(f'######--{v}--#####')
                 _str = format_conversation(history)
                 print(_str)
         maybe_upload_to_dataset()
@@ -1818,8 +1846,8 @@ def launch():
             if ENABLE_AGREE_POPUP:
                 demo.load(None, None, None, _js=AGREE_POP_SCRIPTS)
         
-        demo.queue()
-        demo.launch(server_port=PORT)
+        demo.queue(api_open=False)
+        demo.launch(server_port=PORT, show_api=False)
     else:
         descriptions = model_desc
         if DISPLAY_MODEL_PATH:
@@ -1863,8 +1891,8 @@ def launch():
                 demo.load(None, None, None, _js=AGREE_POP_SCRIPTS)
         
 
-        demo.queue()
-        demo.launch(server_port=PORT)
+        demo.queue(api_open=False)
+        demo.launch(server_port=PORT, show_api=False)
 
 
 def main():
@@ -1874,4 +1902,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-