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

fix: AI 채팅 툴 실행 시 동적 Tenant ID(Agent ID)를 주입하여 권한 거부 오류 해결

Browse Source
This commit is contained in:
jade
2026-07-16 09:07:38 +09:00
parent d70a81ee43
commit 5e97e6754f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/presentation/ChatController.java
View File

@@ -28,7 +28,10 @@ public class ChatController {
private final ChatClient.Builder chatClientBuilder; private final ChatClient.Builder chatClientBuilder;
@PostMapping(produces = MediaType.TEXT_EVENT_STREAM_VALUE) @PostMapping(produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public SseEmitter chatStream(@RequestBody Map<String, String> request) { public SseEmitter chatStream(@RequestBody Map<String, String> request,
@RequestHeader(value = "X-Agent-Id", required = false) String agentId,
@RequestHeader(value = "X-Tenant-Id", required = false, defaultValue = "system") String tenantId) {
String effectiveTenantId = (agentId != null && !agentId.trim().isEmpty()) ? agentId : tenantId;
String message = request.getOrDefault("message", "").trim(); String message = request.getOrDefault("message", "").trim();
log.info("[Real AI Chat] 사용자의 메시지 수신: {}", message); log.info("[Real AI Chat] 사용자의 메시지 수신: {}", message);
@@ -38,7 +41,7 @@ public class ChatController {
List<ToolCallback> callbacks = new ArrayList<>(); List<ToolCallback> callbacks = new ArrayList<>();
for (ToolMetadata meta : registryService.getAllTools()) { for (ToolMetadata meta : registryService.getAllTools()) {
if (Boolean.TRUE.equals(meta.getVisible())) { if (Boolean.TRUE.equals(meta.getVisible())) {
callbacks.add(new DynamicMcpToolCallback(meta, executeService, objectMapper)); callbacks.add(new DynamicMcpToolCallback(meta, executeService, objectMapper, effectiveTenantId));
} }
} }
@@ -100,11 +103,13 @@ public class ChatController {
private final ExecuteService executeService; private final ExecuteService executeService;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final ToolDefinition toolDefinition; private final ToolDefinition toolDefinition;
private final String tenantId;
public DynamicMcpToolCallback(ToolMetadata metadata, ExecuteService executeService, ObjectMapper objectMapper) { public DynamicMcpToolCallback(ToolMetadata metadata, ExecuteService executeService, ObjectMapper objectMapper, String tenantId) {
this.metadata = metadata; this.metadata = metadata;
this.executeService = executeService; this.executeService = executeService;
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.tenantId = tenantId;
String schema = "{\"type\":\"object\",\"properties\":{}}"; String schema = "{\"type\":\"object\",\"properties\":{}}";
try { try {
@@ -148,7 +153,7 @@ public class ChatController {
payload.put("params", params); payload.put("params", params);
Object result = executeService.execute(payload, "default"); Object result = executeService.execute(payload, this.tenantId);
String jsonResult = objectMapper.writeValueAsString(result); String jsonResult = objectMapper.writeValueAsString(result);
log.info("[Function Calling] '{}' 툴 실행 완료. 결과: {}", metadata.getName(), jsonResult); log.info("[Function Calling] '{}' 툴 실행 완료. 결과: {}", metadata.getName(), jsonResult);
return jsonResult; return jsonResult;