tabby-ai-assistant 1.0.13 → 1.0.16

package/src/services/providers/openai-compatible.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable, from } from 'rxjs';
+import { Observable, Observer } from 'rxjs';
 import axios, { AxiosInstance } from 'axios';
 import { BaseAiProvider } from './base-provider.service';
-import { ProviderCapability, HealthStatus, ValidationResult } from '../../types/provider.types';
-import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole } from '../../types/ai.types';
+import { ProviderCapability, ValidationResult } from '../../types/provider.types';
+import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole, StreamEvent } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
 /**
@@ -108,11 +108,157 @@ export class OpenAiCompatibleProviderService extends BaseAiProvider {
     }
 
     /**
-     * 流式聊天功能 - 暂未实现，回退到非流式
+     * 流式聊天功能 - 支持工具调用事件
      */
-    chatStream(request: ChatRequest): Observable<any> {
-        // 回退到非流式
-        return from(this.chat(request));
+    chatStream(request: ChatRequest): Observable<StreamEvent> {
+        return new Observable<StreamEvent>((subscriber: Observer<StreamEvent>) => {
+            if (!this.client) {
+                const error = new Error('OpenAI compatible client not initialized');
+                subscriber.next({ type: 'error', error: error.message });
+                subscriber.error(error);
+                return;
+            }
+
+            const abortController = new AbortController();
+
+            const runStream = async () => {
+                try {
+                    const response = await this.client!.post('/chat/completions', {
+                        model: this.config?.model || 'gpt-3.5-turbo',
+                        messages: this.transformMessages(request.messages),
+                        max_tokens: request.maxTokens || 1000,
+                        temperature: request.temperature || 0.7,
+                        stream: true
+                    }, {
+                        responseType: 'stream'
+                    });
+
+                    const stream = response.data;
+                    let currentToolCallId = '';
+                    let currentToolCallName = '';
+                    let currentToolInput = '';
+                    let currentToolIndex = -1;
+                    let fullContent = '';
+
+                    for await (const chunk of stream) {
+                        if (abortController.signal.aborted) break;
+
+                        const lines = chunk.toString().split('\n').filter(Boolean);
+
+                        for (const line of lines) {
+                            if (line.startsWith('data: ')) {
+                                const data = line.slice(6);
+                                if (data === '[DONE]') continue;
+
+                                try {
+                                    const parsed = JSON.parse(data);
+                                    const choice = parsed.choices?.[0];
+
+                                    this.logger.debug('Stream event', { type: 'delta', hasToolCalls: !!choice?.delta?.tool_calls });
+
+                                    // 处理工具调用块
+                                    if (choice?.delta?.tool_calls?.length > 0) {
+                                        for (const toolCall of choice.delta.tool_calls) {
+                                            const index = toolCall.index || 0;
+
+                                            if (currentToolIndex !== index) {
+                                                if (currentToolIndex >= 0) {
+                                                    let parsedInput = {};
+                                                    try {
+                                                        parsedInput = JSON.parse(currentToolInput || '{}');
+                                                    } catch (e) {
+                                                        // 使用原始输入
+                                                    }
+                                                    subscriber.next({
+                                                        type: 'tool_use_end',
+                                                        toolCall: {
+                                                            id: currentToolCallId,
+                                                            name: currentToolCallName,
+                                                            input: parsedInput
+                                                        }
+                                                    });
+                                                    this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                                                }
+
+                                                currentToolIndex = index;
+                                                currentToolCallId = toolCall.id || `tool_${Date.now()}_${index}`;
+                                                currentToolCallName = toolCall.function?.name || '';
+                                                currentToolInput = toolCall.function?.arguments || '';
+
+                                                subscriber.next({
+                                                    type: 'tool_use_start',
+                                                    toolCall: {
+                                                        id: currentToolCallId,
+                                                        name: currentToolCallName,
+                                                        input: {}
+                                                    }
+                                                });
+                                                this.logger.debug('Stream event', { type: 'tool_use_start', name: currentToolCallName });
+                                            } else {
+                                                if (toolCall.function?.arguments) {
+                                                    currentToolInput += toolCall.function.arguments;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    // 处理文本增量
+                                    else if (choice?.delta?.content) {
+                                        const textDelta = choice.delta.content;
+                                        fullContent += textDelta;
+                                        subscriber.next({
+                                            type: 'text_delta',
+                                            textDelta
+                                        });
+                                    }
+                                } catch (e) {
+                                    // 忽略解析错误
+                                }
+                            }
+                        }
+                    }
+
+                    if (currentToolIndex >= 0) {
+                        let parsedInput = {};
+                        try {
+                            parsedInput = JSON.parse(currentToolInput || '{}');
+                        } catch (e) {
+                            // 使用原始输入
+                        }
+                        subscriber.next({
+                            type: 'tool_use_end',
+                            toolCall: {
+                                id: currentToolCallId,
+                                name: currentToolCallName,
+                                input: parsedInput
+                            }
+                        });
+                        this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                    }
+
+                    subscriber.next({
+                        type: 'message_end',
+                        message: {
+                            id: this.generateId(),
+                            role: MessageRole.ASSISTANT,
+                            content: fullContent,
+                            timestamp: new Date()
+                        }
+                    });
+                    this.logger.debug('Stream event', { type: 'message_end', contentLength: fullContent.length });
+                    subscriber.complete();
+
+                } catch (error) {
+                    const errorMessage = `OpenAI compatible stream failed: ${error instanceof Error ? error.message : String(error)}`;
+                    this.logger.error('Stream error', error);
+                    subscriber.next({ type: 'error', error: errorMessage });
+                    subscriber.error(new Error(errorMessage));
+                }
+            };
+
+            runStream();
+
+            return () => abortController.abort();
+        });
     }
 
     async generateCommand(request: CommandRequest): Promise<CommandResponse> {
@@ -175,35 +321,19 @@ export class OpenAiCompatibleProviderService extends BaseAiProvider {
         return this.parseAnalysisResponse(response.message.content);
     }
 
-    async healthCheck(): Promise<HealthStatus> {
-        try {
-            if (!this.client) {
-                return HealthStatus.UNHEALTHY;
-            }
-
-            const response = await this.client.post('/chat/completions', {
-                model: this.config?.model || 'gpt-3.5-turbo',
-                max_tokens: 1,
-                messages: [
-                    {
-                        role: 'user',
-                        content: 'Hi'
-                    }
-                ]
-            });
-
-            if (response.status === 200) {
-                this.lastHealthCheck = { status: HealthStatus.HEALTHY, timestamp: new Date() };
-                return HealthStatus.HEALTHY;
-            }
+    protected async sendTestRequest(request: ChatRequest): Promise<ChatResponse> {
+        if (!this.client) {
+            throw new Error('OpenAI compatible client not initialized');
+        }
 
-            return HealthStatus.DEGRADED;
+        const response = await this.client.post('/chat/completions', {
+            model: this.config?.model || 'gpt-3.5-turbo',
+            messages: this.transformMessages(request.messages),
+            max_tokens: request.maxTokens || 1,
+            temperature: request.temperature || 0
+        });
 
-        } catch (error) {
-            this.logger.error('OpenAI compatible health check failed', error);
-            this.lastHealthCheck = { status: HealthStatus.UNHEALTHY, timestamp: new Date() };
-            return HealthStatus.UNHEALTHY;
-        }
+        return this.transformChatResponse(response.data);
     }
 
     validateConfig(): ValidationResult {

package/src/services/providers/openai-provider.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable, from } from 'rxjs';
+import { Observable, Observer } from 'rxjs';
 import axios, { AxiosInstance } from 'axios';
 import { BaseAiProvider } from './base-provider.service';
-import { ProviderCapability, HealthStatus, ValidationResult } from '../../types/provider.types';
-import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole } from '../../types/ai.types';
+import { ProviderCapability, ValidationResult } from '../../types/provider.types';
+import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole, StreamEvent } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
 /**
@@ -96,11 +96,162 @@ export class OpenAiProviderService extends BaseAiProvider {
     }
 
     /**
-     * 流式聊天功能 - 暂未实现，回退到非流式
+     * 流式聊天功能 - 支持工具调用事件
      */
-    chatStream(request: ChatRequest): Observable<any> {
-        // 回退到非流式
-        return from(this.chat(request));
+    chatStream(request: ChatRequest): Observable<StreamEvent> {
+        return new Observable<StreamEvent>((subscriber) => {
+            if (!this.client) {
+                const error = new Error('OpenAI client not initialized');
+                subscriber.next({ type: 'error', error: error.message });
+                subscriber.error(error);
+                return;
+            }
+
+            const abortController = new AbortController();
+
+            const runStream = async () => {
+                try {
+                    const response = await this.client!.post('/chat/completions', {
+                        model: this.config?.model || 'gpt-4',
+                        messages: this.transformMessages(request.messages),
+                        max_tokens: request.maxTokens || 1000,
+                        temperature: request.temperature || 0.7,
+                        stream: true
+                    }, {
+                        responseType: 'stream'
+                    });
+
+                    const stream = response.data;
+                    let currentToolCallId = '';
+                    let currentToolCallName = '';
+                    let currentToolInput = '';
+                    let currentToolIndex = -1;
+                    let fullContent = '';
+
+                    for await (const chunk of stream) {
+                        if (abortController.signal.aborted) break;
+
+                        const lines = chunk.toString().split('\n').filter(Boolean);
+
+                        for (const line of lines) {
+                            if (line.startsWith('data: ')) {
+                                const data = line.slice(6);
+                                if (data === '[DONE]') continue;
+
+                                try {
+                                    const parsed = JSON.parse(data);
+                                    const choice = parsed.choices?.[0];
+
+                                    this.logger.debug('Stream event', { type: 'delta', hasToolCalls: !!choice?.delta?.tool_calls });
+
+                                    // 处理工具调用块
+                                    if (choice?.delta?.tool_calls?.length > 0) {
+                                        for (const toolCall of choice.delta.tool_calls) {
+                                            const index = toolCall.index || 0;
+
+                                            // 新工具调用开始
+                                            if (currentToolIndex !== index) {
+                                                if (currentToolIndex >= 0) {
+                                                    // 发送前一个工具调用的结束事件
+                                                    let parsedInput = {};
+                                                    try {
+                                                        parsedInput = JSON.parse(currentToolInput || '{}');
+                                                    } catch (e) {
+                                                        // 使用原始输入
+                                                    }
+                                                    subscriber.next({
+                                                        type: 'tool_use_end',
+                                                        toolCall: {
+                                                            id: currentToolCallId,
+                                                            name: currentToolCallName,
+                                                            input: parsedInput
+                                                        }
+                                                    });
+                                                    this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                                                }
+
+                                                currentToolIndex = index;
+                                                currentToolCallId = toolCall.id || `tool_${Date.now()}_${index}`;
+                                                currentToolCallName = toolCall.function?.name || '';
+                                                currentToolInput = toolCall.function?.arguments || '';
+
+                                                // 发送工具调用开始事件
+                                                subscriber.next({
+                                                    type: 'tool_use_start',
+                                                    toolCall: {
+                                                        id: currentToolCallId,
+                                                        name: currentToolCallName,
+                                                        input: {}
+                                                    }
+                                                });
+                                                this.logger.debug('Stream event', { type: 'tool_use_start', name: currentToolCallName });
+                                            } else {
+                                                // 继续累积参数
+                                                if (toolCall.function?.arguments) {
+                                                    currentToolInput += toolCall.function.arguments;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    // 处理文本增量
+                                    else if (choice?.delta?.content) {
+                                        const textDelta = choice.delta.content;
+                                        fullContent += textDelta;
+                                        subscriber.next({
+                                            type: 'text_delta',
+                                            textDelta
+                                        });
+                                    }
+                                } catch (e) {
+                                    // 忽略解析错误
+                                }
+                            }
+                        }
+                    }
+
+                    // 发送最后一个工具调用的结束事件
+                    if (currentToolIndex >= 0) {
+                        let parsedInput = {};
+                        try {
+                            parsedInput = JSON.parse(currentToolInput || '{}');
+                        } catch (e) {
+                            // 使用原始输入
+                        }
+                        subscriber.next({
+                            type: 'tool_use_end',
+                            toolCall: {
+                                id: currentToolCallId,
+                                name: currentToolCallName,
+                                input: parsedInput
+                            }
+                        });
+                        this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                    }
+
+                    subscriber.next({
+                        type: 'message_end',
+                        message: {
+                            id: this.generateId(),
+                            role: MessageRole.ASSISTANT,
+                            content: fullContent,
+                            timestamp: new Date()
+                        }
+                    });
+                    this.logger.debug('Stream event', { type: 'message_end', contentLength: fullContent.length });
+                    subscriber.complete();
+
+                } catch (error) {
+                    const errorMessage = `OpenAI stream failed: ${error instanceof Error ? error.message : String(error)}`;
+                    this.logger.error('Stream error', error);
+                    subscriber.next({ type: 'error', error: errorMessage });
+                    subscriber.error(new Error(errorMessage));
+                }
+            };
+
+            runStream();
+
+            return () => abortController.abort();
+        });
     }
 
     async generateCommand(request: CommandRequest): Promise<CommandResponse> {
@@ -163,35 +314,19 @@ export class OpenAiProviderService extends BaseAiProvider {
         return this.parseAnalysisResponse(response.message.content);
     }
 
-    async healthCheck(): Promise<HealthStatus> {
-        try {
-            if (!this.client) {
-                return HealthStatus.UNHEALTHY;
-            }
-
-            const response = await this.client.post('/chat/completions', {
-                model: this.config?.model || 'gpt-4',
-                max_tokens: 1,
-                messages: [
-                    {
-                        role: 'user',
-                        content: 'Hi'
-                    }
-                ]
-            });
-
-            if (response.status === 200) {
-                this.lastHealthCheck = { status: HealthStatus.HEALTHY, timestamp: new Date() };
-                return HealthStatus.HEALTHY;
-            }
+    protected async sendTestRequest(request: ChatRequest): Promise<ChatResponse> {
+        if (!this.client) {
+            throw new Error('OpenAI client not initialized');
+        }
 
-            return HealthStatus.DEGRADED;
+        const response = await this.client.post('/chat/completions', {
+            model: this.config?.model || 'gpt-4',
+            messages: this.transformMessages(request.messages),
+            max_tokens: request.maxTokens || 1,
+            temperature: request.temperature || 0
+        });
 
-        } catch (error) {
-            this.logger.error('OpenAI health check failed', error);
-            this.lastHealthCheck = { status: HealthStatus.UNHEALTHY, timestamp: new Date() };
-            return HealthStatus.UNHEALTHY;
-        }
+        return this.transformChatResponse(response.data);
     }
 
     validateConfig(): ValidationResult {

package/src/services/providers/vllm-provider.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, Observer } from 'rxjs';
 import { BaseAiProvider } from './base-provider.service';
-import { ProviderCapability, HealthStatus, ValidationResult } from '../../types/provider.types';
+import { ProviderCapability, ValidationResult } from '../../types/provider.types';
 import { ChatRequest, ChatResponse, StreamEvent, MessageRole, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
@@ -89,7 +89,7 @@ export class VllmProviderService extends BaseAiProvider {
     }
 
     /**
-     * 流式聊天
+     * 流式聊天功能 - 支持工具调用事件
      */
     chatStream(request: ChatRequest): Observable<StreamEvent> {
         return new Observable<StreamEvent>((subscriber: Observer<StreamEvent>) => {
@@ -123,9 +123,16 @@ export class VllmProviderService extends BaseAiProvider {
                         throw new Error('No response body');
                     }
 
+                    // 工具调用状态跟踪
+                    let currentToolCallId = '';
+                    let currentToolCallName = '';
+                    let currentToolInput = '';
+                    let currentToolIndex = -1;
                     let fullContent = '';
 
                     while (true) {
+                        if (abortController.signal.aborted) break;
+
                         const { done, value } = await reader.read();
                         if (done) break;
 
@@ -138,8 +145,62 @@ export class VllmProviderService extends BaseAiProvider {
 
                             try {
                                 const parsed = JSON.parse(data);
-                                const delta = parsed.choices[0]?.delta?.content;
-                                if (delta) {
+                                const choice = parsed.choices?.[0];
+
+                                this.logger.debug('Stream event', { type: 'delta', hasToolCalls: !!choice?.delta?.tool_calls });
+
+                                // 处理工具调用块
+                                if (choice?.delta?.tool_calls?.length > 0) {
+                                    for (const toolCall of choice.delta.tool_calls) {
+                                        const index = toolCall.index || 0;
+
+                                        // 新工具调用开始
+                                        if (currentToolIndex !== index) {
+                                            if (currentToolIndex >= 0) {
+                                                // 发送前一个工具调用的结束事件
+                                                let parsedInput = {};
+                                                try {
+                                                    parsedInput = JSON.parse(currentToolInput || '{}');
+                                                } catch (e) {
+                                                    // 使用原始输入
+                                                }
+                                                subscriber.next({
+                                                    type: 'tool_use_end',
+                                                    toolCall: {
+                                                        id: currentToolCallId,
+                                                        name: currentToolCallName,
+                                                        input: parsedInput
+                                                    }
+                                                });
+                                                this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                                            }
+
+                                            currentToolIndex = index;
+                                            currentToolCallId = toolCall.id || `tool_${Date.now()}_${index}`;
+                                            currentToolCallName = toolCall.function?.name || '';
+                                            currentToolInput = toolCall.function?.arguments || '';
+
+                                            // 发送工具调用开始事件
+                                            subscriber.next({
+                                                type: 'tool_use_start',
+                                                toolCall: {
+                                                    id: currentToolCallId,
+                                                    name: currentToolCallName,
+                                                    input: {}
+                                                }
+                                            });
+                                            this.logger.debug('Stream event', { type: 'tool_use_start', name: currentToolCallName });
+                                        } else {
+                                            // 继续累积参数
+                                            if (toolCall.function?.arguments) {
+                                                currentToolInput += toolCall.function.arguments;
+                                            }
+                                        }
+                                    }
+                                }
+                                // 处理文本增量
+                                else if (choice?.delta?.content) {
+                                    const delta = choice.delta.content;
                                     fullContent += delta;
                                     subscriber.next({
                                         type: 'text_delta',
@@ -152,6 +213,25 @@ export class VllmProviderService extends BaseAiProvider {
                         }
                     }
 
+                    // 发送最后一个工具调用的结束事件
+                    if (currentToolIndex >= 0) {
+                        let parsedInput = {};
+                        try {
+                            parsedInput = JSON.parse(currentToolInput || '{}');
+                        } catch (e) {
+                            // 使用原始输入
+                        }
+                        subscriber.next({
+                            type: 'tool_use_end',
+                            toolCall: {
+                                id: currentToolCallId,
+                                name: currentToolCallName,
+                                input: parsedInput
+                            }
+                        });
+                        this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolCallName });
+                    }
+
                     subscriber.next({
                         type: 'message_end',
                         message: {
@@ -161,11 +241,14 @@ export class VllmProviderService extends BaseAiProvider {
                             timestamp: new Date()
                         }
                     });
+                    this.logger.debug('Stream event', { type: 'message_end', contentLength: fullContent.length });
                     subscriber.complete();
                 } catch (error) {
                     if ((error as any).name !== 'AbortError') {
+                        const errorMessage = `vLLM stream failed: ${error instanceof Error ? error.message : String(error)}`;
                         this.logError(error, { request });
-                        subscriber.error(new Error(`vLLM stream failed: ${error instanceof Error ? error.message : String(error)}`));
+                        subscriber.next({ type: 'error', error: errorMessage });
+                        subscriber.error(new Error(errorMessage));
                     }
                 }
             };
@@ -177,31 +260,36 @@ export class VllmProviderService extends BaseAiProvider {
         });
     }
 
-    /**
-     * 健康检查 - 检测 vLLM 服务是否运行
-     */
-    async healthCheck(): Promise<HealthStatus> {
-        try {
-            const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), 5000);
-
-            const response = await fetch(`${this.getBaseURL()}/models`, {
-                method: 'GET',
-                headers: this.getAuthHeaders(),
-                signal: controller.signal
-            });
-
-            clearTimeout(timeoutId);
+    protected async sendTestRequest(request: ChatRequest): Promise<ChatResponse> {
+        const response = await fetch(`${this.getBaseURL()}/chat/completions`, {
+            method: 'POST',
+            headers: this.getAuthHeaders(),
+            body: JSON.stringify({
+                model: this.config?.model || 'meta-llama/Llama-3.1-8B',
+                messages: this.transformMessages(request.messages),
+                max_tokens: request.maxTokens || 1,
+                temperature: request.temperature || 0
+            })
+        });
 
-            if (response.ok) {
-                this.lastHealthCheck = { status: HealthStatus.HEALTHY, timestamp: new Date() };
-                return HealthStatus.HEALTHY;
-            }
-            return HealthStatus.DEGRADED;
-        } catch (error) {
-            this.logger.warn('vLLM health check failed', error);
-            return HealthStatus.UNHEALTHY;
+        if (!response.ok) {
+            throw new Error(`vLLM API error: ${response.status}`);
         }
+
+        const data = await response.json();
+        return {
+            message: {
+                id: this.generateId(),
+                role: MessageRole.ASSISTANT,
+                content: data.choices[0]?.message?.content || '',
+                timestamp: new Date()
+            },
+            usage: data.usage ? {
+                promptTokens: data.usage.prompt_tokens,
+                completionTokens: data.usage.completion_tokens,
+                totalTokens: data.usage.total_tokens
+            } : undefined
+        };
     }
 
     /**