[ML][Inference] Adding read/del trained models

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelAction.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.action;
+
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.ActionType;
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.ToXContentFragment;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig;
+import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class DeleteTrainedModelAction extends ActionType<AcknowledgedResponse> {
+
+    public static final DeleteTrainedModelAction INSTANCE = new DeleteTrainedModelAction();
+    public static final String NAME = "cluster:admin/xpack/ml/inference/delete";
+
+    private DeleteTrainedModelAction() {
+        super(NAME, AcknowledgedResponse::new);
+    }
+
+    public static class Request extends AcknowledgedRequest<Request> implements ToXContentFragment {
+
+        private String id;
+
+        public Request(StreamInput in) throws IOException {
+            super(in);
+            id = in.readString();
+        }
+
+        public Request() {}
+
+        public Request(String id) {
+            this.id = ExceptionsHelper.requireNonNull(id, TrainedModelConfig.MODEL_ID);
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public ActionRequestValidationException validate() {
+            return null;
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            builder.field(TrainedModelConfig.MODEL_ID.getPreferredName(), id);
+            return builder;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            DeleteTrainedModelAction.Request request = (DeleteTrainedModelAction.Request) o;
+            return Objects.equals(id, request.id);
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            super.writeTo(out);
+            out.writeString(id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsAction.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.action;
+
+import org.elasticsearch.action.ActionRequestBuilder;
+import org.elasticsearch.action.ActionType;
+import org.elasticsearch.client.ElasticsearchClient;
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest;
+import org.elasticsearch.xpack.core.action.AbstractGetResourcesResponse;
+import org.elasticsearch.xpack.core.action.util.QueryPage;
+import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig;
+
+import java.io.IOException;
+
+public class GetTrainedModelsAction extends ActionType<GetTrainedModelsAction.Response> {
+
+    public static final GetTrainedModelsAction INSTANCE = new GetTrainedModelsAction();
+    public static final String NAME = "cluster:monitor/xpack/ml/inference/get";
+
+    private GetTrainedModelsAction() {
+        super(NAME, Response::new);
+    }
+
+    public static class Request extends AbstractGetResourcesRequest {
+
+        public static final ParseField ALLOW_NO_MATCH = new ParseField("allow_no_match");
+
+        public Request() {
+            setAllowNoResources(true);
+        }
+
+        public Request(String id) {
+            setResourceId(id);
+            setAllowNoResources(true);
+        }
+
+        public Request(StreamInput in) throws IOException {
+            super(in);
+        }
+
+        @Override
+        public String getResourceIdField() {
+            return TrainedModelConfig.MODEL_ID.getPreferredName();
+        }
+
+    }
+
+    public static class Response extends AbstractGetResourcesResponse<TrainedModelConfig> {
+
+        public static final ParseField RESULTS_FIELD = new ParseField("trained_model_configs");
+
+        public Response(StreamInput in) throws IOException {
+            super(in);
+        }
+
+        public Response(QueryPage<TrainedModelConfig> trainedModels) {
+            super(trainedModels);
+        }
+
+        @Override
+        protected Reader<TrainedModelConfig> getReader() {
+            return TrainedModelConfig::new;
+        }
+    }
+
+    public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
+
+        public RequestBuilder(ElasticsearchClient client) {
+            super(client, INSTANCE, new Request());
+        }
+    }
+}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/notifications/InferenceAuditMessage.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.notifications;
+
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.xpack.core.common.notifications.AbstractAuditMessage;
+import org.elasticsearch.xpack.core.common.notifications.Level;
+import org.elasticsearch.xpack.core.ml.job.config.Job;
+
+import java.util.Date;
+
+
+public class InferenceAuditMessage extends AbstractAuditMessage {
+
+    //TODO this should be MODEL_ID...
+    private static final ParseField JOB_ID = Job.ID;
+    public static final ConstructingObjectParser<InferenceAuditMessage, Void> PARSER =
+        createParser("ml_inference_audit_message", InferenceAuditMessage::new, JOB_ID);
+
+    public InferenceAuditMessage(String resourceId, String message, Level level, Date timestamp, String nodeName) {
+        super(resourceId, message, level, timestamp, nodeName);
+    }
+
+    @Override
+    public final String getJobType() {
+        return "inference";
+    }
+
+    @Override
+    protected String getResourceField() {
+        return JOB_ID.getPreferredName();
+    }
+}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/ExceptionsHelper.java

@@ -43,6 +43,10 @@ public static ResourceAlreadyExistsException dataFrameAnalyticsAlreadyExists(Str
         return new ResourceAlreadyExistsException("A data frame analytics with id [{}] already exists", id);
     }
 
+    public static ResourceNotFoundException missingTrainedModel(String modelId) {
+        return new ResourceNotFoundException("No known trained model with model_id [{}]", modelId);
+    }
+
     public static ElasticsearchException serverError(String msg) {
         return new ElasticsearchException(msg);
     }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteTrainedModelsRequestTests.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.action;
+
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
+import org.elasticsearch.xpack.core.ml.action.DeleteTrainedModelAction.Request;
+
+public class DeleteTrainedModelsRequestTests extends AbstractWireSerializingTestCase<Request> {
+
+    @Override
+    protected Request createTestInstance() {
+        return new Request(randomAlphaOfLengthBetween(1, 20));
+    }
+
+    @Override
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
+    }
+}

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsRequestTests.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.action;
+
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.test.AbstractWireSerializingTestCase;
+import org.elasticsearch.xpack.core.action.util.PageParams;
+import org.elasticsearch.xpack.core.ml.action.GetTrainedModelsAction.Request;
+
+public class GetTrainedModelsRequestTests extends AbstractWireSerializingTestCase<Request> {
+
+    @Override
+    protected Request createTestInstance() {
+        Request request = new Request(randomAlphaOfLength(20));
+        request.setPageParams(new PageParams(randomIntBetween(0, 100), randomIntBetween(0, 100)));
+        return request;
+    }
+
+    @Override
+    protected Writeable.Reader<Request> instanceReader() {
+        return Request::new;
+    }
+}

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/notifications/AnomalyDetectionAuditMessageTests.java

@@ -6,31 +6,23 @@
 package org.elasticsearch.xpack.core.ml.notifications;
 
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.test.AbstractXContentTestCase;
 import org.elasticsearch.xpack.core.common.notifications.Level;
 import org.elasticsearch.xpack.core.ml.job.config.Job;
 
 import java.util.Date;
 
-import static org.hamcrest.Matchers.equalTo;
+public class AnomalyDetectionAuditMessageTests extends AuditMessageTests<AnomalyDetectionAuditMessage> {
 
-public class AnomalyDetectionAuditMessageTests extends AbstractXContentTestCase<AnomalyDetectionAuditMessage> {
-
-    public void testGetJobType() {
-        AnomalyDetectionAuditMessage message = createTestInstance();
-        assertThat(message.getJobType(), equalTo(Job.ANOMALY_DETECTOR_JOB_TYPE));
+    @Override
+    public String getJobType() {
+        return Job.ANOMALY_DETECTOR_JOB_TYPE;
     }
 
     @Override
     protected AnomalyDetectionAuditMessage doParseInstance(XContentParser parser) {
         return AnomalyDetectionAuditMessage.PARSER.apply(parser, null);
     }
 
-    @Override
-    protected boolean supportsUnknownFields() {
-        return true;
-    }
-
     @Override
     protected AnomalyDetectionAuditMessage createTestInstance() {
         return new AnomalyDetectionAuditMessage(

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/notifications/AuditMessageTests.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.notifications;
+
+import org.elasticsearch.test.AbstractXContentTestCase;
+import org.elasticsearch.xpack.core.common.notifications.AbstractAuditMessage;
+
+
+import static org.hamcrest.Matchers.equalTo;
+
+public abstract class AuditMessageTests<T extends AbstractAuditMessage> extends AbstractXContentTestCase<T> {
+
+    public abstract String getJobType();
+
+    public void testGetJobType() {
+        AbstractAuditMessage message = createTestInstance();
+        assertThat(message.getJobType(), equalTo(getJobType()));
+    }
+
+    @Override
+    protected boolean supportsUnknownFields() {
+        return true;
+    }
+}

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/notifications/DataFrameAnalyticsAuditMessageTests.java

@@ -6,28 +6,20 @@
 package org.elasticsearch.xpack.core.ml.notifications;
 
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.test.AbstractXContentTestCase;
 import org.elasticsearch.xpack.core.common.notifications.Level;
 
 import java.util.Date;
 
-import static org.hamcrest.Matchers.equalTo;
+public class DataFrameAnalyticsAuditMessageTests extends AuditMessageTests<DataFrameAnalyticsAuditMessage> {
 
-public class DataFrameAnalyticsAuditMessageTests extends AbstractXContentTestCase<DataFrameAnalyticsAuditMessage> {
-
-    public void testGetJobType() {
-        DataFrameAnalyticsAuditMessage message = createTestInstance();
-        assertThat(message.getJobType(), equalTo("data_frame_analytics"));
-    }
-
     @Override
-    protected DataFrameAnalyticsAuditMessage doParseInstance(XContentParser parser) {
-        return DataFrameAnalyticsAuditMessage.PARSER.apply(parser, null);
+    public String getJobType() {
+        return "data_frame_analytics";
     }
 
     @Override
-    protected boolean supportsUnknownFields() {
-        return true;
+    protected DataFrameAnalyticsAuditMessage doParseInstance(XContentParser parser) {
+        return DataFrameAnalyticsAuditMessage.PARSER.apply(parser, null);
     }
 
     @Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/notifications/InferenceAuditMessageTests.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.core.ml.notifications;
+
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.xpack.core.common.notifications.Level;
+
+import java.util.Date;
+
+public class InferenceAuditMessageTests extends AuditMessageTests<InferenceAuditMessage> {
+
+    @Override
+    public String getJobType() {
+        return "inference";
+    }
+
+    @Override
+    protected InferenceAuditMessage doParseInstance(XContentParser parser) {
+        return InferenceAuditMessage.PARSER.apply(parser, null);
+    }
+
+    @Override
+    protected InferenceAuditMessage createTestInstance() {
+        return new InferenceAuditMessage(
+            randomBoolean() ? null : randomAlphaOfLength(10),
+            randomAlphaOfLengthBetween(1, 20),
+            randomFrom(Level.values()),
+            new Date(),
+            randomBoolean() ? null : randomAlphaOfLengthBetween(1, 20)
+        );
+    }
+}