@llmindset/hf-mcp-server 0.3.9 → 0.3.10
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/server/mcp-proxy.d.ts +2 -0
- package/dist/server/mcp-proxy.d.ts.map +1 -1
- package/dist/server/mcp-proxy.js +111 -24
- package/dist/server/mcp-proxy.js.map +1 -1
- package/dist/server/transport/base-transport.d.ts.map +1 -1
- package/dist/server/transport/base-transport.js +2 -2
- package/dist/server/transport/base-transport.js.map +1 -1
- package/dist/server/transport/stateless-http-transport.d.ts.map +1 -1
- package/dist/server/transport/stateless-http-transport.js +4 -6
- package/dist/server/transport/stateless-http-transport.js.map +1 -1
- package/dist/server/utils/gradio-utils.d.ts +0 -7
- package/dist/server/utils/gradio-utils.d.ts.map +1 -1
- package/dist/server/utils/gradio-utils.js +1 -28
- package/dist/server/utils/gradio-utils.js.map +1 -1
- package/dist/server/utils/proxy-apps.d.ts +20 -0
- package/dist/server/utils/proxy-apps.d.ts.map +1 -0
- package/dist/server/utils/proxy-apps.js +91 -0
- package/dist/server/utils/proxy-apps.js.map +1 -0
- package/dist/server/utils/proxy-tools-config.d.ts +3 -0
- package/dist/server/utils/proxy-tools-config.d.ts.map +1 -1
- package/dist/server/utils/proxy-tools-config.js +48 -8
- package/dist/server/utils/proxy-tools-config.js.map +1 -1
- package/dist/server/utils/streamable-http-tool-caller.d.ts +2 -1
- package/dist/server/utils/streamable-http-tool-caller.d.ts.map +1 -1
- package/dist/server/utils/streamable-http-tool-caller.js +38 -1
- package/dist/server/utils/streamable-http-tool-caller.js.map +1 -1
- package/dist/server/utils/tool-selection-strategy.d.ts.map +1 -1
- package/dist/server/utils/tool-selection-strategy.js +9 -3
- package/dist/server/utils/tool-selection-strategy.js.map +1 -1
- package/dist/shared/bouquet-presets.js +1 -1
- package/dist/shared/bouquet-presets.js.map +1 -1
- package/dist/web/mcp-welcome.html +7 -7
- package/package.json +2 -2
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export interface ProxyAppResourceMapping {
|
|
2
|
+
localUri: string;
|
|
3
|
+
upstreamUri: string;
|
|
4
|
+
proxyId: string;
|
|
5
|
+
upstreamToolName: string;
|
|
6
|
+
}
|
|
7
|
+
type UnknownRecord = Record<string, unknown>;
|
|
8
|
+
export declare function rewriteProxyAppToolMeta(meta: UnknownRecord | undefined, proxyId: string, upstreamToolName: string): {
|
|
9
|
+
meta?: UnknownRecord;
|
|
10
|
+
resourceMapping?: ProxyAppResourceMapping;
|
|
11
|
+
};
|
|
12
|
+
export declare function createProxyAppResourceUri(proxyId: string, upstreamUri: string): string;
|
|
13
|
+
export interface ProxyAppToolCall {
|
|
14
|
+
toolName: string;
|
|
15
|
+
argumentKeys: string[];
|
|
16
|
+
}
|
|
17
|
+
export declare function discoverProxyAppToolCalls(value: unknown, appName: string | undefined): ProxyAppToolCall[];
|
|
18
|
+
export declare function isFastMcpAppBackendTool(toolName: string, appName: string): boolean;
|
|
19
|
+
export {};
|
|
20
|
+
//# sourceMappingURL=proxy-apps.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy-apps.d.ts","sourceRoot":"","sources":["../../../src/server/utils/proxy-apps.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CACzB;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAG7C,wBAAgB,uBAAuB,CACtC,IAAI,EAAE,aAAa,GAAG,SAAS,EAC/B,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GACtB;IAAE,IAAI,CAAC,EAAE,aAAa,CAAC;IAAC,eAAe,CAAC,EAAE,uBAAuB,CAAA;CAAE,CA4BrE;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAItF;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,EAAE,CAYzG;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAMlF"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
const FASTMCP_HASH_LENGTH = 12;
|
|
3
|
+
export function rewriteProxyAppToolMeta(meta, proxyId, upstreamToolName) {
|
|
4
|
+
if (!meta) {
|
|
5
|
+
return {};
|
|
6
|
+
}
|
|
7
|
+
const ui = meta.ui;
|
|
8
|
+
if (!isRecord(ui) || typeof ui.resourceUri !== 'string' || !ui.resourceUri.startsWith('ui://')) {
|
|
9
|
+
return { meta };
|
|
10
|
+
}
|
|
11
|
+
const localUri = createProxyAppResourceUri(proxyId, ui.resourceUri);
|
|
12
|
+
const rewrittenMeta = {
|
|
13
|
+
...meta,
|
|
14
|
+
ui: {
|
|
15
|
+
...ui,
|
|
16
|
+
resourceUri: localUri,
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
return {
|
|
20
|
+
meta: rewrittenMeta,
|
|
21
|
+
resourceMapping: {
|
|
22
|
+
localUri,
|
|
23
|
+
upstreamUri: ui.resourceUri,
|
|
24
|
+
proxyId,
|
|
25
|
+
upstreamToolName,
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export function createProxyAppResourceUri(proxyId, upstreamUri) {
|
|
30
|
+
const safeProxyId = proxyId.replace(/[^a-zA-Z0-9_-]+/g, '-').replace(/^-+|-+$/g, '') || 'proxy';
|
|
31
|
+
const encodedUri = Buffer.from(upstreamUri, 'utf8').toString('base64url');
|
|
32
|
+
return `ui://hf-mcp-proxy/${safeProxyId}/${encodedUri}`;
|
|
33
|
+
}
|
|
34
|
+
export function discoverProxyAppToolCalls(value, appName) {
|
|
35
|
+
if (!appName) {
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
const found = new Map();
|
|
39
|
+
visitForToolCalls(value, appName, found);
|
|
40
|
+
return Array.from(found.entries()).map(([toolName, argumentKeys]) => ({
|
|
41
|
+
toolName,
|
|
42
|
+
argumentKeys: Array.from(argumentKeys),
|
|
43
|
+
}));
|
|
44
|
+
}
|
|
45
|
+
export function isFastMcpAppBackendTool(toolName, appName) {
|
|
46
|
+
const parsed = parseFastMcpBackendToolName(toolName);
|
|
47
|
+
if (!parsed) {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
return parsed.digest === hashFastMcpTool(appName, parsed.localName);
|
|
51
|
+
}
|
|
52
|
+
function visitForToolCalls(value, appName, found) {
|
|
53
|
+
if (Array.isArray(value)) {
|
|
54
|
+
value.forEach((item) => {
|
|
55
|
+
visitForToolCalls(item, appName, found);
|
|
56
|
+
});
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
if (!isRecord(value)) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
if (value.action === 'toolCall' && typeof value.tool === 'string' && isFastMcpAppBackendTool(value.tool, appName)) {
|
|
63
|
+
const argumentKeys = isRecord(value.arguments) ? Object.keys(value.arguments) : [];
|
|
64
|
+
const current = found.get(value.tool) ?? new Set();
|
|
65
|
+
argumentKeys.forEach((key) => current.add(key));
|
|
66
|
+
found.set(value.tool, current);
|
|
67
|
+
}
|
|
68
|
+
Object.values(value).forEach((child) => {
|
|
69
|
+
visitForToolCalls(child, appName, found);
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
function parseFastMcpBackendToolName(toolName) {
|
|
73
|
+
if (toolName.length <= FASTMCP_HASH_LENGTH + 1 || toolName[FASTMCP_HASH_LENGTH] !== '_') {
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
const digest = toolName.slice(0, FASTMCP_HASH_LENGTH);
|
|
77
|
+
if (!/^[0-9a-f]+$/.test(digest)) {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
return {
|
|
81
|
+
digest,
|
|
82
|
+
localName: toolName.slice(FASTMCP_HASH_LENGTH + 1),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
function hashFastMcpTool(appName, toolName) {
|
|
86
|
+
return createHash('sha256').update(`${appName}\0${toolName}`).digest('hex').slice(0, FASTMCP_HASH_LENGTH);
|
|
87
|
+
}
|
|
88
|
+
function isRecord(value) {
|
|
89
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=proxy-apps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy-apps.js","sourceRoot":"","sources":["../../../src/server/utils/proxy-apps.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface ProxyToolDefinition {
|
|
|
7
7
|
responseType: ProxyToolResponseType;
|
|
8
8
|
description?: string;
|
|
9
9
|
inputSchema?: ProxyToolInputSchema;
|
|
10
|
+
meta?: Record<string, unknown>;
|
|
10
11
|
}
|
|
11
12
|
export interface ProxyToolInputSchema {
|
|
12
13
|
type?: string;
|
|
@@ -23,5 +24,7 @@ export interface ProxyToolSchemaProperty {
|
|
|
23
24
|
}
|
|
24
25
|
export declare function getProxyToolsConfig(): ProxyToolDefinition[];
|
|
25
26
|
export declare function getProxyToolDefinition(toolName: string): ProxyToolDefinition | undefined;
|
|
27
|
+
export declare function cacheDiscoveredProxyAppTool(parentConfig: ProxyToolDefinition, toolName: string, argumentKeys: string[]): ProxyToolDefinition;
|
|
26
28
|
export declare function loadProxyToolsConfig(): Promise<ProxyToolDefinition[]>;
|
|
29
|
+
export declare function resetProxyToolsConfigForTest(): void;
|
|
27
30
|
//# sourceMappingURL=proxy-tools-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-tools-config.d.ts","sourceRoot":"","sources":["../../../src/server/utils/proxy-tools-config.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,KAAK,CAAC;AAQnD,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,qBAAqB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy-tools-config.d.ts","sourceRoot":"","sources":["../../../src/server/utils/proxy-tools-config.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,KAAK,CAAC;AAQnD,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,qBAAqB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAaD,wBAAgB,mBAAmB,IAAI,mBAAmB,EAAE,CAE3D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAExF;AAED,wBAAgB,2BAA2B,CAC1C,YAAY,EAAE,mBAAmB,EACjC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EAAE,GACpB,mBAAmB,CAmCrB;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA2D3E;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}
|
|
@@ -17,6 +17,42 @@ export function getProxyToolsConfig() {
|
|
|
17
17
|
export function getProxyToolDefinition(toolName) {
|
|
18
18
|
return cachedToolsByName.get(toolName);
|
|
19
19
|
}
|
|
20
|
+
export function cacheDiscoveredProxyAppTool(parentConfig, toolName, argumentKeys) {
|
|
21
|
+
const existing = cachedToolsByName.get(toolName);
|
|
22
|
+
const existingProperties = existing?.inputSchema?.properties ?? {};
|
|
23
|
+
const discoveredProperties = Object.fromEntries(argumentKeys.map((key) => [key, {}]));
|
|
24
|
+
const inputSchema = {
|
|
25
|
+
type: 'object',
|
|
26
|
+
properties: {
|
|
27
|
+
...existingProperties,
|
|
28
|
+
...discoveredProperties,
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
const definition = {
|
|
32
|
+
...parentConfig,
|
|
33
|
+
toolName,
|
|
34
|
+
upstreamToolName: toolName,
|
|
35
|
+
description: `FastMCP app backend action discovered from ${parentConfig.toolName}.`,
|
|
36
|
+
inputSchema,
|
|
37
|
+
meta: {
|
|
38
|
+
visibility: ['app'],
|
|
39
|
+
hfProxy: {
|
|
40
|
+
discoveredFrom: parentConfig.toolName,
|
|
41
|
+
upstreamToolName: toolName,
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
cachedTools = cachedTools ?? [];
|
|
46
|
+
const index = cachedTools.findIndex((tool) => tool.toolName === toolName);
|
|
47
|
+
if (index === -1) {
|
|
48
|
+
cachedTools.push(definition);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
cachedTools[index] = definition;
|
|
52
|
+
}
|
|
53
|
+
cachedToolsByName.set(toolName, definition);
|
|
54
|
+
return definition;
|
|
55
|
+
}
|
|
20
56
|
export async function loadProxyToolsConfig() {
|
|
21
57
|
if (cachedTools) {
|
|
22
58
|
return cachedTools;
|
|
@@ -76,13 +112,17 @@ export async function loadProxyToolsConfig() {
|
|
|
76
112
|
})();
|
|
77
113
|
return cachedConfigPromise;
|
|
78
114
|
}
|
|
115
|
+
export function resetProxyToolsConfigForTest() {
|
|
116
|
+
cachedTools = null;
|
|
117
|
+
cachedConfigPromise = null;
|
|
118
|
+
cachedToolsByName = new Map();
|
|
119
|
+
}
|
|
79
120
|
async function loadProxyToolSchemas(sources) {
|
|
80
121
|
if (sources.length === 0) {
|
|
81
122
|
return [];
|
|
82
123
|
}
|
|
83
|
-
const
|
|
84
|
-
const
|
|
85
|
-
const schemaTasks = sources.map((source) => Promise.race([fetchProxyToolSchemas(source, shouldPrefix, hfToken), createTimeout(PROXY_SCHEMA_TIMEOUT_MS)])
|
|
124
|
+
const hfToken = process.env.DEFAULT_HF_TOKEN || process.env.HF_TOKEN || process.env.LOGGING_HF_TOKEN;
|
|
125
|
+
const schemaTasks = sources.map((source) => Promise.race([fetchProxyToolSchemas(source, hfToken), createTimeout(PROXY_SCHEMA_TIMEOUT_MS)])
|
|
86
126
|
.then((tools) => ({ source, tools }))
|
|
87
127
|
.catch((error) => {
|
|
88
128
|
logger.error({ error, proxyId: source.proxyId, url: source.url }, 'Failed to fetch proxy tool schemas');
|
|
@@ -91,7 +131,7 @@ async function loadProxyToolSchemas(sources) {
|
|
|
91
131
|
const results = await Promise.all(schemaTasks);
|
|
92
132
|
return results.flatMap((result) => result.tools);
|
|
93
133
|
}
|
|
94
|
-
async function fetchProxyToolSchemas(source,
|
|
134
|
+
async function fetchProxyToolSchemas(source, hfToken) {
|
|
95
135
|
const client = new Client({
|
|
96
136
|
name: 'hf-mcp-proxy-loader',
|
|
97
137
|
version: '1.0.0',
|
|
@@ -109,7 +149,7 @@ async function fetchProxyToolSchemas(source, shouldPrefix, hfToken) {
|
|
|
109
149
|
return [];
|
|
110
150
|
}
|
|
111
151
|
return tools
|
|
112
|
-
.map((tool) => buildProxyToolDefinition(source, tool,
|
|
152
|
+
.map((tool) => buildProxyToolDefinition(source, tool, tools.length === 1 ? source.proxyId : tool.name))
|
|
113
153
|
.filter((tool) => Boolean(tool));
|
|
114
154
|
}
|
|
115
155
|
catch (error) {
|
|
@@ -125,8 +165,7 @@ async function fetchProxyToolSchemas(source, shouldPrefix, hfToken) {
|
|
|
125
165
|
}
|
|
126
166
|
}
|
|
127
167
|
}
|
|
128
|
-
function buildProxyToolDefinition(source, tool,
|
|
129
|
-
const outwardName = shouldPrefix ? `${source.proxyId}_${tool.name}` : tool.name;
|
|
168
|
+
function buildProxyToolDefinition(source, tool, toolName) {
|
|
130
169
|
const inputSchema = tool.inputSchema;
|
|
131
170
|
if (!inputSchema || inputSchema.type !== 'object') {
|
|
132
171
|
logger.error({ proxyId: source.proxyId, toolName: tool.name }, 'Proxy tool schema missing or invalid');
|
|
@@ -134,12 +173,13 @@ function buildProxyToolDefinition(source, tool, shouldPrefix) {
|
|
|
134
173
|
}
|
|
135
174
|
return {
|
|
136
175
|
proxyId: source.proxyId,
|
|
137
|
-
toolName
|
|
176
|
+
toolName,
|
|
138
177
|
upstreamToolName: tool.name,
|
|
139
178
|
url: source.url,
|
|
140
179
|
responseType: source.responseType,
|
|
141
180
|
description: tool.description,
|
|
142
181
|
inputSchema,
|
|
182
|
+
meta: tool._meta,
|
|
143
183
|
};
|
|
144
184
|
}
|
|
145
185
|
function buildAuthHeaders(hfToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-tools-config.js","sourceRoot":"","sources":["../../../src/server/utils/proxy-tools-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy-tools-config.js","sourceRoot":"","sources":["../../../src/server/utils/proxy-tools-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
1
|
+
import type { CallToolResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
import type { ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
|
|
3
3
|
import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
|
|
4
4
|
export declare function callStreamableHttpTool(serverUrl: string, toolName: string, parameters: Record<string, unknown>, hfToken: string | undefined, extra: RequestHandlerExtra<ServerRequest, ServerNotification> | undefined): Promise<CallToolResult>;
|
|
5
|
+
export declare function readStreamableHttpResource(serverUrl: string, resourceUri: string, hfToken: string | undefined): Promise<ReadResourceResult>;
|
|
5
6
|
//# sourceMappingURL=streamable-http-tool-caller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamable-http-tool-caller.d.ts","sourceRoot":"","sources":["../../../src/server/utils/streamable-http-tool-caller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"streamable-http-tool-caller.d.ts","sourceRoot":"","sources":["../../../src/server/utils/streamable-http-tool-caller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAuBxF,wBAAsB,sBAAsB,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,KAAK,EAAE,mBAAmB,CAAC,aAAa,EAAE,kBAAkB,CAAC,GAAG,SAAS,GACvE,OAAO,CAAC,cAAc,CAAC,CAsIzB;AAED,wBAAsB,0BAA0B,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GAAG,SAAS,GACzB,OAAO,CAAC,kBAAkB,CAAC,CAiD7B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
|
|
1
|
+
import { CallToolResultSchema, ReadResourceResultSchema } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
3
3
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
4
4
|
import { fetchWithProfile, NETWORK_FETCH_PROFILES, parseAndValidateUrl } from '@llmindset/hf-mcp/network';
|
|
@@ -112,4 +112,41 @@ export async function callStreamableHttpTool(serverUrl, toolName, parameters, hf
|
|
|
112
112
|
await client.close();
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
+
export async function readStreamableHttpResource(serverUrl, resourceUri, hfToken) {
|
|
116
|
+
logger.trace({
|
|
117
|
+
serverUrl,
|
|
118
|
+
resourceUri,
|
|
119
|
+
hasToken: Boolean(hfToken),
|
|
120
|
+
}, 'Streamable proxy reading upstream resource');
|
|
121
|
+
const validatedServerUrl = parseAndValidateUrl(serverUrl, PROXY_STREAMABLE_PROFILE.urlPolicy);
|
|
122
|
+
const client = new Client({
|
|
123
|
+
name: 'hf-mcp-streamable-client',
|
|
124
|
+
version: '1.0.0',
|
|
125
|
+
}, {
|
|
126
|
+
capabilities: {},
|
|
127
|
+
});
|
|
128
|
+
const headers = buildAuthHeaders(hfToken);
|
|
129
|
+
const transport = new StreamableHTTPClientTransport(validatedServerUrl, {
|
|
130
|
+
requestInit: headers ? { headers } : undefined,
|
|
131
|
+
fetch: async (url, init) => {
|
|
132
|
+
const { response } = await fetchWithProfile(url.toString(), PROXY_STREAMABLE_PROFILE, {
|
|
133
|
+
requestInit: init,
|
|
134
|
+
});
|
|
135
|
+
return response;
|
|
136
|
+
},
|
|
137
|
+
});
|
|
138
|
+
await client.connect(transport);
|
|
139
|
+
logger.trace({ serverUrl, resourceUri }, 'Streamable proxy connected upstream for resource read');
|
|
140
|
+
try {
|
|
141
|
+
return await client.request({
|
|
142
|
+
method: 'resources/read',
|
|
143
|
+
params: {
|
|
144
|
+
uri: resourceUri,
|
|
145
|
+
},
|
|
146
|
+
}, ReadResourceResultSchema);
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
await client.close();
|
|
150
|
+
}
|
|
151
|
+
}
|
|
115
152
|
//# sourceMappingURL=streamable-http-tool-caller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamable-http-tool-caller.js","sourceRoot":"","sources":["../../../src/server/utils/streamable-http-tool-caller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"streamable-http-tool-caller.js","sourceRoot":"","sources":["../../../src/server/utils/streamable-http-tool-caller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-selection-strategy.d.ts","sourceRoot":"","sources":["../../../src/server/utils/tool-selection-strategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOxD,oBAAY,iBAAiB;IAC5B,gBAAgB,qBAAqB;IACrC,GAAG,QAAQ;IACX,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;CACrB;AAED,MAAM,WAAW,oBAAoB;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,mBAAmB;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;CAC/B;AAuCD,qBAAa,qBAAqB;IACjC,OAAO,CAAC,SAAS,CAAe;gBAEpB,SAAS,EAAE,YAAY;IAYnC,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,gBAAgB;IAmBlB,WAAW,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-selection-strategy.d.ts","sourceRoot":"","sources":["../../../src/server/utils/tool-selection-strategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOxD,oBAAY,iBAAiB;IAC5B,gBAAgB,qBAAqB;IACrC,GAAG,QAAQ;IACX,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;CACrB;AAED,MAAM,WAAW,oBAAoB;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,mBAAmB;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;CAC/B;AAuCD,qBAAa,qBAAqB;IACjC,OAAO,CAAC,SAAS,CAAe;gBAEpB,SAAS,EAAE,YAAY;IAYnC,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,gBAAgB;IAmBlB,WAAW,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAqIhE,eAAe;CAiC7B"}
|
|
@@ -47,7 +47,7 @@ export class ToolSelectionStrategy {
|
|
|
47
47
|
if (proxyToolNames.length === 0) {
|
|
48
48
|
return enabledToolIds;
|
|
49
49
|
}
|
|
50
|
-
return
|
|
50
|
+
return [...new Set([...normalizeBuiltInTools(enabledToolIds), ...proxyToolNames])];
|
|
51
51
|
}
|
|
52
52
|
async selectTools(context) {
|
|
53
53
|
const { bouquet, mix, gradio } = extractAuthBouquetAndMix(context.headers);
|
|
@@ -129,11 +129,17 @@ export class ToolSelectionStrategy {
|
|
|
129
129
|
};
|
|
130
130
|
}
|
|
131
131
|
logger.warn('No settings available, using fallback (all tools enabled)');
|
|
132
|
-
|
|
132
|
+
let enabledToolIds = normalizeBuiltInTools(this.applySearchEnablesFetch([...ALL_BUILTIN_TOOL_IDS]));
|
|
133
|
+
if (includesProxyMix && proxyToolNames.length > 0) {
|
|
134
|
+
enabledToolIds = this.appendProxyTools(enabledToolIds);
|
|
135
|
+
}
|
|
136
|
+
else if (includesProxyMix && proxyToolNames.length === 0) {
|
|
137
|
+
logger.warn('Proxy mix requested but no proxy tools are configured');
|
|
138
|
+
}
|
|
133
139
|
return {
|
|
134
140
|
mode: ToolSelectionMode.FALLBACK,
|
|
135
141
|
enabledToolIds,
|
|
136
|
-
reason: `Fallback - no settings available${gradioSpaceTools.length > 0 ? ` + ${gradioSpaceTools.length} gradio endpoints` : ''}`,
|
|
142
|
+
reason: `Fallback - no settings available${includesProxyMix ? ' + proxy mix' : ''}${gradioSpaceTools.length > 0 ? ` + ${gradioSpaceTools.length} gradio endpoints` : ''}`,
|
|
137
143
|
gradioSpaceTools: gradioSpaceTools.length > 0 ? gradioSpaceTools : undefined,
|
|
138
144
|
};
|
|
139
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-selection-strategy.js","sourceRoot":"","sources":["../../../src/server/utils/tool-selection-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,CAAN,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC5B,0DAAqC,CAAA;IACrC,gCAAW,CAAA;IACX,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,0CAAqB,CAAA;AACtB,CAAC,EANW,iBAAiB,KAAjB,iBAAiB,QAM5B;AAsDD,MAAM,OAAO,qBAAqB;IACzB,SAAS,CAAe;IAEhC,YAAY,SAAuB;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAUO,oBAAoB,CAAC,WAAmB;QAE/C,MAAM,YAAY,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAGtD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAGjC,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAE7D,OAAO;gBACN,GAAG,EAAE,mBAAmB,oBAAoB,EAAE;gBAC9C,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,SAAS,EAAE,oBAAoB;gBAC/B,KAAK,EAAE,IAAI;aACX,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAMO,uBAAuB,CAAC,cAAwB;QACvD,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM,EAAE,CAAC;YACjD,IAAI,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC1F,MAAM,CAAC,KAAK,CAAC,mFAAmF,CAAC,CAAC;gBAClG,OAAO,CAAC,GAAG,cAAc,EAAE,cAAc,CAAC,CAAC;YAC5C,CAAC;QACF,CAAC;QACD,OAAO,cAAc,CAAC;IACvB,CAAC;IAEO,iBAAiB;QACxB,OAAO,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAEO,gBAAgB,CAAC,cAAwB;QAChD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAChD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,cAAc,CAAC;QACvB,CAAC;QACD,OAAO,
|
|
1
|
+
{"version":3,"file":"tool-selection-strategy.js","sourceRoot":"","sources":["../../../src/server/utils/tool-selection-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bouquet-presets.js","sourceRoot":"","sources":["../../src/shared/bouquet-presets.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,4BAA4B,GAC5B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,CAAC,MAAM,QAAQ,GAAgC;IACpD,MAAM,EAAE;QACP,YAAY,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,UAAU,EAAE,EAAE;KACd;IACD,MAAM,EAAE;QACP,YAAY,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,UAAU,EAAE,EAAE;KACd;IACD,MAAM,EAAE;QACP,YAAY,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,UAAU,EAAE,EAAE;KACd;IACD,IAAI,EAAE;QACL,YAAY,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC;QACtC,UAAU,EAAE,EAAE;KACd;IACD,MAAM,EAAE;QACP,YAAY,EAAE;YACb,wBAAwB;YACxB,mBAAmB;YACnB,mBAAmB;YACnB,4BAA4B;YAC5B,eAAe;SACf;QACD,UAAU,EAAE,EAAE;KACd;IACD,GAAG,EAAE;QACJ,YAAY,EAAE,CAAC,GAAG,oBAAoB,CAAC;QACvC,UAAU,EAAE,EAAE;KACd;IAED,uBAAuB,EAAE;QACxB,YAAY,EAAE,CAAC,wBAAwB,EAAE,mBAAmB,CAAC;QAC7D,UAAU,EAAE,EAAE;KACd;IACD,gBAAgB,EAAE;QACjB,YAAY,EAAE,CAAC,wBAAwB,CAAC;QACxC,UAAU,EAAE,EAAE;KACd;IACD,gBAAgB,EAAE;QACjB,YAAY,EAAE,CAAC,wBAAwB,CAAC;QACxC,UAAU,EAAE,EAAE;KACd;IACD,MAAM,EAAE;QACP,YAAY,EAAE,CAAC,iBAAiB,CAAC;QACjC,UAAU,EAAE,EAAE;KACd;IACD,IAAI,EAAE;QACL,YAAY,EAAE,CAAC,eAAe,CAAC;QAC/B,UAAU,EAAE,EAAE;KACd;IACD,aAAa,EAAE;QACd,YAAY,EAAE,CAAC,qBAAqB,CAAC;QACrC,UAAU,EAAE,EAAE;KACd;IACD,KAAK,EAAE;QACN,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"bouquet-presets.js","sourceRoot":"","sources":["../../src/shared/bouquet-presets.ts"],"names":[],"mappings":"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"}
|