[ML] File upload api refactor #210865
Merged
[ML] File upload api refactor #210865
Conversation
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
…ibana into file-upload-api-refactor
jgowdyelastic
added
:ml
release_note:skip
|
Pinging @elastic/ml-ui (:ml) |
qn895
reviewed
Feb 20, 2025
| IndicesIndexSettings, | ||
| MappingTypeMapping, | ||
| } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; | ||
| import { |
There was a problem hiding this comment.
We can use import type here and above
There was a problem hiding this comment.
Good spot, I'm too used to the consistent-type-imports eslint rule we have in our other plugins.
I think I'll add that rule to the file_upload plugin too in a separate PR.
There was a problem hiding this comment.
Updated in 3b340af
qn895
reviewed
Feb 20, 2025
| @@ -13,56 +13,72 @@ import type { | |||
| MappingTypeMapping, | |||
| } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; | |||
| import { INDEX_META_DATA_CREATED_BY } from '../common/constants'; | |||
| import { ImportResponse, ImportFailure, InputData, IngestPipelineWrapper } from '../common/types'; | |||
| import { | |||
There was a problem hiding this comment.
Updated in 3b340af
qn895
reviewed
Feb 20, 2025
| settings: schema.maybe(schema.any()), | ||
| /** Mappings */ | ||
| mappings: schema.any(), | ||
| /** Ingest pipeline definition */ | ||
| ingestPipeline, | ||
| createPipelines: schema.maybe(schema.arrayOf(ingestPipeline)), | ||
| ingestPipelines: schema.arrayOf(ingestPipeline), |
There was a problem hiding this comment.
Would ingestPipelines ever be a schema.maybe(schema.arrayOf(ingestPipeline))? Or is it always empty array if there's no ingest pipeline?
There was a problem hiding this comment.
The latter. It should always be present and just empty if there are no pipelines to create.
💚 Build Succeeded
Metrics [docs]Module Count
Public APIs missing comments
Async chunks
Page load bundle
History
|
|
Starting backport for target branches: 8.x https://github.com/elastic/kibana/actions/runs/13541986386 |
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
jgowdyelastic
added a commit
to jgowdyelastic/kibana
that referenced
this pull request
Feb 26, 2025
Adds a v2 version of the file upload api which spits away the upload initialisation step from the data upload api. Previously the import data API would behave differently depending on whether an ID was passed to it. If an ID was not present, the api would "initialize the upload" by creating the index, mappings and pipeline. Subsequent calls to the api would the pass in an ID as well as the data. The ID being present meant the data would be ingested. The ID had not other purpose other than signifying whether this was the initial call to create the index or the subsequent calls to ingest the data. This change adds a new `initialize_import` api which is called first to create the index et al. Subsequent calls to the `import` api behave as before and the data is ingested. A temporary v1 version of the `import` has been kept for backwards compatibility during upgrades. The `initialize_import` also creates multiple ingest pipelines by default. Improving the previous "hacked in" addition of having two sets of pipelines passed to it to provide backwards compatibility. (cherry picked from commit 0121f4b)
jgowdyelastic
added a commit
that referenced
this pull request
Feb 26, 2025
# Backport This will backport the following commits from `main` to `8.x`: - [[ML] File upload api refactor (#210865)](#210865) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"James Gowdy","email":"jgowdy@elastic.co"},"sourceCommit":{"committedDate":"2025-02-26T10:39:30Z","message":"[ML] File upload api refactor (#210865)\n\nAdds a v2 version of the file upload api which spits away the upload\ninitialisation step from the data upload api.\nPreviously the import data API would behave differently depending on\nwhether an ID was passed to it. If an ID was not present, the api would\n\"initialize the upload\" by creating the index, mappings and pipeline.\nSubsequent calls to the api would the pass in an ID as well as the data.\nThe ID being present meant the data would be ingested.\nThe ID had not other purpose other than signifying whether this was the\ninitial call to create the index or the subsequent calls to ingest the\ndata.\nThis change adds a new `initialize_import` api which is called first to\ncreate the index et al.\nSubsequent calls to the `import` api behave as before and the data is\ningested.\n\nA temporary v1 version of the `import` has been kept for backwards\ncompatibility during upgrades.\n\nThe `initialize_import` also creates multiple ingest pipelines by\ndefault. Improving the previous \"hacked in\" addition of having two sets\nof pipelines passed to it to provide backwards compatibility.","sha":"0121f4b87b4f3a602eb0ef253afdb904416ab0db","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":[":ml","release_note:skip","Feature:File and Index Data Viz","Feature:File Upload","backport:version","v9.1.0","v8.19.0"],"title":"[ML] File upload api refactor","number":210865,"url":"https://github.com/elastic/kibana/pull/210865","mergeCommit":{"message":"[ML] File upload api refactor (#210865)\n\nAdds a v2 version of the file upload api which spits away the upload\ninitialisation step from the data upload api.\nPreviously the import data API would behave differently depending on\nwhether an ID was passed to it. If an ID was not present, the api would\n\"initialize the upload\" by creating the index, mappings and pipeline.\nSubsequent calls to the api would the pass in an ID as well as the data.\nThe ID being present meant the data would be ingested.\nThe ID had not other purpose other than signifying whether this was the\ninitial call to create the index or the subsequent calls to ingest the\ndata.\nThis change adds a new `initialize_import` api which is called first to\ncreate the index et al.\nSubsequent calls to the `import` api behave as before and the data is\ningested.\n\nA temporary v1 version of the `import` has been kept for backwards\ncompatibility during upgrades.\n\nThe `initialize_import` also creates multiple ingest pipelines by\ndefault. Improving the previous \"hacked in\" addition of having two sets\nof pipelines passed to it to provide backwards compatibility.","sha":"0121f4b87b4f3a602eb0ef253afdb904416ab0db"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/210865","number":210865,"mergeCommit":{"message":"[ML] File upload api refactor (#210865)\n\nAdds a v2 version of the file upload api which spits away the upload\ninitialisation step from the data upload api.\nPreviously the import data API would behave differently depending on\nwhether an ID was passed to it. If an ID was not present, the api would\n\"initialize the upload\" by creating the index, mappings and pipeline.\nSubsequent calls to the api would the pass in an ID as well as the data.\nThe ID being present meant the data would be ingested.\nThe ID had not other purpose other than signifying whether this was the\ninitial call to create the index or the subsequent calls to ingest the\ndata.\nThis change adds a new `initialize_import` api which is called first to\ncreate the index et al.\nSubsequent calls to the `import` api behave as before and the data is\ningested.\n\nA temporary v1 version of the `import` has been kept for backwards\ncompatibility during upgrades.\n\nThe `initialize_import` also creates multiple ingest pipelines by\ndefault. Improving the previous \"hacked in\" addition of having two sets\nof pipelines passed to it to provide backwards compatibility.","sha":"0121f4b87b4f3a602eb0ef253afdb904416ab0db"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds a v2 version of the file upload api which spits away the upload initialisation step from the data upload api.
Previously the import data API would behave differently depending on whether an ID was passed to it. If an ID was not present, the api would "initialize the upload" by creating the index, mappings and pipeline.
Subsequent calls to the api would the pass in an ID as well as the data. The ID being present meant the data would be ingested.
The ID had not other purpose other than signifying whether this was the initial call to create the index or the subsequent calls to ingest the data.
This change adds a new
initialize_importapi which is called first to create the index et al.Subsequent calls to the
importapi behave as before and the data is ingested.A temporary v1 version of the
importhas been kept for backwards compatibility during upgrades.The
initialize_importalso creates multiple ingest pipelines by default. Improving the previous "hacked in" addition of having two sets of pipelines passed to it to provide backwards compatibility.