Skip to content

[FIX] error is not allowed as content type #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FIX] error is not allowed as content type #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions src/tools/BaseTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,11 @@ export type TextContent = {
text: string;
};

export type ErrorContent = {
type: 'error';
text: string;
};

export type ToolContent = TextContent | ErrorContent | ImageContent;
export type ToolContent = TextContent | ImageContent;

export type ToolResponse = {
content: ToolContent[];
isError?: boolean;
};

export interface ToolProtocol extends SDKTool {
Expand Down Expand Up @@ -451,7 +447,8 @@ export abstract class MCPTool<TInput extends Record<string, any> = any, TSchema

protected createErrorResponse(error: Error): ToolResponse {
return {
content: [{ type: 'error', text: error.message }],
content: [{ type: 'text', text: error.message }],
isError: true,
};
}

Expand Down Expand Up @@ -479,19 +476,8 @@ export abstract class MCPTool<TInput extends Record<string, any> = any, TSchema
);
}

private isErrorContent(data: unknown): data is ErrorContent {
return (
typeof data === 'object' &&
data !== null &&
'type' in data &&
data.type === 'error' &&
'text' in data &&
typeof (data as ErrorContent).text === 'string'
);
}

private isValidContent(data: unknown): data is ToolContent {
return this.isImageContent(data) || this.isTextContent(data) || this.isErrorContent(data);
return this.isImageContent(data) || this.isTextContent(data);
}

protected async fetch<T>(url: string, init?: RequestInit): Promise<T> {
Expand Down