Fix some compatible bugs (#732)

Author: tastelikefeet

ms_agent/agent/llm_agent.py

@@ -3,6 +3,7 @@
 import inspect
 import os.path
 import sys
+import uuid
 from copy import deepcopy
 from typing import Any, AsyncGenerator, Dict, List, Optional, Tuple, Union
 
@@ -176,6 +177,10 @@ async def _parallel_tool_call(self,
                 content=tool_call_result,
                 tool_call_id=tool_call_query['id'],
                 name=tool_call_query['tool_name'])
+            if _new_message.tool_call_id is None:
+                # sometimes tool call id is None, add a random one
+                _new_message.tool_call_id = str(uuid.uuid4())[:8]
+                tool_call_query['id'] = _new_message.tool_call_id
             messages.append(_new_message)
             self._log_output(_new_message.content, self.tag)
         return messages

ms_agent/llm/openai_llm.py

@@ -167,9 +167,15 @@ def _merge_stream_message(self, pre_message_chunk: Optional[Message],
                         message.tool_calls[0]['id'] = message_chunk.tool_calls[
                             0]['id']
                     if message_chunk.tool_calls[0]['arguments']:
-                        message.tool_calls[0][
-                            'arguments'] += message_chunk.tool_calls[0][
-                                'arguments']
+                        if message.tool_calls[0]['arguments']:
+                            message.tool_calls[0][
+                                'arguments'] += message_chunk.tool_calls[0][
+                                    'arguments']
+                        else:
+                            # message.tool_calls[0]['arguments'] may be None
+                            message.tool_calls[0][
+                                'arguments'] = message_chunk.tool_calls[0][
+                                    'arguments']
                     if message_chunk.tool_calls[0]['tool_name']:
                         message.tool_calls[0][
                             'tool_name'] = message_chunk.tool_calls[0][

ms_agent/tools/tool_manager.py

@@ -30,6 +30,8 @@ def __init__(self, config, mcp_config: Optional[Dict[str, Any]] = None):
             self.extra_tools.append(SplitTask(config))
         if hasattr(config, 'tools') and hasattr(config.tools, 'file_system'):
             self.extra_tools.append(FileSystemTool(config))
+        self.tool_call_timeout = getattr(config, 'tool_call_timeout',
+                                         TOOL_CALL_TIMEOUT)
         self._tool_index = {}
 
     def register_tool(self, tool: ToolBase):
@@ -87,7 +89,7 @@ async def single_call_tool(self, tool_info: ToolCall):
                     server_name,
                     tool_name=tool_name.split(self.TOOL_SPLITER)[1],
                     tool_args=tool_args),
-                timeout=TOOL_CALL_TIMEOUT)
+                timeout=self.tool_call_timeout)
             return response
         except asyncio.TimeoutError:
             # TODO: How to get the information printed by the tool before hanging to return to the model?

projects/code_scratch/architecture.yaml

@@ -1,6 +1,6 @@
 llm:
   service: openai
-  model: claude-3-7-sonnet-20250219
+  model: claude-sonnet-4-20250514
   openai_api_key:
   openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
 
@@ -9,9 +9,10 @@ generation_config:
   temperature: 0.3
   top_k: 50
   stream: true
+  max_tokens: 32000
   extra_body:
     dashscope_extend_params:
-      provider: idealab
+      provider: b
     enable_thinking: false
 
 
@@ -57,6 +58,8 @@ callbacks:
 
 max_chat_round: 1
 
+tool_call_timeout: 30000
+
 output_dir: output
 
 help: |

projects/code_scratch/callbacks/artifact_callback.py

@@ -23,6 +23,13 @@ def __init__(self, config: DictConfig):
     async def on_task_begin(self, runtime: Runtime, messages: List[Message]):
         await self.file_system.connect()
 
+    async def on_generate_response(self, runtime: Runtime,
+                                   messages: List[Message]):
+        for message in messages:
+            if message.role == 'assistant' and message.tool_calls and not message.content:
+                # Claude seems does not allow empty content
+                message.content = 'I should do a tool calling to continue:\n'
+
     async def after_generate_response(self, runtime: Runtime,
                                       messages: List[Message]):
         if messages[-1].tool_calls or messages[-1].role == 'tool':

projects/code_scratch/callbacks/coding_callback.py

@@ -24,8 +24,9 @@ async def on_task_begin(self, runtime: Runtime, messages: List[Message]):
         await self.file_system.connect()
 
     async def on_tool_call(self, runtime: Runtime, messages: List[Message]):
-        if not messages[-1].tool_calls or messages[-1].tool_calls[0][
-                'tool_name'] != 'split_to_sub_task':
+        # tool name is not 'split_to_sub_task', ut is 'SplitTask---split_to_sub_task'
+        if not messages[-1].tool_calls or 'split_to_sub_task' not in messages[
+                -1].tool_calls[0]['tool_name']:
             return
         assert messages[0].role == 'system'
         arguments = messages[-1].tool_calls[0]['arguments']
@@ -115,8 +116,8 @@ async def on_tool_call(self, runtime: Runtime, messages: List[Message]):
         messages[-1].tool_calls[0]['arguments'] = json.dumps({'tasks': tasks})
 
     async def after_tool_call(self, runtime: Runtime, messages: List[Message]):
-        if not messages[-2].tool_calls or messages[-2].tool_calls[0][
-                'tool_name'] != 'split_to_sub_task':
+        if not messages[-2].tool_calls or 'split_to_sub_task' not in messages[
+                -2].tool_calls[0]['tool_name']:
             return
         assert messages[0].role == 'system'
         arguments = messages[-2].tool_calls[0]['arguments']

projects/code_scratch/coding.yaml

@@ -1,6 +1,6 @@
 llm:
   service: openai
-  model: claude-3-7-sonnet-20250219
+  model: claude-sonnet-4-20250514
   openai_api_key:
   openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
 
@@ -9,9 +9,10 @@ generation_config:
   temperature: 0.2
   top_k: 20
   stream: true
+  max_tokens: 32000
   extra_body:
     dashscope_extend_params:
-      provider: idealab
+      provider: b
     enable_thinking: false
 
 
@@ -22,7 +23,7 @@ prompt:
       * Do not miss any file in `files.json`
       * Do not modify the `files.json` file
     2. Group the code files by:
-      * 8~10 files in one group.
+      * 3~5 files in one group.
       * Group closely related modules especially modules ** on a complete calling stack ** or ** depends on each other **, minimize the dependencies between groups.
       * List groups from backend to frontend, from low level to high levels.
       * All files should start from the frontend or backend folder
@@ -53,6 +54,8 @@ tools:
 
 max_chat_round: 100
 
+tool_call_timeout: 30000
+
 output_dir: output
 
 help: |

projects/code_scratch/refine.yaml

@@ -1,6 +1,6 @@
 llm:
   service: openai
-  model: claude-3-7-sonnet-20250219
+  model: claude-sonnet-4-20250514
   openai_api_key:
   openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
 
@@ -9,9 +9,10 @@ generation_config:
   temperature: 0.2
   top_k: 20
   stream: true
+  max_tokens: 32000
   extra_body:
     dashscope_extend_params:
-      provider: idealab
+      provider: b
     enable_thinking: false
 
 
@@ -74,6 +75,8 @@ tools:
 
 max_chat_round: 100
 
+tool_call_timeout: 30000
+
 output_dir: output
 
 help: |