Skip to content

Commit 5f63113

Browse files
Merge branch 'feat/ark_runtime_bot_api_hxc' into 'feat/ark_runtime_bot_api'
fix: 如果baseurl不以/结尾,就加上 See merge request iaasng/volcengine-java-sdk!192
2 parents 79eb4c3 + a49d813 commit 5f63113

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public interface ArkApi {
2323
@POST("/api/v3/chat/completions")
2424
Call<ResponseBody> createChatCompletionStream(@Body ChatCompletionRequest request, @Header(Const.REQUEST_MODEL) String model, @HeaderMap Map<String, String> customHeaders);
2525

26-
@POST("/api/v3/bot/{botId}/chat/completions")
27-
Single<BotChatCompletionResult> createBotChatCompletion(@Body BotChatCompletionRequest request, @Path(Const.REQUEST_BOT_ID) @Header(Const.REQUEST_BOT) String botId);
26+
@POST("/api/v3/bots/chat/completions")
27+
Single<BotChatCompletionResult> createBotChatCompletion(@Body BotChatCompletionRequest request, @Header(Const.REQUEST_BOT) String botId, @HeaderMap Map<String, String> customHeaders);
2828

2929
@Streaming
30-
@POST("/api/v3/bot/{botId}/chat/completions")
31-
Call<ResponseBody> createBotChatCompletionStream(@Body BotChatCompletionRequest request, @Path(Const.REQUEST_BOT_ID) @Header(Const.REQUEST_BOT) String botId);
30+
@POST("/api/v3/bots/chat/completions")
31+
Call<ResponseBody> createBotChatCompletionStream(@Body BotChatCompletionRequest request, @Header(Const.REQUEST_BOT) String botId, @HeaderMap Map<String, String> customHeaders);
3232

3333
@POST("/api/v3/embeddings")
3434
Single<EmbeddingResult> createEmbeddings(@Body EmbeddingRequest request, @Header(Const.REQUEST_MODEL) String model, @HeaderMap Map<String, String> customHeaders);

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ public EmbeddingResult createEmbeddings(EmbeddingRequest request, Map<String, St
186186

187187
@Override
188188
public BotChatCompletionResult createBotChatCompletion(BotChatCompletionRequest request) {
189-
return execute(api.createBotChatCompletion(request, request.getModel()));
189+
return execute(api.createBotChatCompletion(request, request.getModel(), new HashMap<>()));
190190
}
191191

192192
@Override
193193
public Flowable<ChatCompletionChunk> streamBotChatCompletion(BotChatCompletionRequest request) {
194194
request.setStream(true);
195-
return stream(api.createBotChatCompletionStream(request, request.getModel()), ChatCompletionChunk.class);
195+
return stream(api.createBotChatCompletionStream(request, request.getModel(), new HashMap<>()), ChatCompletionChunk.class);
196196
}
197197

198198
public void shutdownExecutor() {
@@ -235,6 +235,9 @@ public ArkService.Builder region(String region) {
235235

236236
public ArkService.Builder baseUrl(String baseUrl) {
237237
this.baseUrl = baseUrl;
238+
if (!baseUrl.endsWith("/")) {
239+
this.baseUrl = baseUrl + "/";
240+
}
238241
return this;
239242
}
240243

0 commit comments

Comments
 (0)