topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-13 13:07:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(Chat) Return agent info after creating agent (#1272)

Browse Source 
Co-authored-by: lxwcodemonkey
This commit is contained in:
LXW
2024-06-28 19:15:36 +08:00
committed by GitHub
parent 5a052248dc
commit 5bcb76a1de
8 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
View File

@@ -28,21 +28,19 @@ public class AgentController {
private AgentService agentService; private AgentService agentService;
@PostMapping @PostMapping
public boolean createAgent(@RequestBody Agent agent, public Agent createAgent(@RequestBody Agent agent,
HttpServletRequest httpServletRequest, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) { HttpServletResponse httpServletResponse) {
User user = UserHolder.findUser(httpServletRequest, httpServletResponse); User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
agentService.createAgent(agent, user); return agentService.createAgent(agent, user);
return true;
} }
@PutMapping @PutMapping
public boolean updateAgent(@RequestBody Agent agent, public Agent updateAgent(@RequestBody Agent agent,
HttpServletRequest httpServletRequest, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) { HttpServletResponse httpServletResponse) {
User user = UserHolder.findUser(httpServletRequest, httpServletResponse); User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
agentService.updateAgent(agent, user); return agentService.updateAgent(agent, user);
return true;
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")

4
chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java
View File

@@ -8,9 +8,9 @@ public interface AgentService {
List<Agent> getAgents(); 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); Agent getAgent(Integer id);

8
chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java
View File

@@ -45,19 +45,21 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO>
} }
@Override @Override
public Integer createAgent(Agent agent, User user) { public Agent createAgent(Agent agent, User user) {
agent.createdBy(user.getName()); agent.createdBy(user.getName());
AgentDO agentDO = convert(agent); AgentDO agentDO = convert(agent);
save(agentDO); save(agentDO);
agent.setId(agentDO.getId());
executeAgentExamplesAsync(agent); executeAgentExamplesAsync(agent);
return agentDO.getId(); return agent;
} }
@Override @Override
public void updateAgent(Agent agent, User user) { public Agent updateAgent(Agent agent, User user) {
agent.updatedBy(user.getName()); agent.updatedBy(user.getName());
updateById(convert(agent)); updateById(convert(agent));
executeAgentExamplesAsync(agent); executeAgentExamplesAsync(agent);
return agent;
} }
@Override @Override

2
chat/server/src/main/java/com/tencent/supersonic/chat/server/util/LLMConnHelper.java
View File

@@ -18,7 +18,7 @@ public class LLMConnHelper {
String response = chatLanguageModel.generate("Hi there"); String response = chatLanguageModel.generate("Hi there");
return StringUtils.isNotEmpty(response) ? true : false; return StringUtils.isNotEmpty(response) ? true : false;
} catch (Exception e) { } catch (Exception e) {
log.warn("connect llm failed:", e); log.warn("connect to llm failed:", e);
throw new InvalidArgumentException(e.getMessage()); throw new InvalidArgumentException(e.getMessage());
} }
} }

5
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticSchema.java
View File

@@ -96,11 +96,6 @@ public class SemanticSchema implements Serializable {
return getElementsByDataSetId(dataSetId, metrics); return getElementsByDataSetId(dataSetId, metrics);
} }
public List<String> getMetricNames() {
return getMetrics().stream()
.map(SchemaElement::getName).collect(Collectors.toList());
}
public List<SchemaElement> getEntities() { public List<SchemaElement> getEntities() {
List<SchemaElement> entities = new ArrayList<>(); List<SchemaElement> entities = new ArrayList<>();
dataSetSchemaList.stream().forEach(d -> entities.add(d.getEntity())); dataSetSchemaList.stream().forEach(d -> entities.add(d.getEntity()));

3
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java
View File

@@ -221,8 +221,7 @@ public class S2ArtistDemo extends S2BaseDemo {
agentConfig.getTools().add(llmParserTool); agentConfig.getTools().add(llmParserTool);
} }
agent.setAgentConfig(JSONObject.toJSONString(agentConfig)); agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
int id = agentService.createAgent(agent, User.getFakeUser()); agentService.createAgent(agent, User.getFakeUser());
agent.setId(id);
} }
} }

5
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
View File

@@ -167,9 +167,8 @@ public class S2VisitsDemo extends S2BaseDemo {
agent.setAgentConfig(JSONObject.toJSONString(agentConfig)); agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
MultiTurnConfig multiTurnConfig = new MultiTurnConfig(false); MultiTurnConfig multiTurnConfig = new MultiTurnConfig(false);
agent.setMultiTurnConfig(multiTurnConfig); agent.setMultiTurnConfig(multiTurnConfig);
int id = agentService.createAgent(agent, User.getFakeUser()); Agent agentCreated = agentService.createAgent(agent, User.getFakeUser());
agent.setId(id); return agentCreated.getId();
return agent.getId();
} }
public DomainResp addDomain() { public DomainResp addDomain() {

3
launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
View File

@@ -24,7 +24,8 @@ public class Text2SQLEval extends BaseTest {
@BeforeAll @BeforeAll
public void init() { public void init() {
agentId = agentService.createAgent(getLLMAgent(false), DataUtils.getUser()); Agent agent = agentService.createAgent(getLLMAgent(false), DataUtils.getUser());
agentId = agent.getId();
} }
@Test @Test