1.13.2

.gitignore

@@ -16,6 +16,7 @@ HELP.md
 
 ### IntelliJ IDEA ###
 .idea
+!.idea/icon.png
 *.iws
 *.iml
 *.ipr

GUIDE.md

@@ -0,0 +1,5 @@
+Official website: https://www.erupt.xyz
+Deployment documentation: https://www.yuque.com/erupts/erupt/tpq1l9
+Online demo: https://www.erupt.xyz/demo
+Github demo code: https://github.com/erupts/erupt-example 
+Gitee demo code: https://gitee.com/erupt/erupt-example

deploy/erupt-cloud-server-docker/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.1</version>
+        <version>1.13.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

erupt-admin/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.1</version>
+        <version>1.13.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

erupt-ai/RREAME.md

@@ -1,3 +1,3 @@
 #### AI Module
 
-ChatGpt/DeepSeek/Kimi/ollama
+Unified LLM Access & Support Layer

erupt-ai/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.1</version>
+        <version>1.13.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

erupt-ai/src/main/java/xyz/erupt/ai/EruptAiAutoConfiguration.java

@@ -45,7 +45,7 @@ public void post() {
 
     @Override
     public ModuleInfo info() {
-        return ModuleInfo.builder().name("erupt-ai").build();
+        return ModuleInfo.builder().name("erupt-ai").description("The large-model-driven ERUPT AI infrastructure").build();
     }
 
     @Override

erupt-ai/src/main/java/xyz/erupt/ai/call/AiFunctionCall.java

@@ -6,16 +6,12 @@
  */
 public interface AiFunctionCall {
 
-    default String code() {
-        return this.getClass().getSimpleName();
-    }
-
     default boolean mcpCall() {
         return true;
     }
 
     default String name() {
-        return this.code();
+        return this.getClass().getSimpleName();
     }
 
     String description();

erupt-ai/src/main/java/xyz/erupt/ai/call/AiFunctionManager.java

@@ -43,16 +43,36 @@ public class AiFunctionManager implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         EruptSpringUtil.scannerPackage(EruptApplication.getScanPackage(),
-                new TypeFilter[]{new AssignableTypeFilter(AiFunctionCall.class)}, clazz ->
-                        aiFunctions.put(clazz.getSimpleName(), (AiFunctionCall) EruptSpringUtil.getBean(clazz))
-        );
+                new TypeFilter[]{new AssignableTypeFilter(AiFunctionCall.class)}, clazz -> {
+                    AiFunctionCall functionCall = (AiFunctionCall) EruptSpringUtil.getBean(clazz);
+                    aiFunctions.put(functionCall.name(), functionCall);
+                });
     }
 
     public String getFunctionCallPrompt() {
-        StringBuilder sb = new StringBuilder("下面是一组 Function Call 的映射，根据情况决定是否调用，否则忽略这段提示词\n");
+        StringBuilder sb = new StringBuilder("""
+                    Below is a mapping of available Function Calls.
+
+                    Please decide whether a function is clearly required after understanding the user's question.
+
+                    Rules:
+                    1. Call a function IF AND ONLY IF the user's intent clearly and directly matches the function description,
+                       and calling the function will significantly improve the accuracy of the response.
+                    2. If a function is triggered, STRICTLY output ONLY the function name.
+                       Do NOT output explanations, symbols, punctuation, or any extra text.
+                    3. If no function is required, IGNORE this entire instruction block
+                       and respond to the user normally.
+
+                    Available functions:
+                """);
         for (Map.Entry<String, AiFunctionCall> entry : aiFunctions.entrySet()) {
-            sb.append("- 如果用户问：").append(entry.getValue().description()).append("，就只回复：").append(entry.getKey()).append("\n");
+            sb.append("- ")
+                    .append(entry.getKey())
+                    .append(": ")
+                    .append(entry.getValue().description())
+                    .append("\n");
         }
+
         return sb.toString();
     }
 

erupt-ai/src/main/java/xyz/erupt/ai/call/impl/EruptDataQuery.java

