Skip to content

Commit 69e44be

Browse files
weizijunweizijun
committed
rename mode_id to service_id
1 parent 3eedc36 commit 69e44be

14 files changed

+36
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public HttpRequest createHttpRequest() {
6565
HttpPost httpPost = new HttpPost(uri);
6666

6767
ByteArrayEntity byteEntity = new ByteArrayEntity(
68-
Strings.toString(new AlibabaCloudSearchEmbeddingsRequestEntity(input, taskSettings, model)).getBytes(StandardCharsets.UTF_8)
68+
Strings.toString(new AlibabaCloudSearchEmbeddingsRequestEntity(input, taskSettings)).getBytes(StandardCharsets.UTF_8)
6969
);
7070
httpPost.setEntity(byteEntity);
7171

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.inference.external.request.alibabacloudsearch;
99

10-
import org.elasticsearch.core.Nullable;
1110
import org.elasticsearch.inference.InputType;
1211
import org.elasticsearch.xcontent.ToXContentObject;
1312
import org.elasticsearch.xcontent.XContentBuilder;
@@ -19,11 +18,9 @@
1918

2019
import static org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsTaskSettings.invalidInputTypeMessage;
2120

22-
public record AlibabaCloudSearchEmbeddingsRequestEntity(
23-
List<String> input,
24-
AlibabaCloudSearchEmbeddingsTaskSettings taskSettings,
25-
@Nullable String model
26-
) implements ToXContentObject {
21+
public record AlibabaCloudSearchEmbeddingsRequestEntity(List<String> input, AlibabaCloudSearchEmbeddingsTaskSettings taskSettings)
22+
implements
23+
ToXContentObject {
2724

2825
private static final String SEARCH_DOCUMENT = "document";
2926
private static final String SEARCH_QUERY = "query";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public HttpRequest createHttpRequest() {
6767
HttpPost httpPost = new HttpPost(uri);
6868

6969
ByteArrayEntity byteEntity = new ByteArrayEntity(
70-
Strings.toString(new AlibabaCloudSearchRerankRequestEntity(query, input, taskSettings, model)).getBytes(StandardCharsets.UTF_8)
70+
Strings.toString(new AlibabaCloudSearchRerankRequestEntity(query, input, taskSettings)).getBytes(StandardCharsets.UTF_8)
7171
);
7272
httpPost.setEntity(byteEntity);
7373

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.inference.external.request.alibabacloudsearch;
99

10-
import org.elasticsearch.core.Nullable;
1110
import org.elasticsearch.xcontent.ToXContentObject;
1211
import org.elasticsearch.xcontent.XContentBuilder;
1312
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.rerank.AlibabaCloudSearchRerankTaskSettings;
@@ -16,12 +15,9 @@
1615
import java.util.List;
1716
import java.util.Objects;
1817

19-
public record AlibabaCloudSearchRerankRequestEntity(
20-
String query,
21-
List<String> input,
22-
AlibabaCloudSearchRerankTaskSettings taskSettings,
23-
@Nullable String model
24-
) implements ToXContentObject {
18+
public record AlibabaCloudSearchRerankRequestEntity(String query, List<String> input, AlibabaCloudSearchRerankTaskSettings taskSettings)
19+
implements
20+
ToXContentObject {
2521

2622
private static final String SEARCH_QUERY = "query";
2723
private static final String TEXTS_FIELD = "docs";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public HttpRequest createHttpRequest() {
6565
HttpPost httpPost = new HttpPost(uri);
6666

6767
ByteArrayEntity byteEntity = new ByteArrayEntity(
68-
Strings.toString(new AlibabaCloudSearchSparseRequestEntity(input, taskSettings, model)).getBytes(StandardCharsets.UTF_8)
68+
Strings.toString(new AlibabaCloudSearchSparseRequestEntity(input, taskSettings)).getBytes(StandardCharsets.UTF_8)
6969
);
7070
httpPost.setEntity(byteEntity);
7171

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.inference.external.request.alibabacloudsearch;
99

10-
import org.elasticsearch.core.Nullable;
1110
import org.elasticsearch.xcontent.ToXContentObject;
1211
import org.elasticsearch.xcontent.XContentBuilder;
1312
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.sparse.AlibabaCloudSearchSparseTaskSettings;
@@ -16,11 +15,9 @@
1615
import java.util.List;
1716
import java.util.Objects;
1817

19-
public record AlibabaCloudSearchSparseRequestEntity(
20-
List<String> input,
21-
AlibabaCloudSearchSparseTaskSettings taskSettings,
22-
@Nullable String model
23-
) implements ToXContentObject {
18+
public record AlibabaCloudSearchSparseRequestEntity(List<String> input, AlibabaCloudSearchSparseTaskSettings taskSettings)
19+
implements
20+
ToXContentObject {
2421

2522
private static final String TEXTS_FIELD = "input";
2623

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/AlibabaCloudSearchServiceSettings.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class AlibabaCloudSearchServiceSettings extends FilteredXContentObject
3939
AlibabaCloudSearchRateLimitServiceSettings {
4040

4141
public static final String NAME = "alibabacloud_search_service_settings";
42-
public static final String MODEL_ID = "service_id";
42+
public static final String SERVICE_ID = "service_id";
4343
public static final String HOST = "host";
4444
public static final String WORKSPACE_NAME = "workspace";
4545
public static final String HTTP_SCHEMA_NAME = "http_schema";
@@ -52,7 +52,7 @@ public static AlibabaCloudSearchServiceSettings fromMap(Map<String, Object> map,
5252
String url = extractOptionalString(map, URL, ModelConfigurations.SERVICE_SETTINGS, validationException);
5353

5454
URI uri = convertToUri(url, URL, ModelConfigurations.SERVICE_SETTINGS, validationException);
55-
String modelId = extractRequiredString(map, MODEL_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
55+
String modelId = extractRequiredString(map, SERVICE_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
5656
String host = extractRequiredString(map, HOST, ModelConfigurations.SERVICE_SETTINGS, validationException);
5757
var workspaceName = extractRequiredString(map, WORKSPACE_NAME, ModelConfigurations.SERVICE_SETTINGS, validationException);
5858
var httpSchema = extractOptionalString(map, HTTP_SCHEMA_NAME, ModelConfigurations.SERVICE_SETTINGS, validationException);
@@ -80,22 +80,22 @@ public static AlibabaCloudSearchServiceSettings fromMap(Map<String, Object> map,
8080
}
8181

8282
private final URI uri;
83-
private final String modelId;
83+
private final String serviceId;
8484
private final String host;
8585
private final String workspaceName;
8686
private final String httpSchema;
8787
private final RateLimitSettings rateLimitSettings;
8888

8989
public AlibabaCloudSearchServiceSettings(
9090
@Nullable URI uri,
91-
String modelId,
91+
String serviceId,
9292
String host,
9393
String workspaceName,
9494
@Nullable String httpSchema,
9595
@Nullable RateLimitSettings rateLimitSettings
9696
) {
9797
this.uri = uri;
98-
this.modelId = modelId;
98+
this.serviceId = serviceId;
9999
this.host = host;
100100
this.workspaceName = workspaceName;
101101
this.httpSchema = httpSchema;
@@ -104,7 +104,7 @@ public AlibabaCloudSearchServiceSettings(
104104

105105
public AlibabaCloudSearchServiceSettings(StreamInput in) throws IOException {
106106
uri = createOptionalUri(in.readOptionalString());
107-
modelId = in.readString();
107+
serviceId = in.readString();
108108
host = in.readString();
109109
workspaceName = in.readString();
110110
httpSchema = in.readOptionalString();
@@ -117,7 +117,7 @@ public URI getUri() {
117117

118118
@Override
119119
public String modelId() {
120-
return modelId;
120+
return serviceId;
121121
}
122122

123123
public String getHost() {
@@ -161,8 +161,8 @@ public XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder
161161
if (uri != null) {
162162
builder.field(URL, uri.toString());
163163
}
164-
if (modelId != null) {
165-
builder.field(MODEL_ID, modelId);
164+
if (serviceId != null) {
165+
builder.field(SERVICE_ID, serviceId);
166166
}
167167
builder.field(HOST, host);
168168
builder.field(WORKSPACE_NAME, workspaceName);
@@ -188,7 +188,7 @@ public TransportVersion getMinimalSupportedVersion() {
188188
public void writeTo(StreamOutput out) throws IOException {
189189
var uriToWrite = uri != null ? uri.toString() : null;
190190
out.writeOptionalString(uriToWrite);
191-
out.writeString(modelId);
191+
out.writeString(serviceId);
192192
out.writeString(host);
193193
out.writeString(workspaceName);
194194
out.writeOptionalString(httpSchema);
@@ -201,14 +201,14 @@ public boolean equals(Object o) {
201201
if (o == null || getClass() != o.getClass()) return false;
202202
AlibabaCloudSearchServiceSettings that = (AlibabaCloudSearchServiceSettings) o;
203203
return Objects.equals(uri, that.uri)
204-
&& Objects.equals(modelId, that.modelId)
204+
&& Objects.equals(serviceId, that.serviceId)
205205
&& Objects.equals(host, that.host)
206206
&& Objects.equals(workspaceName, that.workspaceName)
207207
&& Objects.equals(httpSchema, that.httpSchema);
208208
}
209209

210210
@Override
211211
public int hashCode() {
212-
return Objects.hash(uri, modelId, host, workspaceName, httpSchema);
212+
return Objects.hash(uri, serviceId, host, workspaceName, httpSchema);
213213
}
214214
}

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ public class AlibabaCloudSearchEmbeddingsRequestEntityTests extends ESTestCase {
2525
public void testXContent_WritesAllFields_WhenTheyAreDefined() throws IOException {
2626
var entity = new AlibabaCloudSearchEmbeddingsRequestEntity(
2727
List.of("abc"),
28-
new AlibabaCloudSearchEmbeddingsTaskSettings(InputType.INGEST),
29-
"model"
28+
new AlibabaCloudSearchEmbeddingsTaskSettings(InputType.INGEST)
3029
);
3130

3231
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
@@ -38,11 +37,7 @@ public void testXContent_WritesAllFields_WhenTheyAreDefined() throws IOException
3837
}
3938

4039
public void testXContent_WritesNoOptionalFields_WhenTheyAreNotDefined() throws IOException {
41-
var entity = new AlibabaCloudSearchEmbeddingsRequestEntity(
42-
List.of("abc"),
43-
AlibabaCloudSearchEmbeddingsTaskSettings.EMPTY_SETTINGS,
44-
null
45-
);
40+
var entity = new AlibabaCloudSearchEmbeddingsRequestEntity(List.of("abc"), AlibabaCloudSearchEmbeddingsTaskSettings.EMPTY_SETTINGS);
4641

4742
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
4843
entity.toXContent(builder, null);

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@
2222

2323
public class AlibabaCloudSearchRerankRequestEntityTests extends ESTestCase {
2424
public void testXContent_WritesAllFields_WhenTheyAreDefined() throws IOException {
25-
var entity = new AlibabaCloudSearchRerankRequestEntity(
26-
"query",
27-
List.of("abc"),
28-
new AlibabaCloudSearchRerankTaskSettings(),
29-
"model"
30-
);
25+
var entity = new AlibabaCloudSearchRerankRequestEntity("query", List.of("abc"), new AlibabaCloudSearchRerankTaskSettings());
3126

3227
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
3328
entity.toXContent(builder, null);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ public class AlibabaCloudSearchSparseRequestEntityTests extends ESTestCase {
2525
public void testXContent_WritesAllFields_WhenTheyAreDefined() throws IOException {
2626
var entity = new AlibabaCloudSearchSparseRequestEntity(
2727
List.of("abc"),
28-
new AlibabaCloudSearchSparseTaskSettings(InputType.INGEST, true),
29-
"model"
28+
new AlibabaCloudSearchSparseTaskSettings(InputType.INGEST, true)
3029
);
3130

3231
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
@@ -38,7 +37,7 @@ public void testXContent_WritesAllFields_WhenTheyAreDefined() throws IOException
3837
}
3938

4039
public void testXContent_WritesNoOptionalFields_WhenTheyAreNotDefined() throws IOException {
41-
var entity = new AlibabaCloudSearchSparseRequestEntity(List.of("abc"), AlibabaCloudSearchSparseTaskSettings.EMPTY_SETTINGS, null);
40+
var entity = new AlibabaCloudSearchSparseRequestEntity(List.of("abc"), AlibabaCloudSearchSparseTaskSettings.EMPTY_SETTINGS);
4241

4342
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
4443
entity.toXContent(builder, null);

0 commit comments

Comments
 (0)