fix: tool_call work now

Author: zerob13

README.md

@@ -103,12 +103,12 @@ curl -X POST http://localhost:3000/v1/images/generations \
 
 Response will include `<thinking>` tags showing the reasoning process.
 
-### 2. mock-gpt-function
+### 2. gpt-4-mock
 **Function Calling Model** - Supports tools and function calling
 
 ```json
 {
-  "model": "mock-gpt-function",
+  "model": "gpt-4-mock",
   "messages": [{"role": "user", "content": "What's the weather like in Beijing today?"}],
   "functions": [
     {
@@ -264,7 +264,7 @@ curl -X POST http://localhost:3000/v1/chat/completions \
 curl -X POST http://localhost:3000/v1/chat/completions \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "mock-gpt-function",
+    "model": "gpt-4-mock",
     "messages": [{"role": "user", "content": "What time is it now?"}]
   }'
 

README.zh.md

@@ -103,12 +103,12 @@ curl -X POST http://localhost:3000/v1/images/generations \
 
 响应会包含 `<thinking>` 标签显示思考过程。
 
-### 2. mock-gpt-function
+### 2. gpt-4-mock
 **函数调用模型** - 支持工具和函数调用
 
 ```json
 {
-  "model": "mock-gpt-function",
+  "model": "gpt-4-mock",
   "messages": [{"role": "user", "content": "今天北京的天气怎么样？"}],
   "functions": [
     {
@@ -264,7 +264,7 @@ curl -X POST http://localhost:3000/v1/chat/completions \
 curl -X POST http://localhost:3000/v1/chat/completions \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "mock-gpt-function",
+    "model": "gpt-4-mock",
     "messages": [{"role": "user", "content": "现在几点了？"}]
   }'
 

TOOL_CALLS_README.md

@@ -4,11 +4,11 @@
 
 本项目支持两种函数调用格式：
 
-- `mock-gpt-function`: 支持新版OpenAI tool calls格式的模型
+- `gpt-4-mock`: 支持新版OpenAI tool calls格式的模型
 
 ## 模型特点
 
-### mock-gpt-function
+### gpt-4-mock
 - 使用新版 tool calls 格式
 - 支持两阶段调用流程
 - 第一阶段返回 tool_calls，第二阶段返回执行结果
@@ -39,27 +39,27 @@ npx mock-openai-api --help
 
 ## 使用示例
 
-### 基本调用 - mock-gpt-function
+### 基本调用 - gpt-4-mock
 
 ```bash
 curl -X POST http://localhost:3000/v1/chat/completions \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "mock-gpt-function",
+    "model": "gpt-4-mock",
     "messages": [
       {"role": "user", "content": "What time is it now?"}
     ],
     "stream": false
   }'
 ```
 
-### 流式调用 - mock-gpt-function
+### 流式调用 - gpt-4-mock
 
 ```bash
 curl -X POST http://localhost:3000/v1/chat/completions \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "mock-gpt-function",
+    "model": "gpt-4-mock",
     "messages": [
       {"role": "user", "content": "What time is it now?"}
     ],
@@ -77,7 +77,7 @@ npx mock-openai-api -v -p 8080
 curl -X POST http://localhost:8080/v1/chat/completions \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "mock-gpt-function",
+    "model": "gpt-4-mock",
     "messages": [
       {"role": "user", "content": "Calculate 123 * 456"}
     ],
@@ -87,7 +87,7 @@ curl -X POST http://localhost:8080/v1/chat/completions \
 
 ## 支持的测试场景
 
-mock-gpt-function 模型包含以下预设测试场景：
+gpt-4-mock 模型包含以下预设测试场景：
 
 1. **获取当前时间**: `"What time is it now?"`
 2. **天气查询**: `"What's the weather like in Beijing today?"`
@@ -103,7 +103,7 @@ mock-gpt-function 模型包含以下预设测试场景：
   "id": "chatcmpl-123",
   "object": "chat.completion",
   "created": 1677652288,
-  "model": "mock-gpt-function",
+  "model": "gpt-4-mock",
   "choices": [{
     "index": 0,
     "message": {
@@ -130,7 +130,7 @@ mock-gpt-function 模型包含以下预设测试场景：
 
 ### 流式响应示例
 
-对于流式调用，mock-gpt-function 会先返回 tool_calls，然后在第二阶段返回执行结果的分块内容。
+对于流式调用，gpt-4-mock 会先返回 tool_calls，然后在第二阶段返回执行结果的分块内容。
 
 ## 测试文件
 
@@ -141,7 +141,7 @@ mock-gpt-function 模型包含以下预设测试场景：
 npm run dev
 
 # 在浏览器中打开 test-sse-client.html 文件
-# 选择 mock-gpt-function 模型进行测试
+# 选择 gpt-4-mock 模型进行测试
 ```
 
 ## 开发说明
@@ -179,4 +179,4 @@ npm run dev
 - `src/types/index.ts`: TypeScript 类型定义
 - `src/cli.ts`: 命令行接口
 
-可用模型: mock-gpt-thinking, mock-gpt-thinking-tag, mock-gpt-function, mock-gpt-markdown, gpt-4o-image 
+可用模型: mock-gpt-thinking, mock-gpt-thinking-tag, gpt-4-mock, mock-gpt-markdown, gpt-4o-image 

src/cli.ts

@@ -37,14 +37,14 @@ app.listen(PORT, HOST, () => {
   console.log(`   • POST /v1/images/generations - Image generation`);
   console.log(`\n✨ Available models:`);
   console.log(`   - mock-gpt-thinking: Model supporting thought process`);
-  console.log(`   - mock-gpt-function: Model supporting function calls`);
+  console.log(`   - gpt-4-mock: Model supporting function calls`);
   console.log(`   - mock-gpt-markdown: Model outputting standard Markdown`);
   console.log(`   - gpt-4o-image: Model specifically for image generation`);
   console.log(`\n🔗 Usage example:`);
   console.log(`   curl -X POST http://localhost:${PORT}/v1/chat/completions \\`);
   console.log(`     -H "Content-Type: application/json" \\`);
   console.log(`     -d '{`);
-  console.log(`       "model": "mock-gpt-function",`);
+  console.log(`       "model": "gpt-4-mock",`);
   console.log(`       "messages": [{"role": "user", "content": "Hello"}]`);
   console.log(`     }'`);
 

src/controllers/openaiController.ts

@@ -4,8 +4,10 @@ import {
   getModels,
   createChatCompletion,
   createChatCompletionStream,
+  createToolCallResponseStream,
   generateImage
 } from '../services/openaiService';
+import { findModelById } from '../utils/helpers';
 
 /**
  * Get model list
@@ -54,6 +56,13 @@ export function handleChatCompletion(req: Request, res: Response) {
       });
     }
 
+    // Check if this is a tool-calls model and if we need to simulate the two-phase process
+    const model = findModelById(request.model);
+    const isToolCallModel = model && model.type === 'tool-calls';
+    
+    // Check if this is a request with tool results (second phase)
+    const hasToolResults = request.messages.some(msg => msg.role === 'tool');
+
     // Streaming response
     if (request.stream) {
       res.setHeader('Content-Type', 'text/event-stream');
@@ -65,9 +74,52 @@ export function handleChatCompletion(req: Request, res: Response) {
       // Flush headers to ensure client receives headers immediately
       res.flushHeaders();
 
-      const stream = createChatCompletionStream(request);
-      for (const chunk of stream) {
-        res.write(chunk);
+      if (isToolCallModel && hasToolResults) {
+        // This is the second phase of tool call - generate final response
+        const toolMessage = request.messages.find(msg => msg.role === 'tool');
+        const toolCallResponseStream = createToolCallResponseStream(
+          request, 
+          toolMessage?.tool_call_id || '', 
+          toolMessage?.content || ''
+        );
+        
+        for (const chunk of toolCallResponseStream) {
+          res.write(chunk);
+        }
+      } else if (isToolCallModel && !hasToolResults) {
+        // This is the first phase of tool call - but for demo purposes, 
+        // we'll simulate both phases automatically with a delay
+        const firstPhaseStream = createChatCompletionStream(request);
+        for (const chunk of firstPhaseStream) {
+          res.write(chunk);
+        }
+        
+        // Simulate a delay and automatic second phase
+        setTimeout(() => {
+          console.log('Loop iteration 2 for event simulated_event_id');
+          
+          // Create a simulated second phase request
+          const secondPhaseRequest = { ...request };
+          
+          const toolCallResponseStream = createToolCallResponseStream(
+            secondPhaseRequest, 
+            'call_0_8a90fac8-b281-49a0-bcc9-55d7f4603891', 
+            'simulated tool result'
+          );
+          
+          for (const chunk of toolCallResponseStream) {
+            res.write(chunk);
+          }
+          res.end();
+        }, 1000); // 1 second delay to simulate external tool execution
+        
+        return; // Don't end the response yet
+      } else {
+        // Normal streaming for non-tool-call models
+        const stream = createChatCompletionStream(request);
+        for (const chunk of stream) {
+          res.write(chunk);
+        }
       }
       res.end();
     } else {

src/data/mockData.ts

@@ -471,7 +471,7 @@ export const mockModels: MockModel[] = [
     testCases: thinkingTestCases
   },
   {
-    id: "mock-gpt-function",
+    id: "gpt-4-mock",
     name: "Mock GPT Function Calling",
     description: "Model that supports function calling with OpenAI tool calls format, suitable for testing tool integration and two-phase call workflows",
     type: "tool-calls",

src/index.ts

@@ -15,14 +15,14 @@ app.listen(PORT, () => {
   console.log(`   • POST /v1/images/generations - Image generation`);
   console.log(`\n✨ Available models:`);
   console.log(`   - mock-gpt-thinking: Model supporting thought process`);
-  console.log(`   - mock-gpt-function: Model supporting function calls with tool calls format`);
+  console.log(`   - gpt-4-mock: Model supporting function calls with tool calls format`);
   console.log(`   - mock-gpt-markdown: Model outputting standard Markdown`);
   console.log(`   - gpt-4o-image: Model specifically for image generation`);
   console.log(`\n🔗 Usage example:`);
   console.log(`   curl -X POST http://localhost:${PORT}/v1/chat/completions \\`);
   console.log(`     -H "Content-Type: application/json" \\`);
   console.log(`     -d '{`);
-  console.log(`       "model": "mock-gpt-function",`);
+  console.log(`       "model": "gpt-4-mock",`);
   console.log(`       "messages": [{"role": "user", "content": "Hello"}]`);
   console.log(`     }'`);
   console.log(`\n💡 Use CLI for more options: npm run build && npx mock-openai-api --help`);