Skip to content

Commit e4c8ad8

Browse files
jonathan-buttnerjonathan-buttner
committed
Removing OpenAiAccount
1 parent b850e1a commit e4c8ad8

File tree

8 files changed

+18
-71
lines changed

8 files changed

+18
-71
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/openai/OpenAiAccount.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiEmbeddingsRequest.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@
99

1010
import org.apache.http.HttpHeaders;
1111
import org.apache.http.client.methods.HttpPost;
12-
import org.apache.http.client.utils.URIBuilder;
1312
import org.apache.http.entity.ByteArrayEntity;
1413
import org.elasticsearch.common.Strings;
1514
import org.elasticsearch.xcontent.XContentType;
1615
import org.elasticsearch.xpack.inference.common.Truncator;
17-
import org.elasticsearch.xpack.inference.external.openai.OpenAiAccount;
1816
import org.elasticsearch.xpack.inference.external.request.HttpRequest;
1917
import org.elasticsearch.xpack.inference.external.request.Request;
2018
import org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsModel;
2119

2220
import java.net.URI;
23-
import java.net.URISyntaxException;
2421
import java.nio.charset.StandardCharsets;
2522
import java.util.Objects;
2623

@@ -30,19 +27,17 @@
3027
public class OpenAiEmbeddingsRequest implements Request {
3128

3229
private final Truncator truncator;
33-
private final OpenAiAccount account;
3430
private final Truncator.TruncationResult truncationResult;
3531
private final OpenAiEmbeddingsModel model;
3632

3733
public OpenAiEmbeddingsRequest(Truncator truncator, Truncator.TruncationResult input, OpenAiEmbeddingsModel model) {
3834
this.truncator = Objects.requireNonNull(truncator);
39-
this.account = OpenAiAccount.of(model, OpenAiEmbeddingsRequest::buildDefaultUri);
4035
this.truncationResult = Objects.requireNonNull(input);
4136
this.model = Objects.requireNonNull(model);
4237
}
4338

4439
public HttpRequest createHttpRequest() {
45-
HttpPost httpPost = new HttpPost(account.uri());
40+
HttpPost httpPost = new HttpPost(model.uri());
4641

4742
ByteArrayEntity byteEntity = new ByteArrayEntity(
4843
Strings.toString(
@@ -58,9 +53,9 @@ public HttpRequest createHttpRequest() {
5853
httpPost.setEntity(byteEntity);
5954

6055
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaType());
61-
httpPost.setHeader(createAuthBearerHeader(account.apiKey()));
56+
httpPost.setHeader(createAuthBearerHeader(model.apiKey()));
6257

63-
var org = account.organizationId();
58+
var org = model.rateLimitServiceSettings().organizationId();
6459
if (org != null) {
6560
httpPost.setHeader(createOrgHeader(org));
6661
}
@@ -75,7 +70,7 @@ public String getInferenceEntityId() {
7570

7671
@Override
7772
public URI getURI() {
78-
return account.uri();
73+
return model.uri();
7974
}
8075

8176
@Override
@@ -89,11 +84,4 @@ public Request truncate() {
8984
public boolean[] getTruncationInfo() {
9085
return truncationResult.truncated().clone();
9186
}
92-
93-
public static URI buildDefaultUri() throws URISyntaxException {
94-
return new URIBuilder().setScheme("https")
95-
.setHost(OpenAiUtils.HOST)
96-
.setPathSegments(OpenAiUtils.VERSION_1, OpenAiUtils.EMBEDDINGS_PATH)
97-
.build();
98-
}
9987
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiUnifiedChatCompletionRequest.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@
99

1010
import org.apache.http.HttpHeaders;
1111
import org.apache.http.client.methods.HttpPost;
12-
import org.apache.http.client.utils.URIBuilder;
1312
import org.apache.http.entity.ByteArrayEntity;
1413
import org.elasticsearch.common.Strings;
1514
import org.elasticsearch.xcontent.XContentType;
1615
import org.elasticsearch.xpack.inference.external.http.sender.UnifiedChatInput;
17-
import org.elasticsearch.xpack.inference.external.openai.OpenAiAccount;
1816
import org.elasticsearch.xpack.inference.external.request.HttpRequest;
1917
import org.elasticsearch.xpack.inference.external.request.Request;
2018
import org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionModel;
2119

2220
import java.net.URI;
23-
import java.net.URISyntaxException;
2421
import java.nio.charset.StandardCharsets;
2522
import java.util.Objects;
2623

@@ -29,29 +26,27 @@
2926

3027
public class OpenAiUnifiedChatCompletionRequest implements Request {
3128

32-
private final OpenAiAccount account;
3329
private final OpenAiChatCompletionModel model;
3430
private final UnifiedChatInput unifiedChatInput;
3531

3632
public OpenAiUnifiedChatCompletionRequest(UnifiedChatInput unifiedChatInput, OpenAiChatCompletionModel model) {
37-
this.account = OpenAiAccount.of(model, OpenAiUnifiedChatCompletionRequest::buildDefaultUri);
3833
this.unifiedChatInput = Objects.requireNonNull(unifiedChatInput);
3934
this.model = Objects.requireNonNull(model);
4035
}
4136

4237
@Override
4338
public HttpRequest createHttpRequest() {
44-
HttpPost httpPost = new HttpPost(account.uri());
39+
HttpPost httpPost = new HttpPost(model.uri());
4540

4641
ByteArrayEntity byteEntity = new ByteArrayEntity(
4742
Strings.toString(new OpenAiUnifiedChatCompletionRequestEntity(unifiedChatInput, model)).getBytes(StandardCharsets.UTF_8)
4843
);
4944
httpPost.setEntity(byteEntity);
5045

5146
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaType());
52-
httpPost.setHeader(createAuthBearerHeader(account.apiKey()));
47+
httpPost.setHeader(createAuthBearerHeader(model.apiKey()));
5348

54-
var org = account.organizationId();
49+
var org = model.rateLimitServiceSettings().organizationId();
5550
if (org != null) {
5651
httpPost.setHeader(createOrgHeader(org));
5752
}
@@ -61,7 +56,7 @@ public HttpRequest createHttpRequest() {
6156

6257
@Override
6358
public URI getURI() {
64-
return account.uri();
59+
return model.uri();
6560
}
6661

6762
@Override
@@ -85,11 +80,4 @@ public String getInferenceEntityId() {
8580
public boolean isStreaming() {
8681
return unifiedChatInput.stream();
8782
}
88-
89-
public static URI buildDefaultUri() throws URISyntaxException {
90-
return new URIBuilder().setScheme("https")
91-
.setHost(OpenAiUtils.HOST)
92-
.setPathSegments(OpenAiUtils.VERSION_1, OpenAiUtils.CHAT_PATH, OpenAiUtils.COMPLETIONS_PATH)
93-
.build();
94-
}
9583
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/OpenAiModel.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,8 @@ public int rateLimitGroupingHash() {
7777
public RateLimitSettings rateLimitSettings() {
7878
return rateLimitServiceSettings.rateLimitSettings();
7979
}
80+
81+
public URI uri() {
82+
return uri;
83+
}
8084
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public OpenAiChatCompletionModel(
9595
);
9696
}
9797

98-
private static URI buildDefaultUri() throws URISyntaxException {
98+
public static URI buildDefaultUri() throws URISyntaxException {
9999
return new URIBuilder().setScheme("https")
100100
.setHost(OpenAiUtils.HOST)
101101
.setPathSegments(OpenAiUtils.VERSION_1, OpenAiUtils.CHAT_PATH, OpenAiUtils.COMPLETIONS_PATH)

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public OpenAiEmbeddingsModel(
7878
);
7979
}
8080

81-
private static URI buildDefaultUri() throws URISyntaxException {
81+
public static URI buildDefaultUri() throws URISyntaxException {
8282
return new URIBuilder().setScheme("https")
8383
.setHost(OpenAiUtils.HOST)
8484
.setPathSegments(OpenAiUtils.VERSION_1, OpenAiUtils.EMBEDDINGS_PATH)

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiEmbeddingsRequestTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.List;
2222

2323
import static org.elasticsearch.xpack.inference.external.http.Utils.entityAsMap;
24-
import static org.elasticsearch.xpack.inference.external.request.openai.OpenAiEmbeddingsRequest.buildDefaultUri;
2524
import static org.elasticsearch.xpack.inference.external.request.openai.OpenAiUtils.ORGANIZATION_HEADER;
25+
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsModel.buildDefaultUri;
2626
import static org.hamcrest.Matchers.aMapWithSize;
2727
import static org.hamcrest.Matchers.instanceOf;
2828
import static org.hamcrest.Matchers.is;

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiUnifiedChatCompletionRequestTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.Map;
2222

2323
import static org.elasticsearch.xpack.inference.external.http.Utils.entityAsMap;
24-
import static org.elasticsearch.xpack.inference.external.request.openai.OpenAiUnifiedChatCompletionRequest.buildDefaultUri;
2524
import static org.elasticsearch.xpack.inference.external.request.openai.OpenAiUtils.ORGANIZATION_HEADER;
25+
import static org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionModel.buildDefaultUri;
2626
import static org.hamcrest.Matchers.aMapWithSize;
2727
import static org.hamcrest.Matchers.instanceOf;
2828
import static org.hamcrest.Matchers.is;
@@ -85,7 +85,7 @@ public void testCreateRequest_WithDefaultUrlAndWithoutUserOrganization() throws
8585
assertThat(httpRequest.httpRequestBase(), instanceOf(HttpPost.class));
8686
var httpPost = (HttpPost) httpRequest.httpRequestBase();
8787

88-
assertThat(httpPost.getURI().toString(), is(OpenAiUnifiedChatCompletionRequest.buildDefaultUri().toString()));
88+
assertThat(httpPost.getURI().toString(), is(buildDefaultUri().toString()));
8989
assertThat(httpPost.getLastHeader(HttpHeaders.CONTENT_TYPE).getValue(), is(XContentType.JSON.mediaType()));
9090
assertThat(httpPost.getLastHeader(HttpHeaders.AUTHORIZATION).getValue(), is("Bearer secret"));
9191
assertNull(httpPost.getLastHeader(ORGANIZATION_HEADER));
@@ -108,7 +108,7 @@ public void testCreateRequest_WithStreaming() throws IOException {
108108
public void testTruncate_DoesNotReduceInputTextSize() throws URISyntaxException, IOException {
109109
var request = createRequest(null, null, "secret", "abcd", "model", null, true);
110110
var truncatedRequest = request.truncate();
111-
assertThat(request.getURI().toString(), is(OpenAiUnifiedChatCompletionRequest.buildDefaultUri().toString()));
111+
assertThat(request.getURI().toString(), is(buildDefaultUri().toString()));
112112

113113
var httpRequest = truncatedRequest.createHttpRequest();
114114
assertThat(httpRequest.httpRequestBase(), instanceOf(HttpPost.class));

0 commit comments

Comments
 (0)