Skip to content

Commit cb7ff5a

Browse files
davidkyledavidkyle
committed
Move org.elasticsearch.xpack.inference.external.SERVICE to
`org.elasticsearch.xpack.inference.service.SERVICE
1 parent 1f7e26c commit cb7ff5a

File tree

148 files changed

+174
-179
lines changed

Some content is hidden

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

148 files changed

+174
-179
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
import org.elasticsearch.xpack.inference.common.InferenceServiceRateLimitCalculator;
8484
import org.elasticsearch.xpack.inference.common.NoopNodeLocalRateLimitCalculator;
8585
import org.elasticsearch.xpack.inference.common.Truncator;
86-
import org.elasticsearch.xpack.inference.external.amazonbedrock.AmazonBedrockRequestSender;
8786
import org.elasticsearch.xpack.inference.external.http.HttpClientManager;
8887
import org.elasticsearch.xpack.inference.external.http.HttpSettings;
8988
import org.elasticsearch.xpack.inference.external.http.retry.RetrySettings;
@@ -116,6 +115,7 @@
116115
import org.elasticsearch.xpack.inference.services.ServiceComponents;
117116
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchService;
118117
import org.elasticsearch.xpack.inference.services.amazonbedrock.AmazonBedrockService;
118+
import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockRequestSender;
119119
import org.elasticsearch.xpack.inference.services.anthropic.AnthropicService;
120120
import org.elasticsearch.xpack.inference.services.azureaistudio.AzureAiStudioService;
121121
import org.elasticsearch.xpack.inference.services.azureopenai.AzureOpenAiService;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import org.elasticsearch.action.ActionListener;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.threadpool.ThreadPool;
15-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchAccount;
16-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
1715
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1816
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
1917
import org.elasticsearch.xpack.inference.external.request.alibabacloudsearch.completion.AlibabaCloudSearchCompletionRequest;
2018
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchCompletionResponseEntity;
19+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
20+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2121
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.completion.AlibabaCloudSearchCompletionModel;
2222

2323
import java.util.List;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.inference.InputType;
1515
import org.elasticsearch.threadpool.ThreadPool;
16-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchAccount;
17-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
1816
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1917
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
2018
import org.elasticsearch.xpack.inference.external.request.alibabacloudsearch.AlibabaCloudSearchEmbeddingsRequest;
2119
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchEmbeddingsResponseEntity;
20+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
21+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2222
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.embeddings.AlibabaCloudSearchEmbeddingsModel;
2323

2424
import java.util.List;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import org.elasticsearch.action.ActionListener;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.threadpool.ThreadPool;
15-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchAccount;
16-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
1715
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1816
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
1917
import org.elasticsearch.xpack.inference.external.request.alibabacloudsearch.AlibabaCloudSearchRerankRequest;
2018
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchRerankResponseEntity;
19+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
20+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2121
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.rerank.AlibabaCloudSearchRerankModel;
2222

2323
import java.util.Objects;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.inference.InputType;
1515
import org.elasticsearch.threadpool.ThreadPool;
16-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchAccount;
17-
import org.elasticsearch.xpack.inference.external.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
1816
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1917
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
2018
import org.elasticsearch.xpack.inference.external.request.alibabacloudsearch.AlibabaCloudSearchSparseRequest;
2119
import org.elasticsearch.xpack.inference.external.response.alibabacloudsearch.AlibabaCloudSearchSparseResponseEntity;
20+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchAccount;
21+
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.AlibabaCloudSearchResponseHandler;
2222
import org.elasticsearch.xpack.inference.services.alibabacloudsearch.sparse.AlibabaCloudSearchSparseModel;
2323

2424
import java.util.List;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/AmazonBedrockRequestExecutorService.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.http.sender;
99

1010
import org.elasticsearch.threadpool.ThreadPool;
11-
import org.elasticsearch.xpack.inference.external.amazonbedrock.AmazonBedrockExecuteOnlyRequestSender;
11+
import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockExecuteOnlyRequestSender;
1212

1313
import java.io.IOException;
1414
import java.util.concurrent.CountDownLatch;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.elasticsearch.action.ActionListener;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.threadpool.ThreadPool;
15-
import org.elasticsearch.xpack.inference.external.anthropic.AnthropicResponseHandler;
1615
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1716
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
1817
import org.elasticsearch.xpack.inference.external.request.anthropic.AnthropicChatCompletionRequest;
1918
import org.elasticsearch.xpack.inference.external.response.anthropic.AnthropicChatCompletionResponseEntity;
19+
import org.elasticsearch.xpack.inference.services.anthropic.AnthropicResponseHandler;
2020
import org.elasticsearch.xpack.inference.services.anthropic.completion.AnthropicChatCompletionModel;
2121

2222
import java.util.Objects;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/AnthropicRequestManager.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.http.sender;
99

1010
import org.elasticsearch.threadpool.ThreadPool;
11-
import org.elasticsearch.xpack.inference.external.anthropic.AnthropicAccount;
11+
import org.elasticsearch.xpack.inference.services.anthropic.AnthropicAccount;
1212
import org.elasticsearch.xpack.inference.services.anthropic.AnthropicModel;
1313

1414
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.elasticsearch.action.ActionListener;
1313
import org.elasticsearch.inference.InferenceServiceResults;
1414
import org.elasticsearch.threadpool.ThreadPool;
15-
import org.elasticsearch.xpack.inference.external.azureopenai.AzureOpenAiResponseHandler;
1615
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1716
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
1817
import org.elasticsearch.xpack.inference.external.request.azureopenai.AzureOpenAiCompletionRequest;
1918
import org.elasticsearch.xpack.inference.external.response.azureopenai.AzureOpenAiCompletionResponseEntity;
19+
import org.elasticsearch.xpack.inference.services.azureopenai.AzureOpenAiResponseHandler;
2020
import org.elasticsearch.xpack.inference.services.azureopenai.completion.AzureOpenAiCompletionModel;
2121

2222
import java.util.Objects;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import org.elasticsearch.inference.InputType;
1515
import org.elasticsearch.threadpool.ThreadPool;
1616
import org.elasticsearch.xpack.inference.common.Truncator;
17-
import org.elasticsearch.xpack.inference.external.azureopenai.AzureOpenAiResponseHandler;
1817
import org.elasticsearch.xpack.inference.external.http.retry.RequestSender;
1918
import org.elasticsearch.xpack.inference.external.http.retry.ResponseHandler;
20-
import org.elasticsearch.xpack.inference.external.openai.OpenAiEmbeddingsResponseEntity;
2119
import org.elasticsearch.xpack.inference.external.request.azureopenai.AzureOpenAiEmbeddingsRequest;
20+
import org.elasticsearch.xpack.inference.external.response.openai.OpenAiEmbeddingsResponseEntity;
21+
import org.elasticsearch.xpack.inference.services.azureopenai.AzureOpenAiResponseHandler;
2222
import org.elasticsearch.xpack.inference.services.azureopenai.embeddings.AzureOpenAiEmbeddingsModel;
2323

2424
import java.util.List;

0 commit comments

Comments
 (0)