kimhyungsik/ax_hub_mcp_tool
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: restructure tools/list response to strictly follow MCP schema standard (PDF page 62)
Some checks failed
Deploy to OCIWP / deploy (push) Failing after 26s
Details

Browse Source
This commit is contained in:
jade
2026-08-13 18:15:10 +09:00
parent ad4758d0ba
commit 33e1261b38
12 changed files with 104 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dap-gateway/src/main/java/io/shinhanlife/dap/mcg/presentation/McpRouterController.java
View File

@@ -166,9 +166,52 @@ public class McpRouterController {
.collect(Collectors.toList());
}
List<Map<String, Object>> mappedTools = activeTools.stream().map(t -> {
Map<String, Object> toolMap = new HashMap<>();
toolMap.put("name", t.getName());
toolMap.put("description", t.getDescription());
toolMap.put("inputSchema", t.getParametersSchema());
toolMap.put("outputSchema", t.getOutputSchema());
toolMap.put("title", t.getDisplayName());
Map<String, Object> annotations = new HashMap<>();
annotations.put("readOnlyHint", t.getReadOnlyHint() != null ? t.getReadOnlyHint() : false);
annotations.put("destructiveHint", t.getDestructiveHint() != null ? t.getDestructiveHint() : true);
annotations.put("idempotentHint", t.getIdempotentHint() != null ? t.getIdempotentHint() : false);
toolMap.put("annotations", annotations);
Map<String, Object> meta = new HashMap<>();
meta.put("uid", t.getUid());
meta.put("version", t.getSemver());
meta.put("moduleName", t.getModuleName());
meta.put("category_key", t.getCategoryKey());
meta.put("tags", t.getTags());
meta.put("owner_org", t.getOwnerOrg());
meta.put("legacy_interface_id", t.getMciServiceId());
meta.put("display_description", t.getDisplayDescription());
meta.put("example_queries", t.getExampleQueries());
meta.put("required_env_keys", t.getRequiredEnvKeys());
meta.put("endpoint", t.getEndpoint());
meta.put("podUrl", t.getPodUrl());
meta.put("visible", t.getVisible());
meta.put("enabled", t.getEnabled());
meta.put("isRegistered", t.getIsRegistered());
meta.put("requiresApproval", t.getRequiresApproval());
meta.put("integrationType", t.getIntegrationType());
meta.put("mciServiceId", t.getMciServiceId());
meta.put("operationType", t.getOperationType());
meta.put("retryEnabled", t.getRetryEnabled());
meta.put("circuitBreakerFailureThreshold", t.getCircuitBreakerFailureThreshold());
meta.put("circuitBreakerOpenMillis", t.getCircuitBreakerOpenMillis());
meta.put("timeoutMillis", t.getTimeoutMillis());
toolMap.put("_meta", meta);
return toolMap;
}).collect(Collectors.toList());
JsonRpcResponse response = new JsonRpcResponse();
response.setId(UUID.randomUUID().toString());
response.setResult(Map.of("tools", activeTools));
response.setResult(Map.of("tools", mappedTools));
return ResponseEntity.ok(response);
}

15
dap-gateway/src/main/resources/static/catalog.html
View File

