-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[8.x] [ML] File upload adding deployment initialization step (#198446) (
#199741) # Backport This will backport the following commits from `main` to `8.x`: - [[ML] File upload adding deployment initialization step (#198446)](#198446) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"James Gowdy","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-12T10:02:26Z","message":"[ML] File upload adding deployment initialization step (#198446)\n\nFixes https://github.com/elastic/kibana/issues/196696\r\n\r\nWhen adding a semantic text field, we now have an additional step in the\r\nfile uploading process which calls inference for the selected inference\r\nendpoint.\r\nThe response of the inference call is ignored and a poll is started to\r\ncheck to see of the model has been deployed by check to see if\r\n`num_allocations > 0`\r\nAny errors returned from the inference call will stop the upload, unless\r\nthey are timeout errors which are ignored.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/382ce565-3b4b-47a3-a081-d79c15aa462f","sha":"fa6d8ee9e0f6fcaa0280fbf5ab60217f9f28279f","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement",":ml","Feature:File and Index Data Viz","Feature:File Upload","v9.0.0","backport:version","v8.17.0"],"title":"[ML] File upload adding deployment initialization step","number":198446,"url":"https://github.com/elastic/kibana/pull/198446","mergeCommit":{"message":"[ML] File upload adding deployment initialization step (#198446)\n\nFixes https://github.com/elastic/kibana/issues/196696\r\n\r\nWhen adding a semantic text field, we now have an additional step in the\r\nfile uploading process which calls inference for the selected inference\r\nendpoint.\r\nThe response of the inference call is ignored and a poll is started to\r\ncheck to see of the model has been deployed by check to see if\r\n`num_allocations > 0`\r\nAny errors returned from the inference call will stop the upload, unless\r\nthey are timeout errors which are ignored.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/382ce565-3b4b-47a3-a081-d79c15aa462f","sha":"fa6d8ee9e0f6fcaa0280fbf5ab60217f9f28279f"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198446","number":198446,"mergeCommit":{"message":"[ML] File upload adding deployment initialization step (#198446)\n\nFixes https://github.com/elastic/kibana/issues/196696\r\n\r\nWhen adding a semantic text field, we now have an additional step in the\r\nfile uploading process which calls inference for the selected inference\r\nendpoint.\r\nThe response of the inference call is ignored and a poll is started to\r\ncheck to see of the model has been deployed by check to see if\r\n`num_allocations > 0`\r\nAny errors returned from the inference call will stop the upload, unless\r\nthey are timeout errors which are ignored.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/382ce565-3b4b-47a3-a081-d79c15aa462f","sha":"fa6d8ee9e0f6fcaa0280fbf5ab60217f9f28279f"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: James Gowdy <[email protected]>
- Loading branch information
1 parent
2633bed
commit 04a6dd9
Showing
7 changed files
with
291 additions
and
58 deletions.
There are no files selected for viewing
This file contains 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 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
76 changes: 76 additions & 0 deletions
76
..._visualizer/public/application/file_data_visualizer/components/import_view/auto_deploy.ts
This file contains 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,76 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| import type { InferenceInferenceEndpointInfo } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; | ||
| import type { HttpSetup } from '@kbn/core/public'; | ||
|
|
||
| const POLL_INTERVAL = 5; // seconds | ||
|
|
||
| export class AutoDeploy { | ||
| private inferError: Error | null = null; | ||
| constructor(private readonly http: HttpSetup, private readonly inferenceId: string) {} | ||
|
|
||
| public async deploy() { | ||
| this.inferError = null; | ||
| if (await this.isDeployed()) { | ||
| return; | ||
| } | ||
|
|
||
| this.infer().catch((e) => { | ||
| // ignore timeout errors | ||
| // The deployment may take a long time | ||
| // we'll know when it's ready from polling the inference endpoints | ||
| // looking for num_allocations | ||
| const status = e.response?.status; | ||
| if (status === 408 || status === 504 || status === 502) { | ||
| return; | ||
| } | ||
| this.inferError = e; | ||
| }); | ||
| await this.pollIsDeployed(); | ||
| } | ||
|
|
||
| private async infer() { | ||
| return this.http.fetch<InferenceInferenceEndpointInfo[]>( | ||
| `/internal/data_visualizer/inference/${this.inferenceId}`, | ||
| { | ||
| method: 'POST', | ||
| version: '1', | ||
| body: JSON.stringify({ input: '' }), | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| private async isDeployed() { | ||
| const inferenceEndpoints = await this.http.fetch<InferenceInferenceEndpointInfo[]>( | ||
| '/internal/data_visualizer/inference_endpoints', | ||
| { | ||
| method: 'GET', | ||
| version: '1', | ||
| } | ||
| ); | ||
| return inferenceEndpoints.some((endpoint) => { | ||
| return ( | ||
| endpoint.inference_id === this.inferenceId && endpoint.service_settings.num_allocations > 0 | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| private async pollIsDeployed() { | ||
| while (true) { | ||
| if (this.inferError !== null) { | ||
| throw this.inferError; | ||
| } | ||
| const isDeployed = await this.isDeployed(); | ||
| if (isDeployed) { | ||
| // break out of the loop once we have a successful deployment | ||
| return; | ||
| } | ||
| await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL * 1000)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.