[8.11] [ML] Remove the Tech Preview label from ELSER v2 (#168192) (#168283)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[ML] Remove the Tech Preview label from ELSER v2
(#168192)](https://github.com/elastic/kibana/pull/168192)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Dima
Arnautov","email":"dmitrii.arnautov@elastic.co"},"sourceCommit":{"committedDate":"2023-10-06T18:00:05Z","message":"[ML]
Remove the Tech Preview label from ELSER v2 (#168192)\n\n##
Summary\r\n\r\nRemoves the Tech Preview label from ELSER v2 models.
\r\n\r\n### Checklist\r\n\r\n- [
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"0636610217d570608eaf7cbfc06432a5b581d497","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":[":ml","release_note:skip","Team:ML","v8.11.0","v8.12.0"],"number":168192,"url":"https://github.com/elastic/kibana/pull/168192","mergeCommit":{"message":"[ML]
Remove the Tech Preview label from ELSER v2 (#168192)\n\n##
Summary\r\n\r\nRemoves the Tech Preview label from ELSER v2 models.
\r\n\r\n### Checklist\r\n\r\n- [
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"0636610217d570608eaf7cbfc06432a5b581d497"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"8.11","label":"v8.11.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/168192","number":168192,"mergeCommit":{"message":"[ML]
Remove the Tech Preview label from ELSER v2 (#168192)\n\n##
Summary\r\n\r\nRemoves the Tech Preview label from ELSER v2 models.
\r\n\r\n### Checklist\r\n\r\n- [
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"0636610217d570608eaf7cbfc06432a5b581d497"}}]}]
BACKPORT-->

Co-authored-by: Dima Arnautov <dmitrii.arnautov@elastic.co>
This commit is contained in:
Kibana Machine 2023-10-06 15:10:42 -04:00 committed by GitHub
parent 6d1d88324b
commit f24b05656c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 41 deletions

View file

@ -72,7 +72,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
},
},
description: i18n.translate('xpack.ml.trainedModels.modelsList.elserV2Description', {
defaultMessage: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
defaultMessage: 'Elastic Learned Sparse EncodeR v2',
}),
},
'.elser_model_2_linux-x86_64': {
@ -86,8 +86,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
},
},
description: i18n.translate('xpack.ml.trainedModels.modelsList.elserV2x86Description', {
defaultMessage:
'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64 (Tech Preview)',
defaultMessage: 'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64',
}),
},
} as const);

View file

@ -43,7 +43,6 @@ import {
type ModelState,
} from '@kbn/ml-trained-models-utils';
import { isDefined } from '@kbn/ml-is-defined';
import { css } from '@emotion/react';
import { useStorage } from '@kbn/ml-local-storage';
import { getModelStateColor } from './get_model_state_color';
import { ML_ELSER_CALLOUT_DISMISSED } from '../../../common/types/storage';
@ -456,7 +455,7 @@ export const ModelsList: FC<Props> = ({
},
{
name: modelIdColumnName,
width: '15%',
width: '215px',
sortable: ({ model_id: modelId }: ModelItem) => modelId,
truncateText: false,
textOnly: false,
@ -477,7 +476,7 @@ export const ModelsList: FC<Props> = ({
},
},
{
width: '35%',
width: '300px',
name: i18n.translate('xpack.ml.trainedModels.modelsList.modelDescriptionHeader', {
defaultMessage: 'Description',
}),
@ -485,32 +484,28 @@ export const ModelsList: FC<Props> = ({
'data-test-subj': 'mlModelsTableColumnDescription',
render: ({ description, recommended }: ModelItem) => {
if (!description) return null;
return (
<>
{description.replace('(Tech Preview)', '')}
{recommended ? (
<EuiToolTip
content={
<FormattedMessage
id="xpack.ml.trainedModels.modelsList.recommendedDownloadContent"
defaultMessage="Recommended ELSER model version for your cluster's hardware configuration"
/>
}
>
<b
css={css`
text-wrap: nowrap;
`}
>
&nbsp;
<FormattedMessage
id="xpack.ml.trainedModels.modelsList.recommendedDownloadLabel"
defaultMessage="(Recommended)"
/>
</b>
</EuiToolTip>
) : null}
</>
const descriptionText = description.replace('(Tech Preview)', '');
return recommended ? (
<EuiToolTip
content={
<FormattedMessage
id="xpack.ml.trainedModels.modelsList.recommendedDownloadContent"
defaultMessage="Recommended ELSER model version for your cluster's hardware configuration"
/>
}
>
<>
{descriptionText}&nbsp;
<b>
<FormattedMessage
id="xpack.ml.trainedModels.modelsList.recommendedDownloadLabel"
defaultMessage="(Recommended)"
/>
</b>
</>
</EuiToolTip>
) : (
descriptionText
);
},
},
@ -534,6 +529,7 @@ export const ModelsList: FC<Props> = ({
</EuiFlexGroup>
),
'data-test-subj': 'mlModelsTableColumnType',
width: '130px',
},
{
field: 'state',
@ -551,6 +547,7 @@ export const ModelsList: FC<Props> = ({
) : null;
},
'data-test-subj': 'mlModelsTableColumnDeploymentState',
width: '130px',
},
{
field: ModelsTableToConfigMapping.createdAt,
@ -561,8 +558,10 @@ export const ModelsList: FC<Props> = ({
render: (v: number) => dateFormatter(v),
sortable: true,
'data-test-subj': 'mlModelsTableColumnCreatedAt',
width: '210px',
},
{
width: '150px',
name: i18n.translate('xpack.ml.trainedModels.modelsList.actionsHeader', {
defaultMessage: 'Actions',
}),
@ -696,12 +695,13 @@ export const ModelsList: FC<Props> = ({
<EuiSpacer size="m" />
<div data-test-subj="mlModelsTableContainer">
<EuiInMemoryTable<ModelItem>
css={{ overflowX: 'auto' }}
isSelectable={true}
isExpandable={true}
hasActions={true}
allowNeutralSort={false}
columns={columns}
hasActions={true}
isExpandable={true}
itemIdToExpandedRowMap={itemIdToExpandedRowMap}
isSelectable={false}
items={items}
itemId={ModelsTableToConfigMapping.id}
loading={isLoading}

View file

@ -57,15 +57,14 @@ describe('modelsProvider', () => {
{
config: { input: { field_names: ['text_field'] } },
default: true,
description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
description: 'Elastic Learned Sparse EncodeR v2',
name: '.elser_model_2',
version: 2,
},
{
arch: 'amd64',
config: { input: { field_names: ['text_field'] } },
description:
'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64 (Tech Preview)',
description: 'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64',
name: '.elser_model_2_linux-x86_64',
os: 'Linux',
recommended: true,
@ -109,15 +108,14 @@ describe('modelsProvider', () => {
{
config: { input: { field_names: ['text_field'] } },
recommended: true,
description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
description: 'Elastic Learned Sparse EncodeR v2',
name: '.elser_model_2',
version: 2,
},
{
arch: 'amd64',
config: { input: { field_names: ['text_field'] } },
description:
'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64 (Tech Preview)',
description: 'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64',
name: '.elser_model_2_linux-x86_64',
os: 'Linux',
version: 2,