[ML] Make _inference APIs available in serverless

Allow the `_inference` APIs to be called from outside the Elasticsearch cluster in serverless. The client annotations still need updating so that the clients know the APIs exist. But that cannot happen until the APIs themselves are visible, so this first step makes that happen.
droberts195 · Feb 6, 2024 · 3779675 · 3779675
1 parent ff0f83f
commit 3779675
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.../src/main/java/org/elasticsearch/xpack/inference/rest/RestDeleteInferenceModelAction.java b/.../src/main/java/org/elasticsearch/xpack/inference/rest/RestDeleteInferenceModelAction.java
@@ -10,13 +10,16 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.xpack.core.inference.action.DeleteInferenceModelAction;
 
 import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.DELETE;
 
+@ServerlessScope(Scope.PUBLIC)
 public class RestDeleteInferenceModelAction extends BaseRestHandler {
     @Override
     public String getName() {

diff --git a/...nce/src/main/java/org/elasticsearch/xpack/inference/rest/RestGetInferenceModelAction.java b/...nce/src/main/java/org/elasticsearch/xpack/inference/rest/RestGetInferenceModelAction.java
@@ -11,13 +11,16 @@
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
 
 import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
+@ServerlessScope(Scope.PUBLIC)
 public class RestGetInferenceModelAction extends BaseRestHandler {
     @Override
     public String getName() {

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
@@ -10,6 +10,8 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.xpack.core.inference.action.InferenceAction;
 
@@ -18,6 +20,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
+@ServerlessScope(Scope.PUBLIC)
 public class RestInferenceAction extends BaseRestHandler {
     @Override
     public String getName() {

diff --git a/...nce/src/main/java/org/elasticsearch/xpack/inference/rest/RestPutInferenceModelAction.java b/...nce/src/main/java/org/elasticsearch/xpack/inference/rest/RestPutInferenceModelAction.java
@@ -10,6 +10,8 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.xpack.core.inference.action.PutInferenceModelAction;
 
@@ -18,6 +20,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
 
+@ServerlessScope(Scope.PUBLIC)
 public class RestPutInferenceModelAction extends BaseRestHandler {
     @Override
     public String getName() {