@@ -0,0 +1,39 @@
+package xyz.erupt.ai.call.impl;
+
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import xyz.erupt.ai.annotation.AiParam;
+import xyz.erupt.ai.call.AiFunctionCall;
+import xyz.erupt.core.config.GsonFactory;
+import xyz.erupt.core.service.EruptCoreService;
+import xyz.erupt.core.view.EruptModel;
+import xyz.erupt.jpa.dao.EruptDao;
+
+import java.util.List;
+
+/**
+ * @author YuePeng
+ * date 2025/3/14 23:25
+ */
+@Component
+@Scope("prototype")
+public class EruptDataQuery implements AiFunctionCall {
+
+    @AiParam(description = "HQL (Hibernate Query Language)")
+    private String hql;
+
+    @Resource
+    private EruptDao eruptDao;
+
+    @Override
+    public String description() {
+        return "Query erupt model data";
+    }
+
+    @Override
+    public String call(String prompt) {
+        List<?> result = eruptDao.getEntityManager().createQuery(hql).getResultList();
+        return GsonFactory.getGson().toJson(result);
+    }
+}

erupt-ai/src/main/java/xyz/erupt/ai/call/impl/EruptList.java

@@ -0,0 +1,31 @@
+package xyz.erupt.ai.call.impl;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import xyz.erupt.ai.call.AiFunctionCall;
+import xyz.erupt.core.module.EruptModuleInvoke;
+import xyz.erupt.core.service.EruptCoreService;
+import xyz.erupt.core.view.EruptModel;
+
+/**
+ * @author YuePeng
+ * date 2025/3/14 23:25
+ */
+@Component
+@Scope("prototype")
+public class EruptList implements AiFunctionCall {
+
+    @Override
+    public String description() {
+        return "Erupt model list";
+    }
+
+    @Override
+    public String call(String prompt) {
+        StringBuilder sb = new StringBuilder();
+        for (EruptModel erupt : EruptCoreService.getErupts()) {
+            sb.append(erupt.getEruptName()).append(": ").append(erupt.getErupt().name());
+        }
+        return sb.toString();
+    }
+}

erupt-ai/src/main/java/xyz/erupt/ai/call/impl/EruptModuleInfo.java

@@ -0,0 +1,29 @@
+package xyz.erupt.ai.call.impl;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import xyz.erupt.ai.call.AiFunctionCall;
+import xyz.erupt.core.module.EruptModuleInvoke;
+
+/**
+ * @author YuePeng
+ * date 2025/3/14 23:25
+ */
+@Component
+@Scope("prototype")
+public class EruptModuleInfo implements AiFunctionCall {
+
+    @Override
+    public String description() {
+        return "Erupt Module list";
+    }
+
+    @Override
+    public String call(String prompt) {
+        StringBuilder sb = new StringBuilder();
+        EruptModuleInvoke.invoke(it -> {
+            sb.append(it.info().getName()).append(": ").append(it.info().getDescription()).append("\n");
+        });
+        return sb.toString();
+    }
+}

erupt-ai/src/main/java/xyz/erupt/ai/call/impl/EruptSchema.java

@@ -0,0 +1,33 @@
+package xyz.erupt.ai.call.impl;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import xyz.erupt.ai.annotation.AiParam;
+import xyz.erupt.ai.call.AiFunctionCall;
+import xyz.erupt.core.config.GsonFactory;
+import xyz.erupt.core.module.EruptModuleInvoke;
+import xyz.erupt.core.service.EruptCoreService;
+import xyz.erupt.core.view.EruptModel;
+
+/**
+ * @author YuePeng
+ * date 2025/3/14 23:25
+ */
+@Component
+@Scope("prototype")
+public class EruptSchema implements AiFunctionCall {
+
+    @AiParam(description = "Erupt Name")
+    private String eruptName;
+
+    @Override
+    public String description() {
+        return "Erupt model schema";
+    }
+
+    @Override
+    public String call(String prompt) {
+        EruptModel erupt = EruptCoreService.getEruptView(eruptName);
+        return GsonFactory.getGson().toJson(erupt);
+    }
+}

erupt-ai/src/main/java/xyz/erupt/ai/call/impl/EruptUserInfo.java