@@ -179,7 +179,7 @@
}
const grouped = {};
tools.forEach(tool => {
const group = tool.categoryKey || 'Others';
const group = tool._meta?.category_key || 'Others';
if (!grouped[group]) grouped[group] = [];
grouped[group].push(tool);
});
@@ -209,16 +209,15 @@
const card = document.createElement('div');
card.className = 'tool-card';
const isDirect = tool.integrationType === 'DIRECT';
const isDirect = tool._meta?.integrationType === 'DIRECT';
const badgeBg = isDirect ? 'rgba(59,130,246,0.15)' : 'rgba(249,115,22,0.15)';
const badgeColor = isDirect ? '#60a5fa' : '#fb923c';
const badgeBorder = isDirect ? 'rgba(59,130,246,0.3)' : 'rgba(249,115,22,0.3)';
let paramHtml = '';
const schema = tool.inputSchema || tool.parametersSchema;
if (schema && schema.properties) {
const props = schema.properties;
const required = schema.required || [];
if (tool.parametersSchema && tool.parametersSchema.properties) {
const props = tool.parametersSchema.properties;
const required = tool.parametersSchema.required || [];
if (Object.keys(props).length > 0) {
paramHtml = `
<div style="margin-top:16px; padding-top:16px; border-top:1px solid #27272a;">
@@ -256,14 +255,14 @@
<div style="display:flex; align-items:flex-start; justify-content:space-between;">
<div style="flex:1;">
<div style="display:flex; align-items:center; margin-bottom:4px;">
<h3 style="font-size:16px; font-weight:600; color:#f4f4f5;">${tool.displayName || tool.name}</h3>
<h3 style="font-size:16px; font-weight:600; color:#f4f4f5;">${tool.title || tool.name}</h3>
<span style="margin:0 8px; color:#3f3f46;">/</span>
<span class="geist-mono" style="font-size:12px; color:#71717a;">${tool.name}</span>
</div>
<p style="font-size:14px; color:#a1a1aa;">${tool.description || 'No description provided.'}</p>
</div>
<div style="margin-left:16px; padding:4px 10px; border-radius:6px; font-size:11px; font-weight:600; background:${badgeBg}; color:${badgeColor}; border:1px solid ${badgeBorder};" class="geist-mono">
${tool.integrationType || 'DIRECT'}
${tool._meta?.integrationType || 'DIRECT'}
</div>
</div>
${paramHtml}

6
dap-gateway/src/main/resources/static/playground.html
View File

@@ -206,7 +206,7 @@
const tools = data.result?.tools || [];
const groupedTools = {};
tools.forEach(tool => {
const group = tool.categoryKey || 'Others';
const group = tool._meta?.category_key || 'Others';
if (!groupedTools[group]) groupedTools[group] = [];
groupedTools[group].push(tool);
});
@@ -217,9 +217,9 @@
const option = document.createElement('option');
option.value = tool.name;
option.textContent = tool.name;
option.dataset.schema = JSON.stringify(tool.inputSchema || tool.parametersSchema);
option.dataset.schema = JSON.stringify(tool.parametersSchema);
option.dataset.prompts = JSON.stringify(tool.actionPrompts || {});
option.dataset.integrationType = tool.integrationType || 'HTTP';
option.dataset.integrationType = tool._meta?.integrationType || 'HTTP';
optgroup.appendChild(option);
if (tool.actionPrompts) Object.assign(actionPrompts, tool.actionPrompts);
});

15
dap-gateway/src/main/resources/static/static/index.html
View File

@@ -331,7 +331,7 @@
const groupedTools = {};
tools.forEach(tool => {
const group = tool.domainGroup || '기타 그룹';
const group = tool._meta?.category_key || '기타';
if (!groupedTools[group]) {
groupedTools[group] = [];
}
@@ -348,16 +348,15 @@
groupedTools[group].forEach(tool => {
const option = document.createElement('option');
option.value = tool.toolName;
const commType = tool.integrationType ? tool.integrationType : 'HTTP';
option.textContent = tool.description ? `[${commType}] ${tool.description} (${tool.toolName})` : `[${commType}] ${tool.toolName}`;
option.value = tool.name;
const commType = tool._meta?.integrationType || 'HTTP';
option.textContent = tool.description ? `[${commType}] ${tool.description} (${tool.name})` : `[${commType}] ${tool.name}`;
option.dataset.schema = JSON.stringify(tool.inputSchema || tool.parametersSchema);
option.dataset.prompts = JSON.stringify(tool.actionPrompts || {});
optgroup.appendChild(option);
const schema = tool.inputSchema || tool.parametersSchema;
const enums = schema?.properties?.action?.enum || [];
const descStr = schema?.properties?.action?.description || "";
const enums = tool.parametersSchema?.properties?.action?.enum || [];
const descStr = tool.parametersSchema?.properties?.action?.description || "";
let descMap = {};
if(descStr.includes(":")) {
@@ -370,7 +369,7 @@
});
}
toolFunctions[tool.toolName] = enums.map(e => {
toolFunctions[tool.name] = enums.map(e => {
return { value: e, label: descMap[e] || e };
});

20
dap-gateway/src/main/resources/static/tester.html
View File

@@ -296,9 +296,9 @@
t._isFailed = false;
t._latency = 0;
t._responseData = null;
categories.add(t.categoryKey || 'oth');
if (t.moduleName) {
modules.add(t.moduleName.replace('dap-was-', ''));
categories.add(t._meta?.category_key || 'oth');
if (t._meta?.moduleName) {
modules.add(t._meta.moduleName.replace('dap-was-', ''));
}
});
@@ -331,7 +331,7 @@
function generateDummyPayload(tool) {
if (tool._customPayload) return tool._customPayload;
const schema = tool.inputSchema || tool.parametersSchema;
const schema = tool.parametersSchema;
if (!schema || !schema.properties) return {};
const payload = {};
for (const [key, value] of Object.entries(schema.properties)) {
@@ -357,8 +357,8 @@
filteredTools = allTools.filter(t => {
const matchSearch = t.name.toLowerCase().includes(search) || (t.description || '').toLowerCase().includes(search);
const matchCategory = !category || (t.categoryKey || 'oth') === category;
const toolMod = t.moduleName ? t.moduleName.replace('dap-was-', '') : '';
const matchCategory = !category || (t._meta?.category_key || 'oth') === category;
const toolMod = t._meta?.moduleName ? t._meta.moduleName.replace('dap-was-', '') : '';
const matchModule = !moduleFlt || toolMod === moduleFlt;
return matchSearch && matchCategory && matchModule;
});
@@ -395,8 +395,8 @@
html += `
<tr id="row-${index}">
<td><span class="cat-badge" style="background:rgba(59,130,246,0.1); color:#60a5fa; border:1px solid rgba(59,130,246,0.2);">${tool.moduleName ? tool.moduleName.replace('dap-was-', '') : 'unknown'}</span></td>
<td><span class="cat-badge">${tool.categoryKey || 'oth'}</span></td>
<td><span class="cat-badge" style="background:rgba(59,130,246,0.1); color:#60a5fa; border:1px solid rgba(59,130,246,0.2);">${tool._meta?.moduleName ? tool._meta.moduleName.replace('dap-was-', '') : 'unknown'}</span></td>
<td><span class="cat-badge">${tool._meta?.category_key || 'oth'}</span></td>
<td class="font-medium text-slate-200">${tool.name}</td>
<td class="text-sm text-zinc-400 geist-mono flex items-center gap-3">
<span title='${payloadStr.replace(/'/g, "&apos;")}'>${shortPayload}</span>
@@ -705,7 +705,7 @@
}
function renderSmartForm(tool, payloadToUse = null) {
const schema = tool.inputSchema || tool.parametersSchema;
const schema = tool.parametersSchema;
const form = document.getElementById('payloadFormContainer');
form.innerHTML = '';
@@ -739,7 +739,7 @@
inputHtml = `<input type="text" data-key="${key}" data-type="string" value="${typeof val === 'object' ? JSON.stringify(val).replace(/"/g, '&quot;') : val}" class="bg-[#09090b] border border-[#3f3f46] text-white text-sm rounded p-2 w-full focus:border-blue-500 outline-none">`;
}
let reqStar = ((tool.inputSchema || tool.parametersSchema)?.required?.includes(key)) ? '<span class="text-red-500">*</span>' : '';
let reqStar = (schema.required && schema.required.includes(key)) ? '<span class="text-red-500">*</span>' : '';
html += `<div class="bg-[#18181b] p-4 rounded-lg border border-[#27272a]">
<label class="block text-sm font-medium text-slate-300 mb-2">${key} ${reqStar} <span class="text-xs text-zinc-500 font-mono font-normal ml-2">${typeLabel}</span></label>
${inputHtml}