Skip to content

Commit 182275f

Browse files
alexeyrodriguezjiapingzengsejliwill-hwang
authored andcommitted
# This is a combination of 67 commits.
# This is the 1st commit message: Tabs and subtab navigation happens through routes. Also added entity visualization within tabs. Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #2: Restore experiment create Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #3: add experiment list view, change existing EvaluationResults view which is a part of experiment create view Signed-off-by: Fen Qin <[email protected]> # This is the commit message #4: add indexes and k selections for experiment_create_view Signed-off-by: Fen Qin <[email protected]> # This is the commit message #5: move index to be part of search configuration Signed-off-by: Fen Qin <[email protected]> # This is the commit message #6: First working experiment detailed view and some fixes on listing pages. * Experiment view page shows queries with their comparison scores. * There is a visual comparison page for specific queries to understand scores. * At the moment there is no retrieval of additional fields. * The navigation to specific items in listing pages was fixed, otherwise it would break when coming from a list route. * Fixed a typo in the index column in listing search configurations. Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #7: First working version of retrieving attributes from objects Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #8: fix code editor to not compact json Signed-off-by: Fen Qin <[email protected]> # This is the commit message #9: fix delete modal typo Signed-off-by: Fen Qin <[email protected]> # This is the commit message #10: add the missing s to pptss Signed-off-by: wrigleyDan <[email protected]> # This is the commit message #11: Metric values are shown with two digits Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #12: Grammar Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #13: Format dates using OpenSearch Dashboards configuration Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #14: Remove unnecessary history parameter Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #15: add search configuration validation panel to create view Signed-off-by: Fen Qin <[email protected]> # This is the commit message #16: Venn diagram of result summary, brittle layout at the moment Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #17: Reverse the column order in the first results list Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #18: Make sure rank circles do not shrink Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #19: Show images on top of the hover pane Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #20: Display query in visual comparison Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #21: Display Search Configuration names as results and show the number of results for which Jaccard and RBO are computed Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #22: Make dashed lines solid and thicker; and make improved/dropped colors the same in right column Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #23: Make field selection control be next to label Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #24: Remove unnecessary comment Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #25: Prepare the visual comparison component for side-by-side visualization # This is the commit message #26: Make tooltip positioning more flexible to enable side by side layout Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #27: Remove dead code Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #28: Modularization of hover pane Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #29: Removing further dead code Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #30: Further refactoring Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #31: Result list modularization Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #32: Modularization of the connection lines component Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #33: Modularized the result columns Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #34: Moved result column to its own component Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #35: Further layout for eyeballing component Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #36: Navigate to list experiments view after experiment creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #37: Fix errors in Search Configuration validation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #38: Quick fix formatting of validation pane Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #39: Make eyeball tool resizable to improve usability Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #40: Hot fix incorrect error reporting in SC creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #41: Hotfix: fix check for empty index in Search Configuration creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #42: Hotfix: attribute resolution was not preserving original query ordering Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #43: change template card names to reflect the experiments we expect in the near future (relevance experiment and hybrid search optimization), fix typo Signed-off-by: wrigleyDan <[email protected]> # This is the commit message #44: The whole thing is relevance, but this is more specific tool Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #45: Revert introduction of CAPS constants to refer to end-points. Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #46: Improve view Search Configuration Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #47: Further adjustments to view pages Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #48: Further improvements in view pages Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #49: Remove dead code Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #50: Limit query set inputs in experiment creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #51: Limit search configuration inputs in experiment creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #52: Remount query view component once queries are loaded Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #53: Use more typed datastructures for experiment view Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #54: Create component to view pairwise experiments in preparation for further experiment types Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #55: These are different types experiments, and we dont really provide a template, or each one is a visual template Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #56: Description that covers both manual entry and sampling Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #57: Help text needs to be complete sentences. Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #58: Tweak text of button. Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #59: Help text comes as sentences. Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #60: Help text comes as sentences. Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #61: Be more specific on what the validation is about. Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #62: Fix the "cancel" feature, Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #63: Wordsmith the results comparison card name Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #64: Wordsmith the placeholder message Signed-off-by: Eric Pugh <[email protected]> # This is the commit message #65: Refactoring of experiment types and add forgotten file Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #66: Use of experiment type of experiment listing Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> # This is the commit message #67: Move former relevance tool to single query comparison Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Remove old dead components Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Error handling Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Simplify passing of dependent values Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> add judgment management pages Signed-off-by: Fen Qin <[email protected]> # Conflicts: # public/components/resource_management_home/resource_management_tabs.tsx support search pipeline selection Signed-off-by: Fen Qin <[email protected]> Fix for pairwise experiments for redo branch Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> First attempt at pointwise experiment view Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Update how experiment types are printed Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> First working evaluation experiment creation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Simplify interface of components in create page Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Add forgotten view page for evaluation experiments Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Restrict number of search configurations for evaluation experiment Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Remove logging Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Summary tables Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> support file picker to upload manual query set with or without referenceAnswer Signed-off-by: Fen Qin <[email protected]> Smarter help text, and require caller to specific number of search configurations Signed-off-by: Eric Pugh <[email protected]> Review help text on forms Signed-off-by: Eric Pugh <[email protected]> respond to feedback on text help messages Signed-off-by: Eric Pugh <[email protected]> Update how we define an optional parameter to meet modern OUI standard Signed-off-by: Eric Pugh <[email protected]> Add optional tag for form fields that ARE optional. Signed-off-by: Eric Pugh <[email protected]> Feedback was that a small portion of query body isnt useful Signed-off-by: Eric Pugh <[email protected]> First version of sidebar navigation Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Add EuiPanel to have a background for Experiment create pages Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Add Template Type enum and add icon mapping Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Experiments sub-menu Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> search configuration to take whole DSL query instead of queryBody Signed-off-by: Fen Qin <[email protected]> fix selected search pipeline config parsing issue Signed-off-by: Fen Qin <[email protected]> fix inline search pipeline validation Signed-off-by: Fen Qin <[email protected]> Expose hybrid optimizer in the left nav and expose place holder page Signed-off-by: Eric Pugh <[email protected]> update experiment type and index name Signed-off-by: Fen Qin <[email protected]> add advanced setting for llm judgment Signed-off-by: Fen Qin <[email protected]> Use this term pointwise, it is not about the source of the judgements Signed-off-by: Eric Pugh <[email protected]> seperate hybrid optimizer into its own form file, event though right today its the same as the pointwise comparison Signed-off-by: Eric Pugh <[email protected]> Try out different naming Signed-off-by: Eric Pugh <[email protected]> Make the run experimient/cancel,back buttons work the same as other screens Signed-off-by: Eric Pugh <[email protected]> Attempt to come up with a tag line Signed-off-by: Eric Pugh <[email protected]> Lighter touch tweaking of labels for judgment: judgments and judgement lists Signed-off-by: Eric Pugh <[email protected]> Lighter touch tweaking of labels for judgment: judgments and judgement lists Signed-off-by: Eric Pugh <[email protected]> Make the run experimient/cancel,back buttons work the same as other screens Signed-off-by: Eric Pugh <[email protected]> Bump to version 3.0.0.0-beta1 (opensearch-project#491) Signed-off-by: Jiaping Zeng <[email protected]> Adding Release Notes for 3.0 beta1 (opensearch-project#492) * Bump to version 3.0.0.0-beta1 Signed-off-by: Jiaping Zeng <[email protected]> * Added release notes for 3.0.0.0-beta1 Signed-off-by: Jiaping Zeng <[email protected]> --------- Signed-off-by: Jiaping Zeng <[email protected]> add cross cluster support for dashboards search relevance (opensearch-project#497) Signed-off-by: will-hwang <[email protected]> bump to 3.0.0 (opensearch-project#505) Signed-off-by: Jiaping Zeng <[email protected]> Add release notes for 3.0.0 (opensearch-project#506) Signed-off-by: Jiaping Zeng <[email protected]> add access control via SRW feature flag in cluster settings Signed-off-by: Fen Qin <[email protected]> Easier to paremeterize colors and make colors of top legend with result columns match Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Further fixing of customization Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Further allowing adjusting eyeballing style Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Temporary style selection control Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Renaming of styles Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> One more color scheme to evaluate Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> Details pane is shown on click rather than on hover Make style selection more discrete Signed-off-by: Alexey Rodriguez Yakushev <[email protected]> fix advanced setting bugs Signed-off-by: Fen Qin <[email protected]> Revert commits from evaluation_lab and rebase with main branch (opensearch-project#525) * Adding Release Notes for 3.0 alpha1 (opensearch-project#487) * Bump to version 3.0.0.0-alpha1 Signed-off-by: Jiaping Zeng <[email protected]> * Bump to version 3.0.0.0-alpha1 Signed-off-by: Jiaping Zeng <[email protected]> * Adding Release Notes for 3.0 alpha1 Signed-off-by: Jiaping Zeng <[email protected]> * Update release-notes/opensearch-dashboards-search-relevance.release-notes-3.0.0.0-alpha1.md Co-authored-by: Sean Li <[email protected]> Signed-off-by: Jiaping Zeng <[email protected]> --------- Signed-off-by: Jiaping Zeng <[email protected]> Co-authored-by: Sean Li <[email protected]> * Fix remote integ tests (opensearch-project#488) * Bump to version 3.0.0.0-alpha1 Signed-off-by: Jiaping Zeng <[email protected]> * Bump to version 3.0.0.0-alpha1 Signed-off-by: Jiaping Zeng <[email protected]> * updating actions/cache Signed-off-by: Jiaping Zeng <[email protected]> * updated java version to 21 Signed-off-by: Jiaping Zeng <[email protected]> --------- Signed-off-by: Jiaping Zeng <[email protected]> * Bump to version 3.0.0.0-beta1 (opensearch-project#491) Signed-off-by: Jiaping Zeng <[email protected]> * Adding Release Notes for 3.0 beta1 (opensearch-project#492) * Bump to version 3.0.0.0-beta1 Signed-off-by: Jiaping Zeng <[email protected]> * Added release notes for 3.0.0.0-beta1 Signed-off-by: Jiaping Zeng <[email protected]> --------- Signed-off-by: Jiaping Zeng <[email protected]> * add cross cluster support for dashboards search relevance (opensearch-project#497) Signed-off-by: will-hwang <[email protected]> * bump to 3.0.0 (opensearch-project#505) Signed-off-by: Jiaping Zeng <[email protected]> * Add release notes for 3.0.0 (opensearch-project#506) Signed-off-by: Jiaping Zeng <[email protected]> * Mockup for new search-relevance experience (opensearch-project#489) Signed-off-by: Fen Qin <[email protected]> * Component to enable search-relevance and opensearch API calls (opensearch-project#490) * Add code formatting Signed-off-by: Fen Qin <[email protected]> * Add switch to old and new search relevance workbench experience Signed-off-by: Fen Qin <[email protected]> * change name conventions for APIs Signed-off-by: Fen Qin <[email protected]> * add search-relevance backend router Signed-off-by: Fen Qin <[email protected]> --------- Signed-off-by: Fen Qin <[email protected]> * Add DEVELOPER_GUIDE.md for router setup + fix missing files (opensearch-project#493) * fix missing route service files Signed-off-by: Fen Qin <[email protected]> * add DEVELOPER_GUIDE.md for middleware layer router setup for APIs Signed-off-by: Fen Qin <[email protected]> --------- Signed-off-by: Fen Qin <[email protected]> * Revert "Add DEVELOPER_GUIDE.md for router setup + fix missing files (opensearch-project#493)" This reverts commit d2b8810. * Revert "Component to enable search-relevance and opensearch API calls (opensearch-project#490)" This reverts commit 4e3be12. * Revert "Mockup for new search-relevance experience (opensearch-project#489)" This reverts commit 72b85cb. --------- Signed-off-by: Jiaping Zeng <[email protected]> Signed-off-by: will-hwang <[email protected]> Signed-off-by: Fen Qin <[email protected]> Co-authored-by: Jiaping Zeng <[email protected]> Co-authored-by: Sean Li <[email protected]> Co-authored-by: Will Hwang <[email protected]>
1 parent 883aaa4 commit 182275f

