Remove logging and clean up message handling in add_text and Conversation classes

app.py

@@ -145,7 +145,7 @@ def add_text(state, message, system_prompt, request: gr.Request):
         state = init_state()
     images = message.get("files", [])
     text = message.get("text", "").strip()
-    logger.info(f"add_text. ip: {request.client.host}. len: {len(text)}")
+    # logger.info(f"add_text. ip: {request.client.host}. len: {len(text)}")
     # import pdb; pdb.set_trace()
     textbox = gr.MultimodalTextbox(value=None, interactive=False)
     if len(text) <= 0 and len(images) == 0:
@@ -224,11 +224,6 @@ def predict(state,
                     DEFAULT_IMAGE_TOKEN not in first_user_message:
                     state.update_message(state.USER, DEFAULT_IMAGE_TOKEN + "\n" + first_user_message, None, index)
         
-
-        idx_last_user_mess, message = state.get_user_message(source=state.USER, position='last')
-        if idx_last_user_mess == 0 and DEFAULT_IMAGE_TOKEN not in first_user_message:
-            message = state.system_message + "\n" + message
-
         history = state.get_history()
         logger.info(f"====  History ====\n{history}")
         _, message = state.get_user_message(source=state.USER, position='last')

conversation.py

@@ -256,7 +256,6 @@ class Conversation:
                     if i % 2:
                         content[i] = content[i].strip()
                 content = '$$'.join(content)
-                print('content:', content)
                 # content = (
                 #     r"<span>" + content + r"</span>"
                 #     r"<script type='text/javascript'>"
@@ -267,6 +266,9 @@ class Conversation:
                 content = msg["content"]
             if msg["role"] == self.USER:
                 msg_str = " ".join(img_str_list) + content
+
+                if i == 0:
+                    msg_str = msg_str.replace(self.system_message , "")
                 ret.append([msg_str, None])
             else:
                 msg_str = content + " ".join(img_str_list)