Moved inference action to server

carlosdelest · Oct 19, 2023 · aea7c5a · aea7c5a
1 parent 588fed7
commit aea7c5a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 6 deletions.
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -134,6 +134,7 @@
     exports org.elasticsearch.action.fieldcaps;
     exports org.elasticsearch.action.get;
     exports org.elasticsearch.action.index;
+    exports org.elasticsearch.action.inference;
     exports org.elasticsearch.action.ingest;
     exports org.elasticsearch.action.resync;
     exports org.elasticsearch.action.search;

diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
@@ -271,13 +271,15 @@ protected void doInternalExecute(Task task, BulkRequest bulkRequest, String exec
         final AtomicArray<BulkItemResponse> responses = new AtomicArray<>(bulkRequest.requests.size());
 
         boolean hasIndexRequestsWithPipelines = false;
+        boolean hasInferenceFields = false;
         final Metadata metadata = clusterService.state().getMetadata();
         final Version minNodeVersion = clusterService.state().getNodes().getMinNodeVersion();
         for (DocWriteRequest<?> actionRequest : bulkRequest.requests) {
             IndexRequest indexRequest = getIndexWriteRequest(actionRequest);
             if (indexRequest != null) {
                 IngestService.resolvePipelinesAndUpdateIndexRequest(actionRequest, indexRequest, metadata);
                 hasIndexRequestsWithPipelines |= IngestService.hasPipeline(indexRequest);
+                hasInferenceFields |= ingestService.hasInferenceFields(indexRequest);
             }
 
             if (actionRequest instanceof IndexRequest ir) {
@@ -288,7 +290,7 @@ protected void doInternalExecute(Task task, BulkRequest bulkRequest, String exec
             }
         }
 
-        if (hasIndexRequestsWithPipelines) {
+        if (hasIndexRequestsWithPipelines || hasInferenceFields) {
             // this method (doExecute) will be called again, but with the bulk requests updated from the ingest node processing but
             // also with IngestService.NOOP_PIPELINE_NAME on each request. This ensures that this on the second time through this method,
             // this path is never taken.

diff --git a/...ack/inference/action/InferenceAction.java → ...rch/action/inference/InferenceAction.java b/...ack/inference/action/InferenceAction.java → ...rch/action/inference/InferenceAction.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.inference.action;
+package org.elasticsearch.action.inference;
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionRequest;

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java
@@ -23,6 +23,7 @@
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
+import org.elasticsearch.index.mapper.TextFieldMapper;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.ValueFetcher;
 import org.elasticsearch.index.query.SearchExecutionContext;
@@ -81,7 +82,7 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
         }
 
         return new Builder(n);
-    }, notInMultiFields(CONTENT_TYPE));
+    }, notInMultiFieldsUlessParentOfType(CONTENT_TYPE, TextFieldMapper.CONTENT_TYPE)); // TODO Change for semantic_text field type
 
     public static final class SparseVectorFieldType extends MappedFieldType {
 

diff --git a/...lusterTest/java/org/elasticsearch/xpack/inference/integration/MockInferenceServiceIT.java b/...lusterTest/java/org/elasticsearch/xpack/inference/integration/MockInferenceServiceIT.java
@@ -24,7 +24,7 @@
 import org.elasticsearch.xpack.core.ml.inference.results.TextExpansionResults;
 import org.elasticsearch.xpack.inference.InferencePlugin;
 import org.elasticsearch.xpack.inference.action.GetInferenceModelAction;
-import org.elasticsearch.xpack.inference.action.InferenceAction;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.xpack.inference.action.PutInferenceModelAction;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 import org.junit.Before;

diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java
@@ -44,7 +44,7 @@
 import org.elasticsearch.xpack.core.ClientHelper;
 import org.elasticsearch.xpack.inference.action.DeleteInferenceModelAction;
 import org.elasticsearch.xpack.inference.action.GetInferenceModelAction;
-import org.elasticsearch.xpack.inference.action.InferenceAction;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.xpack.inference.action.PutInferenceModelAction;
 import org.elasticsearch.xpack.inference.action.TransportDeleteInferenceModelAction;
 import org.elasticsearch.xpack.inference.action.TransportGetInferenceModelAction;

diff --git a/...ence/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceAction.java b/...ence/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceAction.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.common.inject.Inject;

diff --git a/...n/inference/src/main/java/org/elasticsearch/xpack/inference/rest/RestInferenceAction.java b/...n/inference/src/main/java/org/elasticsearch/xpack/inference/rest/RestInferenceAction.java
@@ -11,7 +11,7 @@
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.action.RestToXContentListener;
-import org.elasticsearch.xpack.inference.action.InferenceAction;
+import org.elasticsearch.action.inference.InferenceAction;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...e/src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionRequestTests.java b/...e/src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionRequestTests.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.inference.action;
 
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.inference.TaskType;

diff --git a/.../src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionResponseTests.java b/.../src/test/java/org/elasticsearch/xpack/inference/action/InferenceActionResponseTests.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.inference.action;
 
+import org.elasticsearch.action.inference.InferenceAction;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;