Skip to content

Commit 869f19a

Browse files
authored
fix: Fix a universal OpenAI API (#252)
1 parent 0fd760c commit 869f19a

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

base/src/main/java/com/tinyengine/it/model/dto/ChatRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import lombok.Data;
1616

1717
import java.util.List;
18+
import java.util.Map;
1819

1920
/**
2021
* ChatRequest dto
@@ -27,6 +28,7 @@ public class ChatRequest {
2728
private String apiKey;
2829
private String baseUrl;
2930
private List<AiMessages> messages;
31+
private List<Map<String, Object>> tools;
3032
private Double temperature = 0.7;
3133
private boolean stream = false; // 流式开关
3234
}

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AiChatV1ServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ public class AiChatV1ServiceImpl implements AiChatV1Service {
5858
public Object chatCompletion(ChatRequest request) throws Exception {
5959
String requestBody = buildRequestBody(request);
6060
String apiKey = request.getApiKey() != null ? request.getApiKey() : config.getApiKey();
61+
String baseUrl = request.getBaseUrl() != null ? request.getBaseUrl() : config.getBaseUrl();
6162
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
62-
.uri(URI.create(request.getBaseUrl() != null ? request.getBaseUrl() : config.getBaseUrl()))
63+
.uri(URI.create(baseUrl))
6364
.header("Content-Type", "application/json")
6465
.header("Authorization", "Bearer " + apiKey)
6566
.POST(HttpRequest.BodyPublishers.ofString(requestBody));
@@ -78,6 +79,7 @@ private String buildRequestBody(ChatRequest request) throws JsonProcessingExcept
7879
body.put("messages", request.getMessages());
7980
body.put("temperature", request.getTemperature());
8081
body.put("stream", request.isStream());
82+
body.put("tools", request.getTools());
8183

8284
return JsonUtils.encode(body);
8385
}

0 commit comments

Comments
 (0)