-
Notifications
You must be signed in to change notification settings - Fork 25.6k
[ML] Allow NLP truncate option to be updated when span is set #91224
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| pr: 91224 | ||
| summary: Allow NLP truncate option to be updated when span is set | ||
| area: Machine Learning | ||
| type: bug | ||
| issues: [] |
86 changes: 86 additions & 0 deletions
86
...va/org/elasticsearch/xpack/core/ml/inference/trainedmodel/AbstractTokenizationUpdate.java
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,86 @@ | ||
| /* | ||
| * 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.ml.inference.trainedmodel; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
| import org.elasticsearch.core.Nullable; | ||
| import org.elasticsearch.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
|
|
||
| public abstract class AbstractTokenizationUpdate implements TokenizationUpdate { | ||
|
|
||
| private final Tokenization.Truncate truncate; | ||
| private final Integer span; | ||
|
|
||
| public AbstractTokenizationUpdate(@Nullable Tokenization.Truncate truncate, @Nullable Integer span) { | ||
| this.truncate = truncate; | ||
| this.span = span; | ||
| } | ||
|
|
||
| public AbstractTokenizationUpdate(StreamInput in) throws IOException { | ||
| this.truncate = in.readOptionalEnum(Tokenization.Truncate.class); | ||
| if (in.getVersion().onOrAfter(Version.V_8_2_0)) { | ||
| this.span = in.readOptionalInt(); | ||
| } else { | ||
| this.span = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isNoop() { | ||
| return truncate == null && span == null; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(); | ||
| if (truncate != null) { | ||
| builder.field(Tokenization.TRUNCATE.getPreferredName(), truncate.toString()); | ||
| } | ||
| if (span != null) { | ||
| builder.field(Tokenization.SPAN.getPreferredName(), span); | ||
| } | ||
| builder.endObject(); | ||
| return builder; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeOptionalEnum(truncate); | ||
| if (out.getVersion().onOrAfter(Version.V_8_2_0)) { | ||
| out.writeOptionalInt(span); | ||
| } | ||
| } | ||
|
|
||
| public Integer getSpan() { | ||
| return span; | ||
| } | ||
|
|
||
| public Tokenization.Truncate getTruncate() { | ||
| return truncate; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o instanceof AbstractTokenizationUpdate == false) { | ||
| return false; | ||
| } | ||
| AbstractTokenizationUpdate that = (AbstractTokenizationUpdate) o; | ||
| return Objects.equals(truncate, that.truncate) && Objects.equals(span, that.span); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(truncate, span); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
Why is there a constructor that doesn't expect
doLowerCaseforRobertaTokenization? The only public constructor before this change forces lower case tofalse. This seems something worth clarifying as we're refactoring the area.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.
I reverted this change as it was only a convenience for a test. The value of
doLowerCaseshould always be false.