Skip to content

Commit 092cf74

Browse files
davidkyledavidkyle
committed
Move request classes
1 parent 450516d commit 092cf74

File tree

252 files changed

+334
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+334
-337
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.elasticsearch.xcontent.XContentType;
1919
import org.elasticsearch.xpack.inference.external.http.HttpResult;
2020
import org.elasticsearch.xpack.inference.external.request.Request;
21-
import org.elasticsearch.xpack.inference.external.request.alibabacloudsearch.AlibabaCloudSearchRequest;
21+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchRequest;
2222

2323
import java.io.IOException;
2424
import java.util.Map;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/AmazonBedrockResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package org.elasticsearch.xpack.inference.external.response.amazonbedrock;
99

1010
import org.elasticsearch.inference.InferenceServiceResults;
11-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
11+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
1212

1313
public abstract class AmazonBedrockResponse {
1414
public abstract InferenceServiceResults accept(AmazonBedrockRequest request);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/AmazonBedrockResponseListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import org.elasticsearch.action.ActionListener;
1111
import org.elasticsearch.inference.InferenceServiceResults;
12-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
12+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
1313

1414
import java.util.Objects;
1515

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/completion/AmazonBedrockChatCompletionResponse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.elasticsearch.ElasticsearchException;
1414
import org.elasticsearch.inference.InferenceServiceResults;
1515
import org.elasticsearch.xpack.core.inference.results.ChatCompletionResults;
16-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
17-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.completion.AmazonBedrockChatCompletionRequest;
1816
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponse;
17+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
18+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.completion.AmazonBedrockChatCompletionRequest;
1919

2020
public class AmazonBedrockChatCompletionResponse extends AmazonBedrockResponse {
2121

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/completion/AmazonBedrockChatCompletionResponseHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.elasticsearch.xpack.inference.external.http.HttpResult;
1414
import org.elasticsearch.xpack.inference.external.http.retry.RetryException;
1515
import org.elasticsearch.xpack.inference.external.request.Request;
16-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
1716
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseHandler;
17+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
1818

1919
public class AmazonBedrockChatCompletionResponseHandler extends AmazonBedrockResponseHandler {
2020

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/completion/AmazonBedrockChatCompletionResponseListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.elasticsearch.action.ActionListener;
1414
import org.elasticsearch.inference.InferenceServiceResults;
1515
import org.elasticsearch.xpack.inference.external.http.HttpResult;
16-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.completion.AmazonBedrockChatCompletionRequest;
1716
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseHandler;
1817
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseListener;
18+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.completion.AmazonBedrockChatCompletionRequest;
1919

2020
public class AmazonBedrockChatCompletionResponseListener extends AmazonBedrockResponseListener implements ActionListener<ConverseResponse> {
2121

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/embeddings/AmazonBedrockEmbeddingsResponse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import org.elasticsearch.xcontent.XContentParserConfiguration;
1818
import org.elasticsearch.xcontent.XContentType;
1919
import org.elasticsearch.xpack.core.inference.results.TextEmbeddingFloatResults;
20-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
21-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.embeddings.AmazonBedrockEmbeddingsRequest;
2220
import org.elasticsearch.xpack.inference.external.response.XContentUtils;
2321
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponse;
2422
import org.elasticsearch.xpack.inference.services.amazonbedrock.AmazonBedrockProvider;
23+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
24+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.embeddings.AmazonBedrockEmbeddingsRequest;
2525

2626
import java.io.IOException;
2727
import java.nio.charset.StandardCharsets;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/embeddings/AmazonBedrockEmbeddingsResponseHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.elasticsearch.xpack.inference.external.http.HttpResult;
1414
import org.elasticsearch.xpack.inference.external.http.retry.RetryException;
1515
import org.elasticsearch.xpack.inference.external.request.Request;
16-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.AmazonBedrockRequest;
1716
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseHandler;
17+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.AmazonBedrockRequest;
1818

1919
public class AmazonBedrockEmbeddingsResponseHandler extends AmazonBedrockResponseHandler {
2020

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/amazonbedrock/embeddings/AmazonBedrockEmbeddingsResponseListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import org.elasticsearch.action.ActionListener;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.xpack.inference.external.http.HttpResult;
15-
import org.elasticsearch.xpack.inference.external.request.amazonbedrock.embeddings.AmazonBedrockEmbeddingsRequest;
1615
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseHandler;
1716
import org.elasticsearch.xpack.inference.external.response.amazonbedrock.AmazonBedrockResponseListener;
17+
import org.elasticsearch.xpack.inference.services.amazonbedrock.request.embeddings.AmazonBedrockEmbeddingsRequest;
1818

1919
public class AmazonBedrockEmbeddingsResponseListener extends AmazonBedrockResponseListener implements ActionListener<InvokeModelResponse> {
2020

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/azureaistudio/AzureAiStudioChatCompletionResponseEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import org.elasticsearch.xpack.core.inference.results.ChatCompletionResults;
1717
import org.elasticsearch.xpack.inference.external.http.HttpResult;
1818
import org.elasticsearch.xpack.inference.external.request.Request;
19-
import org.elasticsearch.xpack.inference.external.request.azureaistudio.AzureAiStudioChatCompletionRequest;
2019
import org.elasticsearch.xpack.inference.external.response.BaseResponseEntity;
2120
import org.elasticsearch.xpack.inference.external.response.openai.OpenAiChatCompletionResponseEntity;
21+
import org.elasticsearch.xpack.inference.services.azureaistudio.request.AzureAiStudioChatCompletionRequest;
2222

2323
import java.io.IOException;
2424
import java.util.List;

0 commit comments

Comments
 (0)