File tree

91 files changed

+5516
-19381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+5516
-19381
lines changed

.github/workflows/verify-binary-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
22

33
on: [push, pull_request]
44
env:
5-
OPENSEARCH_VERSION: '3.0.0-alpha1'
5+
OPENSEARCH_VERSION: '3.0.0'
66
CI: 1
77
# avoid warnings like "tput: No value for $TERM and no -T specified"
88
TERM: xterm

common/index.ts

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
export const PLUGIN_ID = 'searchRelevance';
7-
export const PLUGIN_NAME = 'Search Relevance';
6+
export const PLUGIN_ID = 'searchRelevanceWorkbench';
7+
export const PLUGIN_NAME = 'Search Relevance Workbench';
88
export const COMPARE_SEARCH_RESULTS_TITLE = 'Compare Search Results';
9-
export const SEARCH_RELEVANCE_WORKBENCH = 'Search Relevance Workbench';
109

1110
export enum ServiceEndpoints {
1211
// OpenSearch node APIs
1312
GetIndexes = '/api/relevancy/search/indexes',
1413
GetPipelines = '/api/relevancy/search/pipelines',
1514
GetSearchResults = '/api/relevancy/search',
15+
GetSingleSearchResults = '/api/relevancy/single_search',
1616
GetStats = '/api/relevancy/stats',
17+
GetClusterSettings = '/api/relevancy/cluster_settings',
1718

1819
// Search Relevance node APIs
1920
QuerySets = '/api/relevancy/query_sets',
@@ -22,39 +23,15 @@ export enum ServiceEndpoints {
2223
Experiments = '/api/relevancy/experiments',
2324
}
2425

25-
/**
26-
* BACKEND SEARCH RELEVANCE APIs
27-
*/
2826
export enum BackendEndpoints {
2927
QuerySets = '/_plugins/search_relevance/query_sets',
3028
SearchConfigurations = '/_plugins/search_relevance/search_configurations',
3129
Judgments = '/_plugins/search_relevance/judgments',
3230
Experiments = '/_plugins/search_relevance/experiments',
3331
}
3432

35-
/**
36-
* OPEN SEARCH CORE APIs
37-
*/
3833
export const SEARCH_API = '/_search';
3934

40-
/**
41-
* Node APIs
42-
*/
43-
export const BASE_NODE_API_PATH = '/api/relevancy';
44-
45-
// OpenSearch node APIs
46-
export const INDEX_NODE_API_PATH = `${BASE_NODE_API_PATH}/search/indexes`;
47-
export const SEARCH_PIPELINE_NODE_API_PATH = `${BASE_NODE_API_PATH}/search/pipelines`;
48-
export const SEARCH_NODE_API_PATH = `${BASE_NODE_API_PATH}/search`;
49-
export const STATS_NODE_API_PATH = `${BASE_NODE_API_PATH}/stats`;
50-
51-
export const DEFAULT_HEADERS = {
52-
'Content-Type': 'application/json',
53-
Accept: 'application/json',
54-
'User-Agent': 'OpenSearch-Dashboards',
55-
'osd-xsrf': true,
56-
};
57-
5835
// Query1 for the left search and Query2 for the right search page
5936
export const QUERY_NUMBER_ONE = '1';
6037
export const QUERY_NUMBER_TWO = '2';

opensearch_dashboards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "searchRelevanceDashboards",
3-
"version": "3.0.0.0-alpha1",
3+
"version": "3.0.0.0",
44
"opensearchDashboardsVersion": "3.0.0",
55
"server": true,
66
"ui": true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "searchRelevanceDashboards",
3-
"version": "3.0.0.0-alpha1",
3+
"version": "3.0.0.0",
44
"main": "./public/index.ts",
55
"license": "Apache-2.0",
66
"scripts": {

public/application.tsx

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,38 @@ import { DataSourceManagementPluginSetup } from '../../../src/plugins/data_sourc
1010
import { SearchRelevanceApp } from './components/app';
1111
import { AppPluginStartDependencies } from './types';
1212
import { OpenSearchDashboardsContextProvider } from '../../../src/plugins/opensearch_dashboards_react/public';
13+
import { ConfigProvider } from './contexts/date_format_context';
1314

1415
export const renderApp = (
1516
coreStart: CoreStart,
1617
{ navigation, dataSource }: AppPluginStartDependencies,
17-
{ element, setHeaderActionMenu, history }: AppMountParameters,
18+
{ element, setHeaderActionMenu }: AppMountParameters,
1819
dataSourceManagement: DataSourceManagementPluginSetup
1920
) => {
20-
const { notifications, http, chrome, savedObjects, application } = coreStart;
21+
const { notifications, http, chrome, savedObjects, application, uiSettings } = coreStart;
22+
const props = {
23+
notifications,
24+
http,
25+
navigation,
26+
chrome,
27+
savedObjects,
28+
dataSourceEnabled: !!dataSource,
29+
dataSourceManagement,
30+
setActionMenu: setHeaderActionMenu,
31+
application,
32+
};
2133

2234
ReactDOM.render(
2335
<OpenSearchDashboardsContextProvider services={coreStart}>
24-
<SearchRelevanceApp
25-
notifications={notifications}
26-
http={http}
27-
navigation={navigation}
28-
chrome={chrome}
29-
savedObjects={savedObjects}
36+
<ConfigProvider
37+
uiSettings={uiSettings}
3038
dataSourceEnabled={!!dataSource}
31-
setActionMenu={setHeaderActionMenu}
3239
dataSourceManagement={dataSourceManagement}
33-
application={application}
34-
history={history}
35-
/>
40+
setHeaderActionMenu={setHeaderActionMenu}
41+
navigation={navigation}
42+
>
43+
<SearchRelevanceApp {...props} />
44+
</ConfigProvider>
3645
</OpenSearchDashboardsContextProvider>,
3746
element
3847
);

public/components/api/search_relevance_testing_page.tsx

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)