github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Use release ELSER version (#167888)

Browse source 
## Summary

Updates ELSER model IDs to the release version
This commit is contained in:
Dima Arnautov 2023-10-04 00:19:43 +02:00 • committed by GitHub
parent 395f75eadc
commit 984d5e6daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
View file

@ -62,7 +62,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
defaultMessage: 'Elastic Learned Sparse EncodeR v1 (Tech Preview)',
}),
},
'.elser_model_2_SNAPSHOT': {
'.elser_model_2': {
modelName: 'elser',
version: 2,
default: true,
@ -75,7 +75,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
defaultMessage: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
}),
},
'.elser_model_2_linux-x86_64_SNAPSHOT': {
'.elser_model_2_linux-x86_64': {
modelName: 'elser',
version: 2,
os: 'Linux',

2
x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.test.ts
View file

@ -15,7 +15,7 @@ import * as mockGetStatus from './get_ml_model_deployment_status';
import { startMlModelDeployment } from './start_ml_model_deployment';
describe('startMlModelDeployment', () => {
const modelName = '.elser_model_2_SNAPSHOT';
const modelName = '.elser_model_2';
const mockTrainedModelsProvider = {
getTrainedModels: jest.fn(),
getTrainedModelsStats: jest.fn(),

2
x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_download.test.ts
View file

@ -15,7 +15,7 @@ import * as mockGetStatus from './get_ml_model_deployment_status';
import { startMlModelDownload } from './start_ml_model_download';
describe('startMlModelDownload', () => {
const knownModelName = '.elser_model_2_SNAPSHOT';
const knownModelName = '.elser_model_2';
const mockTrainedModelsProvider = {
getTrainedModels: jest.fn(),
getTrainedModelsStats: jest.fn(),

6
x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.test.ts
View file

@ -1078,7 +1078,7 @@ describe('Enterprise Search Managed Indices', () => {
router: mockRouter.router,
});
});
const modelName = '.elser_model_2_SNAPSHOT';
const modelName = '.elser_model_2';
it('fails validation without modelName', () => {
const request = {
@ -1142,7 +1142,7 @@ describe('Enterprise Search Managed Indices', () => {
router: mockRouter.router,
});
});
const modelName = '.elser_model_2_SNAPSHOT';
const modelName = '.elser_model_2';
it('fails validation without modelName', () => {
const request = {
@ -1205,7 +1205,7 @@ describe('Enterprise Search Managed Indices', () => {
router: mockRouter.router,
});
});
const modelName = '.elser_model_2_SNAPSHOT';
const modelName = '.elser_model_2';
it('fails validation without modelName', () => {
const request = {

14
x-pack/plugins/ml/server/models/model_management/model_provider.test.ts
View file

@ -58,7 +58,7 @@ describe('modelsProvider', () => {
config: { input: { field_names: ['text_field'] } },
default: true,
description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
name: '.elser_model_2_SNAPSHOT',
name: '.elser_model_2',
version: 2,
},
{
@ -66,7 +66,7 @@ describe('modelsProvider', () => {
config: { input: { field_names: ['text_field'] } },
description:
'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64 (Tech Preview)',
name: '.elser_model_2_linux-x86_64_SNAPSHOT',
name: '.elser_model_2_linux-x86_64',
os: 'Linux',
recommended: true,
version: 2,
@ -110,7 +110,7 @@ describe('modelsProvider', () => {
config: { input: { field_names: ['text_field'] } },
recommended: true,
description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
name: '.elser_model_2_SNAPSHOT',
name: '.elser_model_2',
version: 2,
},
{
@ -118,7 +118,7 @@ describe('modelsProvider', () => {
config: { input: { field_names: ['text_field'] } },
description:
'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64 (Tech Preview)',
name: '.elser_model_2_linux-x86_64_SNAPSHOT',
name: '.elser_model_2_linux-x86_64',
os: 'Linux',
version: 2,
},
@ -129,7 +129,7 @@ describe('modelsProvider', () => {
describe('getELSER', () => {
test('provides a recommended definition by default', async () => {
const result = await modelService.getELSER();
expect(result.name).toEqual('.elser_model_2_linux-x86_64_SNAPSHOT');
expect(result.name).toEqual('.elser_model_2_linux-x86_64');
});
test('provides a default version if there is no recommended', async () => {
@ -155,7 +155,7 @@ describe('modelsProvider', () => {
});
const result = await modelService.getELSER();
expect(result.name).toEqual('.elser_model_2_SNAPSHOT');
expect(result.name).toEqual('.elser_model_2');
});
test('provides the requested version', async () => {
@ -165,7 +165,7 @@ describe('modelsProvider', () => {
test('provides the requested version of a recommended architecture', async () => {
const result = await modelService.getELSER({ version: 2 });
expect(result.name).toEqual('.elser_model_2_linux-x86_64_SNAPSHOT');
expect(result.name).toEqual('.elser_model_2_linux-x86_64');
});
});
});