Replace mcp_core::resource::* with rmcp types (#3563)

This commit is contained in:
Jack Amadeo
2025-07-22 09:36:21 -04:00
committed by GitHub
parent ff990b0502
commit 9f4e7a88f1
12 changed files with 47 additions and 314 deletions
+3 -2
View File
@@ -12,8 +12,8 @@ use goose::providers::base::{ConfigKey, ModelInfo, ProviderMetadata};
use goose::session::info::SessionInfo;
use goose::session::SessionMetadata;
use mcp_core::handler::ToolResultSchema;
use mcp_core::resource::ResourceContents;
use mcp_core::tool::{Tool, ToolAnnotations};
use rmcp::model::ResourceContents;
use rmcp::model::{Annotations, Content, EmbeddedResource, ImageContent, Role, TextContent};
use utoipa::{OpenApi, ToSchema};
@@ -286,6 +286,7 @@ derive_utoipa!(EmbeddedResource as EmbeddedResourceSchema);
derive_utoipa!(ImageContent as ImageContentSchema);
derive_utoipa!(TextContent as TextContentSchema);
derive_utoipa!(Annotations as AnnotationsSchema);
derive_utoipa!(ResourceContents as ResourceContentsSchema);
#[allow(dead_code)] // Used by utoipa for OpenAPI generation
#[derive(OpenApi)]
@@ -352,7 +353,7 @@ derive_utoipa!(Annotations as AnnotationsSchema);
ThinkingContent,
RedactedThinkingContent,
FrontendToolRequest,
ResourceContents,
ResourceContentsSchema,
ContextLengthExceeded,
SummarizationRequested,
RoleSchema,