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

[Search] Fixes a bug where third-party models could not be saved (#189098)

Browse source 
## Summary

This enables saving a third-party model mappings in the UI with semantic
text.
This commit is contained in:
Sander Philipse 2024-07-25 12:13:30 +02:00 • committed by GitHub
parent 631baa336f
commit fb34fc70bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts
View file

@ -789,5 +789,5 @@ export const getFieldByPathName = (fields: NormalizedFields, name: string) => {
export function isLocalModel(
model: InferenceServiceSettings
): model is LocalInferenceServiceSettings {
return Boolean((model as LocalInferenceServiceSettings).service_settings.model_id);
return ['elser', 'elasticsearch'].includes((model as LocalInferenceServiceSettings).service);
}

2
x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/details_page_mappings_content.tsx
View file

@ -231,7 +231,7 @@ export const DetailsPageMappingsContent: FunctionComponent<{
.map((field) => field.inference_id)
.filter(
(inferenceId: string) =>
state.inferenceToModelIdMap?.[inferenceId] &&
state.inferenceToModelIdMap?.[inferenceId].trainedModelId && // third-party inference models don't have trainedModelId
!state.inferenceToModelIdMap?.[inferenceId].isDeployed
);
setHasSavedFields(true);

9
x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
View file

@ -101,9 +101,14 @@ export function TrainedModelsDeploymentModal({
useEffect(() => {
const models = inferenceIdsInPendingList.map(
(inferenceId) => inferenceToModelIdMap?.[inferenceId]
);
); // filter out third-party models
for (const model of models) {
if (model && !model.isDownloading && !model.isDeployed) {
if (
model?.trainedModelId &&
model.isDeployable &&
!model.isDownloading &&
!model.isDeployed
) {
// Sometimes the model gets stuck in a ready to deploy state, so we need to trigger deployment manually
startModelAllocation(model.trainedModelId);
}

2
x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.ts
View file

@ -32,7 +32,7 @@ const getCustomInferenceIdMap = (
const inferenceIdMap = models.reduce<InferenceToModelIdMap>((inferenceMap, model) => {
const inferenceEntry = isLocalModel(model)
? {
trainedModelId: model.service_settings.model_id, // third-party models don't have trained model ids
trainedModelId: model.service_settings.model_id,
isDeployable: model.service === Service.elser || model.service === Service.elasticsearch,
isDeployed: modelStatsById[model.service_settings.model_id]?.state === 'started',
isDownloading: Boolean(downloadStates[model.service_settings.model_id]),