Extract inferece model stats into its own file #134634
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.core.inference.usage; | ||
|
|
||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
| import org.elasticsearch.common.io.stream.Writeable; | ||
| import org.elasticsearch.inference.TaskType; | ||
| import org.elasticsearch.xcontent.ToXContentObject; | ||
| import org.elasticsearch.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
|
|
||
| public class ModelStats implements ToXContentObject, Writeable { | ||
|
|
||
| private final String service; | ||
| private final TaskType taskType; | ||
| private long count; | ||
|
|
||
| public ModelStats(String service, TaskType taskType) { | ||
| this(service, taskType, 0L); | ||
| } | ||
|
|
||
| public ModelStats(String service, TaskType taskType, long count) { | ||
| this.service = service; | ||
| this.taskType = taskType; | ||
| this.count = count; | ||
| } | ||
|
|
||
| public ModelStats(ModelStats stats) { | ||
| this(stats.service, stats.taskType, stats.count); | ||
| } | ||
|
|
||
| public ModelStats(StreamInput in) throws IOException { | ||
| this.service = in.readString(); | ||
| this.taskType = in.readEnum(TaskType.class); | ||
| this.count = in.readLong(); | ||
| } | ||
|
|
||
| public void add() { | ||
| count++; | ||
| } | ||
|
|
||
| public String service() { | ||
| return service; | ||
| } | ||
|
|
||
| public TaskType taskType() { | ||
| return taskType; | ||
| } | ||
|
|
||
| public long count() { | ||
| return count; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(); | ||
| addXContentFragment(builder, params); | ||
| builder.endObject(); | ||
| return builder; | ||
| } | ||
|
|
||
| public void addXContentFragment(XContentBuilder builder, Params params) throws IOException { | ||
| builder.field("service", service); | ||
| builder.field("task_type", taskType.name()); | ||
| builder.field("count", count); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeString(service); | ||
| out.writeEnum(taskType); | ||
| out.writeLong(count); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| ModelStats that = (ModelStats) o; | ||
| return count == that.count && Objects.equals(service, that.service) && taskType == that.taskType; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(service, taskType, count); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.core.inference.usage; | ||
|
|
||
| import org.elasticsearch.common.io.stream.Writeable; | ||
| import org.elasticsearch.inference.TaskType; | ||
| import org.elasticsearch.test.AbstractWireSerializingTestCase; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class ModelStatsTests extends AbstractWireSerializingTestCase<ModelStats> { | ||
|
|
||
| @Override | ||
| protected Writeable.Reader<ModelStats> instanceReader() { | ||
| return ModelStats::new; | ||
| } | ||
|
|
||
| @Override | ||
| protected ModelStats createTestInstance() { | ||
| return createRandomInstance(); | ||
| } | ||
|
|
||
| @Override | ||
| protected ModelStats mutateInstance(ModelStats modelStats) throws IOException { | ||
| ModelStats newModelStats = new ModelStats(modelStats); | ||
| newModelStats.add(); | ||
| return newModelStats; | ||
| } | ||
|
Comment on lines
+28
to
+33
There was a problem hiding this comment. This implementation will only test that changes to |
||
|
|
||
| public static ModelStats createRandomInstance() { | ||
| return new ModelStats(randomIdentifier(), TaskType.values()[randomInt(TaskType.values().length - 1)], randomInt(10)); | ||
|
There was a problem hiding this comment. Minor nitpick, but the second argument here would be more readable as |
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a very minor point, but could there be a test of this method added to
ModelStatsTests?