Commit c9330a1b authored by zhouwei's avatar zhouwei

Merge branch 'dev' into 'master'

支持千问

See merge request !18
parents 2beace54 eebe79e3
...@@ -8,5 +8,6 @@ import java.util.List; ...@@ -8,5 +8,6 @@ import java.util.List;
public class ChatInputData { public class ChatInputData {
private String model; private String model;
private Boolean stream = false; private Boolean stream = false;
private Boolean enable_thinking = false;
private List<Message> messages; private List<Message> messages;
} }
...@@ -147,6 +147,7 @@ public class AIServiceImpl implements AIService { ...@@ -147,6 +147,7 @@ public class AIServiceImpl implements AIService {
private final static ObjectMapper objectMapper = new ObjectMapper(); private final static ObjectMapper objectMapper = new ObjectMapper();
// private final static String DEEP_SEEK_URL = "https://api.deepseek.com/chat/completions"; // private final static String DEEP_SEEK_URL = "https://api.deepseek.com/chat/completions";
private final static String DEEP_SEEK_URL = "https://ark.cn-beijing.volces.com/api/v3/chat/completions"; private final static String DEEP_SEEK_URL = "https://ark.cn-beijing.volces.com/api/v3/chat/completions";
private final static String QWEN = "https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions";
@Override @Override
public AIResponse<String> translate(AIRequestDTO AIRequestDTO, String requestId) { public AIResponse<String> translate(AIRequestDTO AIRequestDTO, String requestId) {
...@@ -688,7 +689,13 @@ public class AIServiceImpl implements AIService { ...@@ -688,7 +689,13 @@ public class AIServiceImpl implements AIService {
log.info("json:{}", writeValueAsString); log.info("json:{}", writeValueAsString);
HttpEntity header = getHeader(apiKey); HttpEntity header = getHeader(apiKey);
HttpEntity<String> entity = new HttpEntity<>(writeValueAsString, header.getHeaders()); HttpEntity<String> entity = new HttpEntity<>(writeValueAsString, header.getHeaders());
ResponseEntity<ChatCompletionResponse> response = restTemplate.postForEntity(DEEP_SEEK_URL, entity, ChatCompletionResponse.class); ResponseEntity<ChatCompletionResponse> response;
if(chatInputData.getModel().startsWith("qwen")){
response = restTemplate.postForEntity(QWEN, entity, ChatCompletionResponse.class);
}else {
response = restTemplate.postForEntity(DEEP_SEEK_URL, entity, ChatCompletionResponse.class);
}
if (response.getStatusCode().is2xxSuccessful()) { if (response.getStatusCode().is2xxSuccessful()) {
log.info("ai response:{}",JSONObject.toJSONString(response.getBody())); log.info("ai response:{}",JSONObject.toJSONString(response.getBody()));
return response.getBody(); return response.getBody();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment