Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Inference Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering of inference endpoints #190783

Merged
merged 15 commits into from
Oct 1, 2024
Merged

[Inference Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering of inference endpoints #190783

merged 15 commits into from
Oct 1, 2024

Conversation

weizijun
Copy link
Contributor

@weizijun weizijun commented Aug 20, 2024 •
edited by kibanamachine
Loading

Summary
Adds Alibaba AI Search support to the #186206 (relevance/inference_endpoints) management list view.

The Elasticsearch PR is: elastic/elasticsearch#111181

I'm not very familiar with kibana. I made this PR from #188670.

@weizijun weizijun requested review from a team as code owners August 20, 2024 11:16
sphilipse
sphilipse reviewed Aug 22, 2024
View reviewed changes
x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts Show resolved Hide resolved
...ic/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx Outdated
@@ -84,6 +84,8 @@ function endpointModelAtrributes(endpoint: InferenceAPIConfigResponse) {
return mistralAttributes(endpoint);
case ServiceProviderKeys.googleaistudio:
return googleAIStudioAttributes(endpoint);
case ServiceProviderKeys.alibabaaisearch:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: formatting is off here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

...ic/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx Outdated Show resolved Hide resolved
sphilipse
sphilipse reviewed Aug 22, 2024
View reviewed changes
Copy link
Member

@sphilipse sphilipse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @weizijun! We probably want to wait with merging this until your Elasticsearch PR has been merged, but this looks good overall. A couple of questions/nitpicks but nothing serious.

@weizijun
Copy link
Contributor Author

Thanks @weizijun! We probably want to wait with merging this until your Elasticsearch PR has been merged, but this looks good overall. A couple of questions/nitpicks but nothing serious.

Thanks for your review. I will resolve these conversations.

darnautov
darnautov approved these changes Aug 22, 2024
View reviewed changes
Copy link
Contributor

@darnautov darnautov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ML changes LGTM

@weizijun
Copy link
Contributor Author

hi, @sphilipse @darnautov , the elasticsearch PR has been merged. Can this PR be merged?

@darnautov
Copy link
Contributor

hey @weizijun, yes, it can be merged now. Thanks!

@weizijun
Copy link
Contributor Author

weizijun commented Sep 3, 2024

hey @weizijun, yes, it can be merged now. Thanks!

Hi, @darnautov, is the CI check OK? Can the PR be merged?

@darnautov darnautov enabled auto-merge (squash) September 3, 2024 08:53
@darnautov
Copy link
Contributor

hi @weizijun , I see you merged the latest main, it will be merged automatically on a green build

@weizijun
Copy link
Contributor Author

hi @weizijun , I see you merged the latest main, it will be merged automatically on a green build

Hi @darnautov how can I run the ci build to get all checks green?

@darnautov
Copy link
Contributor

@elasticmachine merge upstream

@weizijun
Copy link
Contributor Author

/ci

@weizijun
Copy link
Contributor Author

Hi @darnautov, the kibana-ci is not running, is there any problem?

@darnautov
Copy link
Contributor

@elasticmachine merge upstream

@darnautov
Copy link
Contributor

buildkite test this

@darnautov
Copy link
Contributor

darnautov commented Sep 16, 2024 •
edited
Loading

hey @weizijun, you have some failing tests, TS and linting issues. Please check the CI output. Could you please make sure it's fixed and the latest main is merged? After pushing the fixes you can comment buildkite test this on this PR to trigger the CI again.

@darnautov
Copy link
Contributor

hi @weizijun , sure, could you please resolve conflicts with the latest main? I'll make sure the CI is green then

@weizijun
Merge branch 'main' into add-alibaba-inference
2100828 
* main: (176 commits)
  [ML][Rules] Fixes deletion in Check interval input for anomaly detection rule (elastic#193420)
  Bump maximum supported package spec version to 3.2 (elastic#193574)
  [ES|QL] new pattern for `SORT` autocomplete (elastic#193595)
  [Inventory][ECO] Entities page search bar (elastic#193546)
  [Synthetics] Remove extra overview route (elastic#192449)
  [Obs Alerts table] Fix error on clicking alert reason message (elastic#193693)
  [Migrations] Remove tests that are not applicable in 9.x (elastic#193699)
  [EDR Workflows] Set Agent Tamper Protection to false on policy unassignment (elastic#193017)
  [Inventory][ECO] Enable elastic entity model from inventory (elastic#193557)
  [EDR Workflows] The host isolation exception tab is hidden on the basic license if no artifacts (elastic#192562)
  [Entity Analytics] Ensuring definition transforms are managed (elastic#193408)
  [Automatic Import] Do not remove message field for unstructured logs (elastic#193678)
  [Fleet] Add missing permissions for connector package (elastic#193573)
  [Fleet] using @kbn/config-schema part 2 (outputs and other apis)  (elastic#193326)
  [Migrations] Provide testing archives + tooling for migrations integration tests (elastic#193328)
  [ES|QL] Renames the textbased editor to esql editor (elastic#193521)
  [ES|QL] Update function metadata (elastic#193662)
  [Security Solution][Entity Analytics] Scoping the entity store to spaces (elastic#193303)
  [Docs] Update Sharing docs (elastic#190318)
  [ML] AIOps: Move Log Rate Analysis results callout to help popover. (elastic#192243)
  ...

# Conflicts:
#	x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.test.tsx
#	x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx
@weizijun
Copy link
Contributor Author

hi @weizijun , sure, could you please resolve conflicts with the latest main? I'll make sure the CI is green then

I resolve the conflicts, and I see the PR: #193493. I don’t know if there is anything else that needs to be modified in the Alibaba AI Search Inference code.

@darnautov darnautov added v9.0.0 v8.16.0 backport:version Backport to applied version labels labels Sep 24, 2024
@darnautov
Copy link
Contributor

buildkite test this

@darnautov
Copy link
Contributor

@weizijun you still have failing tests. Run locally to check.

node scripts/jest --config=x-pack/plugins/search_inference_endpoints/jest.config.js --runInBand --coverage=false --passWithNoTests

Could you please make sure all of your tests are passing?

@darnautov darnautov self-requested a review September 26, 2024 13:04
weizijun and others added 2 commits September 30, 2024 14:26
@weizijun @darnautov
Update x-pack/plugins/search_inference_endpoints/public/components/al…
296dcc2 
…l_inference_endpoints/render_table_columns/render_service_provider/service_provider.test.tsx

Co-authored-by: Dima Arnautov <[email protected]>
@weizijun
Merge branch 'main' into add-alibaba-inference
609fbde
@darnautov
Copy link
Contributor

buildkite test this

1 similar comment
@darnautov
Copy link
Contributor

buildkite test this

@darnautov
Copy link
Contributor

buildkite test this

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
searchInferenceEndpoints 91 92 +1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
searchInferenceEndpoints 61.6KB 67.1KB +5.5KB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@weizijun
Copy link
Contributor Author

weizijun commented Oct 1, 2024

hi, @darnautov, All checks have passed, can this PR be merged?

darnautov
darnautov approved these changes Oct 1, 2024
View reviewed changes
Copy link
Contributor

@darnautov darnautov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@darnautov
Copy link
Contributor

hey @weizijun! yes, you can merge it now! 🎉

@weizijun
Copy link
Contributor Author

weizijun commented Oct 1, 2024

hey @weizijun! yes, you can merge it now! 🎉

hi, @darnautov, I don't have merge permissions.

@darnautov darnautov merged commit 12205d5 into elastic:main Oct 1, 2024
22 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/11127698139

@weizijun
Copy link
Contributor Author

weizijun commented Oct 1, 2024

Thanks @darnautov !

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 1, 2024
@weizijun
[Inference Endpoints View] Adds Alibaba AI Search to Deletion, search…
f8beee1 
… and filtering of inference endpoints (elastic#190783)

Summary
Adds Alibaba AI Search support to the
elastic#186206
(relevance/inference_endpoints) management list view.

The Elasticsearch PR is:
elastic/elasticsearch#111181

I'm not very familiar with kibana. I made this PR from
elastic#188670.

---------

Co-authored-by: Elastic Machine <[email protected]>
Co-authored-by: Dima Arnautov <[email protected]>
Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit 12205d5)
@kibanamachine kibanamachine mentioned this pull request Oct 1, 2024
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 1, 2024
@kibanamachine @weizijun
[8.x] [Inference Endpoints View] Adds Alibaba AI Search to Deletion, …
5f04936 
…search and filtering of inference endpoints (#190783) (#194597)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Inference Endpoints View] Adds Alibaba AI Search to Deletion, search
and filtering of inference endpoints
(#190783)](#190783)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT
[{"author":{"name":"weizijun","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-01T14:40:18Z","message":"[Inference
Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering
of inference endpoints (#190783)\n\nSummary\r\nAdds Alibaba AI Search
support to
the\r\nhttps://github.com//pull/186206\r\n(relevance/inference_endpoints)
management list view.\r\n\r\nThe Elasticsearch PR
is:\r\nhttps://github.com/elastic/elasticsearch/pull/111181\r\n\r\nI'm
not very familiar with kibana. I made this PR
from\r\nhttps://github.com//pull/188670.\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>\r\nCo-authored-by: Dima
Arnautov <[email protected]>\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"12205d51c5a6ff02737d4312de1ec598f7732608","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement","💝community","v9.0.0","v8.16.0","backport:version"],"title":"[Inference
Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering
of inference
endpoints","number":190783,"url":"https://github.com/elastic/kibana/pull/190783","mergeCommit":{"message":"[Inference
Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering
of inference endpoints (#190783)\n\nSummary\r\nAdds Alibaba AI Search
support to
the\r\nhttps://github.com//pull/186206\r\n(relevance/inference_endpoints)
management list view.\r\n\r\nThe Elasticsearch PR
is:\r\nhttps://github.com/elastic/elasticsearch/pull/111181\r\n\r\nI'm
not very familiar with kibana. I made this PR
from\r\nhttps://github.com//pull/188670.\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>\r\nCo-authored-by: Dima
Arnautov <[email protected]>\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"12205d51c5a6ff02737d4312de1ec598f7732608"}},"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/190783","number":190783,"mergeCommit":{"message":"[Inference
Endpoints View] Adds Alibaba AI Search to Deletion, search and filtering
of inference endpoints (#190783)\n\nSummary\r\nAdds Alibaba AI Search
support to
the\r\nhttps://github.com//pull/186206\r\n(relevance/inference_endpoints)
management list view.\r\n\r\nThe Elasticsearch PR
is:\r\nhttps://github.com/elastic/elasticsearch/pull/111181\r\n\r\nI'm
not very familiar with kibana. I made this PR
from\r\nhttps://github.com//pull/188670.\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>\r\nCo-authored-by: Dima
Arnautov <[email protected]>\r\nCo-authored-by: kibanamachine
<[email protected]>","sha":"12205d51c5a6ff02737d4312de1ec598f7732608"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: weizijun <[email protected]>
@mdefazio mdefazio mentioned this pull request Oct 2, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sphilipse sphilipse sphilipse approved these changes

@darnautov darnautov darnautov approved these changes

Assignees
No one assigned
Labels
backport:version Backport to applied version labels 💝community release_note:enhancement v8.16.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@weizijun @darnautov @kibana-ci @kibanamachine @sphilipse @elasticmachine