@prefecthq/fastmcp-ts 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/index.cjs +21 -13
- package/dist/cli/index.cjs.map +1 -1
- package/dist/client.d.ts +6 -6
- package/dist/client.js +11 -10
- package/dist/client.js.map +1 -1
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export { BlobResourceContents, ContentBlock, CreateMessageRequestParams, CreateMessageResult, CreateMessageResultWithTools, ElicitRequestParams, ElicitResult, GetPromptResult, LoggingLevel, ModelPreferences, Prompt, PromptArgument, PromptMessage, Resource, ResourceContents, ResourceTemplateType as ResourceTemplate, Root, SamplingMessage, TextResourceContents, Tool, ToolChoice, ToolResultContent, ToolUseContent } from '@modelcontextprotocol/server';
|
|
3
|
-
import { OAuthClientProvider, OAuthClientMetadata, OAuthClientInformationContext, StoredOAuthClientInformation, StoredOAuthTokens, OAuthDiscoveryState, ClientAuthMethod, Transport, ClientCapabilities, VersionNegotiationOptions, PriorDiscovery, InputRequiredOptions, ResponseCacheStore, ProtocolEra, Implementation, ServerCapabilities } from '@modelcontextprotocol/client';
|
|
1
|
+
import { CallToolResult as CallToolResult$1, OAuthClientProvider, OAuthClientMetadata, OAuthClientInformationContext, StoredOAuthClientInformation, StoredOAuthTokens, OAuthDiscoveryState, ClientAuthMethod, Transport, ClientCapabilities, VersionNegotiationOptions, PriorDiscovery, InputRequiredOptions, ResponseCacheStore, ProtocolEra, Implementation, ServerCapabilities } from '@modelcontextprotocol/client';
|
|
4
2
|
export { ClientCapabilities } from '@modelcontextprotocol/client';
|
|
3
|
+
import { CreateMessageResult, CreateMessageResultWithTools, CreateMessageRequestParams, LoggingLevel, ElicitRequestParams, ElicitResult, Tool, Resource, Prompt, ResourceTemplateType, TextResourceContents, BlobResourceContents, GetPromptResult, OAuthClientMetadata as OAuthClientMetadata$1, Root, ContentBlock, ModelPreferences, SamplingMessage, ToolChoice } from '@modelcontextprotocol/server';
|
|
4
|
+
export { BlobResourceContents, ContentBlock, CreateMessageRequestParams, CreateMessageResult, CreateMessageResultWithTools, ElicitRequestParams, ElicitResult, GetPromptResult, LoggingLevel, ModelPreferences, Prompt, PromptArgument, PromptMessage, Resource, ResourceContents, ResourceTemplateType as ResourceTemplate, Root, SamplingMessage, TextResourceContents, Tool, ToolChoice, ToolResultContent, ToolUseContent } from '@modelcontextprotocol/server';
|
|
5
5
|
import Anthropic from '@anthropic-ai/sdk';
|
|
6
6
|
import OpenAI from 'openai';
|
|
7
7
|
import { GoogleGenAI } from '@google/genai';
|
|
@@ -10,10 +10,10 @@ import { GoogleGenAI } from '@google/genai';
|
|
|
10
10
|
type AnySamplingResult = CreateMessageResult | CreateMessageResultWithTools;
|
|
11
11
|
/**
|
|
12
12
|
* The SDK's CallToolResult with a typed generic for structuredContent.
|
|
13
|
-
*
|
|
13
|
+
* The intersection retains its open extension fields while narrowing the two
|
|
14
|
+
* values FastMCP normalizes.
|
|
14
15
|
*/
|
|
15
|
-
type CallToolResult<TData = unknown> = {
|
|
16
|
-
content: ContentBlock[];
|
|
16
|
+
type CallToolResult<TData = unknown> = CallToolResult$1 & {
|
|
17
17
|
structuredContent: TData | null;
|
|
18
18
|
isError: boolean;
|
|
19
19
|
};
|
package/dist/client.js
CHANGED
|
@@ -938,6 +938,15 @@ function buildClientCapabilities(supplied, inferred) {
|
|
|
938
938
|
return capabilities;
|
|
939
939
|
}
|
|
940
940
|
|
|
941
|
+
// src/client/results.ts
|
|
942
|
+
function normalizeCallToolResult(result) {
|
|
943
|
+
return {
|
|
944
|
+
...result,
|
|
945
|
+
structuredContent: result.structuredContent ?? null,
|
|
946
|
+
isError: result.isError === true
|
|
947
|
+
};
|
|
948
|
+
}
|
|
949
|
+
|
|
941
950
|
// src/client/multi-server.ts
|
|
942
951
|
import { Client as SdkClient, LOG_LEVEL_META_KEY } from "@modelcontextprotocol/client";
|
|
943
952
|
var MultiServerClient = class _MultiServerClient {
|
|
@@ -1106,11 +1115,7 @@ var MultiServerClient = class _MultiServerClient {
|
|
|
1106
1115
|
{ name: localName, arguments: args ?? {}, ...this._metaParamsFor(serverName) },
|
|
1107
1116
|
sdkOptions
|
|
1108
1117
|
);
|
|
1109
|
-
return
|
|
1110
|
-
content: result.content,
|
|
1111
|
-
structuredContent: result.structuredContent ?? null,
|
|
1112
|
-
isError: result.isError === true
|
|
1113
|
-
};
|
|
1118
|
+
return normalizeCallToolResult(result);
|
|
1114
1119
|
}
|
|
1115
1120
|
// -------------------------------------------------------------------------
|
|
1116
1121
|
// Resources
|
|
@@ -1716,11 +1721,7 @@ var Client = class _Client {
|
|
|
1716
1721
|
const result = await this._reauthRetry(
|
|
1717
1722
|
() => this._sdk().callTool({ name, arguments: args ?? {}, ...this._metaParams() }, sdkOptions)
|
|
1718
1723
|
);
|
|
1719
|
-
return
|
|
1720
|
-
content: result.content,
|
|
1721
|
-
structuredContent: result.structuredContent ?? null,
|
|
1722
|
-
isError: result.isError === true
|
|
1723
|
-
};
|
|
1724
|
+
return normalizeCallToolResult(result);
|
|
1724
1725
|
}
|
|
1725
1726
|
// -------------------------------------------------------------------------
|
|
1726
1727
|
// Resources (IResourcesClient)
|