@@ -0,0 +1,33 @@
+package xyz.erupt.ai.call.impl;
+
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import xyz.erupt.ai.call.AiFunctionCall;
+import xyz.erupt.core.config.GsonFactory;
+import xyz.erupt.core.context.MetaContext;
+import xyz.erupt.jpa.dao.EruptDao;
+import xyz.erupt.upms.model.EruptUser;
+
+/**
+ * @author YuePeng
+ * date 2025/3/14 23:25
+ */
+@Component
+@Scope("prototype")
+public class EruptUserInfo implements AiFunctionCall {
+
+    @Resource
+    private EruptDao eruptDao;
+
+    @Override
+    public String description() {
+        return "Ask the current system logged-in user";
+    }
+
+    @Override
+    public String call(String prompt) {
+        return GsonFactory.getGson().toJson(eruptDao.find(EruptUser.class, MetaContext.getUser().getUid()));
+    }
+
+}

erupt-ai/src/main/java/xyz/erupt/ai/controller/McpController.java

@@ -1,7 +1,9 @@
 package xyz.erupt.ai.controller;
 
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -13,7 +15,11 @@
 import xyz.erupt.ai.config.AiMCPProp;
 import xyz.erupt.ai.util.McpUtil;
 import xyz.erupt.ai.vo.mcp.*;
+import xyz.erupt.core.context.MetaContext;
 import xyz.erupt.core.util.EruptInformation;
+import xyz.erupt.core.util.ReflectUtil;
+import xyz.erupt.jpa.dao.EruptDao;
+import xyz.erupt.upms.model.EruptOpenApi;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -30,11 +36,15 @@
 @ConditionalOnProperty(name = "erupt.ai.mcp.enabled", havingValue = "true")
 @RestController
 @RequestMapping("/mcp")
+@Slf4j
 public class McpController {
 
     @Resource
     private AiMCPProp mcpProp;
 
+    @Resource
+    private EruptDao eruptDao;
+
     @GetMapping(value = "/sse", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     @PostMapping(value = "/sse", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public SseEmitter sse() {
@@ -66,7 +76,23 @@ private void cleanup(ScheduledExecutorService scheduler, ScheduledFuture<?> task
     }
 
     @PostMapping
-    public ResponseEntity<?> call(@RequestBody McpRequest request) {
+    public ResponseEntity<?> call(HttpServletRequest servletRequest, @RequestBody McpRequest request) {
+        String auth = servletRequest.getHeader("Authorization");
+        if (null == auth) {
+            log.error("MCP authorization not found");
+            return ResponseEntity.status(401).build();
+        }
+        String bearer = "Bearer ";
+        String token = auth.startsWith(bearer) ? auth.substring(bearer.length()) : auth;
+        EruptOpenApi eruptOpenApi = eruptDao.lambdaQuery(EruptOpenApi.class).eq(EruptOpenApi::getSecret, token).one();
+        if (null == eruptOpenApi) {
+            log.error("MCP authorization token error: {}", token);
+            return ResponseEntity.status(401).build();
+        } else {
+            MetaContext.getUser().setUid(eruptOpenApi.getEruptUser().getId());
+            MetaContext.getUser().setName(eruptOpenApi.getEruptUser().getName());
+            MetaContext.getUser().setAccount(eruptOpenApi.getEruptUser().getAccount());
+        }
         McpResult result = new McpResult();
         switch (request.getMethod()) {
             case "initialize" -> result.setResult(this.mcpInfo());
@@ -81,6 +107,7 @@ public ResponseEntity<?> call(@RequestBody McpRequest request) {
                     mcpCallResult.setContent(List.of(content));
                     result.setResult(mcpCallResult);
                 } catch (Exception e) {
+                    log.error("MCP call error [" + request.getParams().getName() + "]", e);
                     content.setText(e.getMessage());
                     mcpCallResult.setError(true);
                     mcpCallResult.setContent(List.of(content));
@@ -143,7 +170,7 @@ private String mcpCall(String code, Map<String, Object> params) {
         AiFunctionCall aiFunctionCall = AiFunctionManager.getAiFunctions().get(code);
         if (null != params) {
             for (Map.Entry<String, Object> entry : params.entrySet()) {
-                Field field = aiFunctionCall.getClass().getDeclaredField(entry.getKey());
+                Field field = ReflectUtil.findClassField(aiFunctionCall.getClass(), entry.getKey());
                 field.setAccessible(true);
                 field.set(aiFunctionCall, entry.getValue());
                 field.setAccessible(false);