Skip to content

Commit 8cb27c0

Browse files
davidkyledavidkyle
committed
Move response classes
1 parent 93fb260 commit 8cb27c0

File tree

209 files changed

+291
-301
lines changed

Some content is hidden

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

209 files changed

+291
-301
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/RequestExecutorService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* attempting to execute a task (aka waiting for the connection manager to lease a connection). See
5656
* {@link org.apache.http.client.config.RequestConfig.Builder#setConnectionRequestTimeout} for more info.
5757
*/
58-
class RequestExecutorService implements RequestExecutor {
58+
public class RequestExecutorService implements RequestExecutor {
5959

6060
/**
6161
* Provides dependency injection mainly for testing
@@ -123,7 +123,7 @@ interface RateLimiterCreator {
123123
private final AtomicReference<Scheduler.Cancellable> cancellableCleanupTask = new AtomicReference<>();
124124
private final AtomicBoolean started = new AtomicBoolean(false);
125125

126-
RequestExecutorService(
126+
public RequestExecutorService(
127127
ThreadPool threadPool,
128128
@Nullable CountDownLatch startupLatch,
129129
RequestExecutorServiceSettings settings,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.elasticsearch.xpack.inference.external.http.retry.ResponseParser;
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.response.alibabacloudsearch.AlibabaCloudSearchErrorResponseEntity;
16+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.response.AlibabaCloudSearchErrorResponseEntity;
1717

1818
/**
1919
* Defines how to handle various errors returned from the AlibabaCloudSearch integration.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.elasticsearch.xpack.inference.external.http.sender.HttpRequestSender;
3636
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
3737
import org.elasticsearch.xpack.inference.external.http.sender.UnifiedChatInput;
38-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchUtils;
3938
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
4039
import org.elasticsearch.xpack.inference.services.SenderService;
4140
import org.elasticsearch.xpack.inference.services.ServiceComponents;
@@ -44,6 +43,7 @@
4443
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.completion.AlibabaCloudSearchCompletionModel;
4544
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsModel;
4645
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsServiceSettings;
46+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchUtils;
4747
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.rerank.AlibabaCloudSearchRerankModel;
4848
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.sparse.AlibabaCloudSearchSparseModel;
4949
import org.elasticsearch.xpack.inference.services.settings.DefaultSecretSettings;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
import org.elasticsearch.inference.InferenceServiceResults;
1717
import org.elasticsearch.rest.RestStatus;
1818
import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
19-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchCompletionRequestManager;
2019
import org.elasticsearch.xpack.inference.external.http.sender.ChatCompletionInput;
2120
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
2221
import org.elasticsearch.xpack.inference.external.http.sender.Sender;
2322
import org.elasticsearch.xpack.inference.services.ServiceComponents;
2423
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
2524
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.completion.AlibabaCloudSearchCompletionModel;
25+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchCompletionRequestManager;
2626

2727
import java.util.Objects;
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import org.elasticsearch.core.TimeValue;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
15-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchEmbeddingsRequestManager;
1615
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
1716
import org.elasticsearch.xpack.inference.external.http.sender.Sender;
1817
import org.elasticsearch.xpack.inference.services.ServiceComponents;
1918
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
2019
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsModel;
20+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchEmbeddingsRequestManager;
2121

2222
import java.util.Objects;
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import org.elasticsearch.core.TimeValue;
1515
import org.elasticsearch.inference.InferenceServiceResults;
1616
import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
17-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchRerankRequestManager;
1817
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
1918
import org.elasticsearch.xpack.inference.external.http.sender.Sender;
2019
import org.elasticsearch.xpack.inference.services.ServiceComponents;
2120
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
21+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchRerankRequestManager;
2222
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.rerank.AlibabaCloudSearchRerankModel;
2323

2424
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import org.elasticsearch.core.TimeValue;
1515
import org.elasticsearch.inference.InferenceServiceResults;
1616
import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
17-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchSparseRequestManager;
1817
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
1918
import org.elasticsearch.xpack.inference.external.http.sender.Sender;
2019
import org.elasticsearch.xpack.inference.services.ServiceComponents;
2120
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
21+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.AlibabaCloudSearchSparseRequestManager;
2222
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.sparse.AlibabaCloudSearchSparseModel;
2323

2424
import java.util.Objects;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import org.elasticsearch.xpack.inference.external.http.sender.ChatCompletionInput;
1818
import org.elasticsearch.xpack.inference.external.http.sender.ExecutableInferenceRequest;
1919
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
20-
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.completion.AlibabaCloudSearchCompletionRequest;
21-
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchCompletionResponseEntity;
2220
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
2321
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2422
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.completion.AlibabaCloudSearchCompletionModel;
23+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.request.completion.AlibabaCloudSearchCompletionRequest;
24+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.response.AlibabaCloudSearchCompletionResponseEntity;
2525

2626
import java.util.List;
2727
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import org.elasticsearch.xpack.inference.external.http.sender.EmbeddingsInput;
1919
import org.elasticsearch.xpack.inference.external.http.sender.ExecutableInferenceRequest;
2020
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
21-
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchEmbeddingsResponseEntity;
2221
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
2322
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2423
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsModel;
24+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.response.AlibabaCloudSearchEmbeddingsResponseEntity;
2525

2626
import java.util.List;
2727
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import org.elasticsearch.xpack.inference.external.http.sender.ExecutableInferenceRequest;
1818
import org.elasticsearch.xpack.inference.external.http.sender.InferenceInputs;
1919
import org.elasticsearch.xpack.inference.external.http.sender.QueryAndDocsInputs;
20-
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchRerankResponseEntity;
2120
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
2221
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2322
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.rerank.AlibabaCloudSearchRerankModel;
23+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.response.AlibabaCloudSearchRerankResponseEntity;
2424

2525
import java.util.Objects;
2626
import java.util.function.Supplier;

0 commit comments

Comments
 (0)