kirigaya/openmcp-client
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error

Browse Source
This commit is contained in:
锦恢 2025-06-20 14:35:07 +08:00
parent 10befe12b4
commit f59e27b569
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renderer/src/components/main-panel/chat/chat-box/chat.ts
View File

@ -1,5 +1,5 @@
import type { InputSchema, ToolCallContent, ToolItem } from "@/hook/type"; import type { InputSchema, ToolCallContent, ToolItem } from "@/hook/type";
import { type Ref, ref } from "vue"; import type { Ref } from "vue";
import type { OpenAI } from 'openai'; import type { OpenAI } from 'openai';
type ChatCompletionChunk = OpenAI.Chat.Completions.ChatCompletionChunk; type ChatCompletionChunk = OpenAI.Chat.Completions.ChatCompletionChunk;
@ -95,7 +95,7 @@ export type RichTextItem = PromptTextItem | ResourceTextItem | TextItem;
export interface ICommonRenderMessage { export interface ICommonRenderMessage {
role: 'user' | 'assistant/content'; role: 'user' | 'assistant/content';
content: string; content: string;
showJson?: Ref<boolean>; showJson?: any;
extraInfo: IExtraInfo; extraInfo: IExtraInfo;
} }
@ -104,7 +104,7 @@ export interface IToolRenderMessage {
content: string; content: string;
toolResults: ToolCallContent[][]; toolResults: ToolCallContent[][];
tool_calls: ToolCall[]; tool_calls: ToolCall[];
showJson?: Ref<boolean>; showJson?: any;
extraInfo: IExtraInfo; extraInfo: IExtraInfo;
} }

5
renderer/src/components/main-panel/chat/chat-box/index.vue
View File

@ -101,8 +101,6 @@ function handleSend(newMessage?: string) {
loop.bindStreaming(streamingContent, streamingToolCalls); loop.bindStreaming(streamingContent, streamingToolCalls);
loop.registerOnError((error) => { loop.registerOnError((error) => {
console.log('error.msg');
console.log(error.msg);
const errorMessage = clearErrorMessage(error.msg); const errorMessage = clearErrorMessage(error.msg);
ElMessage.error(errorMessage); ElMessage.error(errorMessage);
@ -114,7 +112,8 @@ function handleSend(newMessage?: string) {
extraInfo: { extraInfo: {
created: Date.now(), created: Date.now(),
state: error.state, state: error.state,
serverName: llms[llmManager.currentModelIndex].id || 'unknown' serverName: llms[llmManager.currentModelIndex].id || 'unknown',
enableXmlWrapper: false
} }
}); });
} }

3
renderer/src/components/main-panel/chat/index.vue
View File

@ -171,9 +171,6 @@ watchEffect(async () => {
} }
const renderAssistantMessage = message.content.replace(/```xml[\s\S]*?```/g, ''); const renderAssistantMessage = message.content.replace(/```xml[\s\S]*?```/g, '');
console.log(toolCalls);
renderMessages.value.push({ renderMessages.value.push({
role: 'assistant/tool_calls', role: 'assistant/tool_calls',
content: renderAssistantMessage, content: renderAssistantMessage,

2
renderer/src/hook/panel.ts
View File

@ -61,7 +61,7 @@ export async function loadPanels(client: McpClient | Reactive<McpClient>) {
panelLoaded.value = true; panelLoaded.value = true;
} }
let debounceHandler: number; let debounceHandler: NodeJS.Timeout;
export function safeSavePanels() { export function safeSavePanels() {
clearTimeout(debounceHandler); clearTimeout(debounceHandler);

2
renderer/src/views/connect/connection-panel.vue
View File

@ -67,7 +67,7 @@ async function connect() {
} }
const isDraging = ref(false); const isDraging = ref(false);
let dragHandler: number; let dragHandler: NodeJS.Timeout;
function handleDragOver(event: DragEvent) { function handleDragOver(event: DragEvent) {
event.preventDefault(); event.preventDefault();

3
service/src/hook/adapter.ts
View File

@ -3,8 +3,7 @@ import * as fs from 'fs';
import { WebSocket } from 'ws'; import { WebSocket } from 'ws';
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import { routeMessage } from '../common/router.js'; import { routeMessage } from '../common/router.js';
import { ConnectionType, McpOptions } from '../mcp/client.dto.js'; import { ConnectionType } from '../mcp/client.dto.js';
import { clientMap, connectService } from '../mcp/connect.service.js';
// WebSocket 消息格式 // WebSocket 消息格式
export interface WebSocketMessage { export interface WebSocketMessage {