Fix format better

Author: kcz358

lmms_eval/loggers/evaluation_tracker.py

@@ -68,7 +68,7 @@ def extract_model_name(model_args: str, key: str) -> str:
             return args_after_key.split(",")[0]
 
         # order does matter, e.g. peft and delta are provided together with pretrained
-        prefixes = ["peft=", "delta=", "pretrained=", "model=", "path=", "engine="]
+        prefixes = ["peft=", "delta=", "pretrained=", "model=", "path=", "engine=", "model_version=", "model_name=", "model_id="]
         for prefix in prefixes:
             if prefix in model_args:
                 return extract_model_name(model_args, prefix)

lmms_eval/models/chat/async_openai.py

@@ -184,11 +184,17 @@ async def maybe_forward_with_tool(self, request: Instance, idx: int):
                 for call in message.tool_calls:
                     eval_logger.debug(f"Calling {call.function.name}...")
                     result = await self.mcp_client.run_tool(call.function.name, eval(call.function.arguments))
-                    all_response += f"<tool_call>{call.function.name} {call.function.arguments}</tool_call>"
+                    all_response += f"<tool_call>{call.function.name} {call.function.arguments}</tool_call></tool_response>"
                     tool_messages.append({"role": "tool", "name": call.function.name, "content": []})
                     for content in result.content:
                         tool_message = self.mcp_client.convert_result_to_openai_format(content)
+                        for content in tool_message:
+                            if content["type"] == "image_url":
+                                all_response += "<image_url>"
+                            elif content["type"] == "text":
+                                all_response += content["text"]
                         tool_messages[-1]["content"].extend(tool_message)
+                    all_response += "</tool_response>"
 
             response = await self.client.chat.completions.create(
                 model=self.model_version,