diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
index 5119a2925..4870dae1f 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
@@ -28,21 +28,19 @@ public class AgentController {
     private AgentService agentService;
 
     @PostMapping
-    public boolean createAgent(@RequestBody Agent agent,
+    public Agent createAgent(@RequestBody Agent agent,
                                 HttpServletRequest httpServletRequest,
                                 HttpServletResponse httpServletResponse) {
         User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        agentService.createAgent(agent, user);
-        return true;
+        return agentService.createAgent(agent, user);
     }
 
     @PutMapping
-    public boolean updateAgent(@RequestBody Agent agent,
+    public Agent updateAgent(@RequestBody Agent agent,
                                 HttpServletRequest httpServletRequest,
                                 HttpServletResponse httpServletResponse) {
         User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        agentService.updateAgent(agent, user);
-        return true;
+        return agentService.updateAgent(agent, user);
     }
 
     @DeleteMapping("/{id}")
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java
index 61c79ea3a..c44a87dee 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java
@@ -8,9 +8,9 @@ public interface AgentService {
 
     List<Agent> getAgents();
 
-    Integer createAgent(Agent agent, User user);
+    Agent createAgent(Agent agent, User user);
 
-    void updateAgent(Agent agent, User user);
+    Agent updateAgent(Agent agent, User user);
 
     Agent getAgent(Integer id);
 
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java
index c56735f6a..e9fe0b3e6 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java
@@ -45,19 +45,21 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO>
     }
 
     @Override
-    public Integer createAgent(Agent agent, User user) {
+    public Agent createAgent(Agent agent, User user) {
         agent.createdBy(user.getName());
         AgentDO agentDO = convert(agent);
         save(agentDO);
+        agent.setId(agentDO.getId());
         executeAgentExamplesAsync(agent);
-        return agentDO.getId();
+        return agent;
     }
 
     @Override
-    public void updateAgent(Agent agent, User user) {
+    public Agent updateAgent(Agent agent, User user) {
         agent.updatedBy(user.getName());
         updateById(convert(agent));
         executeAgentExamplesAsync(agent);
+        return agent;
     }
 
     @Override
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/LLMConnHelper.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/LLMConnHelper.java
index 5b78affb3..784138d3a 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/LLMConnHelper.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/LLMConnHelper.java
@@ -18,7 +18,7 @@ public class LLMConnHelper {
             String response = chatLanguageModel.generate("Hi there");
             return StringUtils.isNotEmpty(response) ? true : false;
         } catch (Exception e) {
-            log.warn("connect llm failed:", e);
+            log.warn("connect to llm failed:", e);
             throw new InvalidArgumentException(e.getMessage());
         }
     }
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticSchema.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticSchema.java
index db1adb885..6f3eb77df 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticSchema.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticSchema.java
@@ -96,11 +96,6 @@ public class SemanticSchema implements Serializable {
         return getElementsByDataSetId(dataSetId, metrics);
     }
 
-    public List<String> getMetricNames() {
-        return getMetrics().stream()
-                .map(SchemaElement::getName).collect(Collectors.toList());
-    }
-
     public List<SchemaElement> getEntities() {
         List<SchemaElement> entities = new ArrayList<>();
         dataSetSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java
index a38765b20..e84ba7abf 100644
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java
@@ -221,8 +221,7 @@ public class S2ArtistDemo extends S2BaseDemo {
             agentConfig.getTools().add(llmParserTool);
         }
         agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
-        int id = agentService.createAgent(agent, User.getFakeUser());
-        agent.setId(id);
+        agentService.createAgent(agent, User.getFakeUser());
     }
 
 }
diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
index 5bce0a209..9bd05713d 100644
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
@@ -167,9 +167,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
         MultiTurnConfig multiTurnConfig = new MultiTurnConfig(false);
         agent.setMultiTurnConfig(multiTurnConfig);
-        int id = agentService.createAgent(agent, User.getFakeUser());
-        agent.setId(id);
-        return agent.getId();
+        Agent agentCreated = agentService.createAgent(agent, User.getFakeUser());
+        return agentCreated.getId();
     }
 
     public DomainResp addDomain() {
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
index 2f0e39e2d..145f67125 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
@@ -24,7 +24,8 @@ public class Text2SQLEval extends BaseTest {
 
     @BeforeAll
     public void init() {
-        agentId = agentService.createAgent(getLLMAgent(false), DataUtils.getUser());
+        Agent agent = agentService.createAgent(getLLMAgent(false), DataUtils.getUser());
+        agentId = agent.getId();
     }
 
     @Test