Update app.py

app.py

@@ -15,7 +15,7 @@ os.environ['CUDA_VISIBLE_DEVICES'] = '0,1'
 DEFAULT_CKPT_PATH = 'qwen/Qwen-VL-Chat'
 REVISION = 'v1.0.4'
 BOX_TAG_PATTERN = r"<box>([\s\S]*?)</box>"
-PUNCTUATION = "ï¼ï¼Ÿã€‚ï¼‚ï¼ƒï¼„ï¼…ï¼†ï¼‡ï¼ˆï¼‰ï¼Šï¼‹ï¼Œï¼ï¼ï¼šï¼›ï¼œï¼ï¼žï¼ ï¼»ï¼¼ï¼½ï¼¾ï¼¿ï½€ï½›ï½œï½ï½žï½Ÿï½ ï½¢ï½£ï½¤ã€ã€ƒã€‹ã€Œã€ã€Žã€ã€ã€‘ã€”ã€•ã€–ã€—ã€˜ã€™ã€šã€›ã€œã€ã€žã€Ÿã€°ã€¾ã€¿â€“â€”â€˜â€™â€›â€œâ€â€žâ€Ÿâ€¦â€§ï¹."
+PUNCTUATION = "！？。＂＃＄％＆＇（）＊＋，－／：；＜＝＞＠［＼］＾＿｀｛｜｝～｟｠｢｣､、〃》「」『』【】〔〕〖〗〘〙〚〛〜〝〞〟〰〾〿–—‘’‛“”„‟…‧﹏."
 uploaded_file_dir = os.environ.get("GRADIO_TEMP_DIR") or str(Path(tempfile.gettempdir()) / "gradio")
 tokenizer = None
 model = None
@@ -130,25 +130,30 @@ def add_file(history, task_history, file):
     task_history = task_history + [((file_path,), None)]
     return history, task_history
 
-
-def predict(_chatbot, task_history) -> list:
+def predict(_chatbot, task_history) -> tuple:
     print("predict called")
-    if not _chatbot:
-        return _chatbot 
-    chat_query = _chatbot[-1][0]
-    print("Chat query:", chat_query)
+    chat_query, chat_response = _chatbot[-1]
+
+    # Check if the chat query is a tuple (indicating an image), and if so, extract the image path
+    if isinstance(chat_query, tuple):
+        chat_query = chat_query[0]
 
+    # Main logic for processing the query
     if isinstance(chat_query, tuple):
         query = [{'image': chat_query[0]}]
     else:
         query = [{'text': _parse_text(chat_query)}]
     print("Query for model:", query)
+
     inputs = tokenizer.from_list_format(query)
     tokenized_inputs = tokenizer(inputs, return_tensors='pt')
     tokenized_inputs = tokenized_inputs.to(model.device)
+
     pred = model.generate(**tokenized_inputs)
     response = tokenizer.decode(pred.cpu()[0], skip_special_tokens=False)
     print("Model response:", response)
+
+    # Handling the response based on the type of query (image or text)
     if 'image' in query[0]:
         image = tokenizer.draw_bbox_on_latest_picture(response)
         if image is not None:
@@ -158,8 +163,10 @@ def predict(_chatbot, task_history) -> list:
             _chatbot[-1] = (chat_query, "No image to display.")
     else:
         _chatbot[-1] = (chat_query, response)
+
+    # Return the updated chatbot and task history
     return _chatbot, task_history
-    
+
 def save_uploaded_image(image_file, upload_dir):
     if image is None:
         return None