Skip to content

[FEL] remove apikey header while input apikey is null #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeCasterX merged 1 commit into from
Aug 21, 2025
Merged

[FEL] remove apikey header while input apikey is null #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ...munity/model-openai/src/main/java/modelengine/fel/community/model/openai/OpenAiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ public List<Embedding> generate(List<String> inputs, EmbedOption option) {
notBlank(option.model(), "The embed model name cannot be null.");
HttpClassicClientRequest request = this.httpClient.get()
.createRequest(HttpRequestMethod.POST, UrlUtils.combine(this.baseUrl, OpenAiApi.EMBEDDING_ENDPOINT));
HttpUtils.setBearerAuth(request, StringUtils.blankIf(option.apiKey(), this.defaultApiKey));
String actualApiKey = StringUtils.blankIf(option.apiKey(), this.defaultApiKey);
if (StringUtils.isNotBlank(actualApiKey)) {
HttpUtils.setBearerAuth(request, actualApiKey);
}
request.jsonEntity(new OpenAiEmbeddingRequest(inputs, option.model()));
Class<OpenAiEmbeddingResponse> clazz = OpenAiEmbeddingResponse.class;
try (HttpClassicClientResponse<OpenAiEmbeddingResponse> response = request.exchange(clazz)) {
Expand All @@ -151,7 +154,10 @@ public Choir<ChatMessage> generate(Prompt prompt, ChatOption chatOption) {
String modelSource = StringUtils.blankIf(chatOption.baseUrl(), this.baseUrl);
HttpClassicClientRequest request = this.getHttpClient(chatOption.secureConfig())
.createRequest(HttpRequestMethod.POST, UrlUtils.combine(modelSource, OpenAiApi.CHAT_ENDPOINT));
HttpUtils.setBearerAuth(request, StringUtils.blankIf(chatOption.apiKey(), this.defaultApiKey));
String actualApiKey = StringUtils.blankIf(chatOption.apiKey(), this.defaultApiKey);
if (StringUtils.isNotBlank(actualApiKey)) {
HttpUtils.setBearerAuth(request, actualApiKey);
}
request.jsonEntity(new OpenAiChatCompletionRequest(prompt, chatOption));
return chatOption.stream() ? this.createChatStream(request) : this.createChatCompletion(request);
}
Expand All @@ -163,7 +169,10 @@ public List<Media> generate(String prompt, ImageOption option) {
String modelSource = StringUtils.blankIf(option.baseUrl(), this.baseUrl);
HttpClassicClientRequest request = this.httpClient.get()
.createRequest(HttpRequestMethod.POST, UrlUtils.combine(modelSource, OpenAiApi.IMAGE_ENDPOINT));
HttpUtils.setBearerAuth(request, StringUtils.blankIf(option.apiKey(), this.defaultApiKey));
String actualApiKey = StringUtils.blankIf(option.apiKey(), this.defaultApiKey);
if (StringUtils.isNotBlank(actualApiKey)) {
HttpUtils.setBearerAuth(request, actualApiKey);
}
request.jsonEntity(new OpenAiImageRequest(option.model(), option.size(), prompt));
Class<OpenAiImageResponse> clazz = OpenAiImageResponse.class;
try (HttpClassicClientResponse<OpenAiImageResponse> response = request.exchange(clazz)) {
Expand All @@ -182,7 +191,10 @@ public List<MeasurableDocument> generate(List<MeasurableDocument> documents, Rer
String modelSource = StringUtils.blankIf(rerankOption.baseUri(), this.baseUrl);
HttpClassicClientRequest request = this.getHttpClient(rerankOption.secureConfig())
.createRequest(HttpRequestMethod.POST, UrlUtils.combine(modelSource, OpenAiApi.RERANK_ENDPOINT));
HttpUtils.setBearerAuth(request, StringUtils.blankIf(rerankOption.apiKey(), this.defaultApiKey));
String actualApiKey = StringUtils.blankIf(rerankOption.apiKey(), this.defaultApiKey);
if (StringUtils.isNotBlank(actualApiKey)) {
HttpUtils.setBearerAuth(request, actualApiKey);
}
List<String> docs = documents.stream().map(MeasurableDocument::text).collect(Collectors.toList());
OpenAiRerankRequest fields = new OpenAiRerankRequest(rerankOption, docs);
request.entity(Entity.createObject(request, fields));
Expand Down
2 changes: 1 addition & 1 deletion ...odel-openai/src/main/java/modelengine/fel/community/model/openai/config/OpenAiConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@AcceptConfigValues("fel.openai")
public class OpenAiConfig {
private String apiBase = "https://api.openai.com/v1/";
private String apiKey = "EMPTY";
private String apiKey = "";
private int connectTimeout = 30000;
private int readTimeout = 30000;

Expand Down