Skip to content

Commit 57c0761

Browse files
authored
Change to use pre trained model (#1151)
Signed-off-by: Lin Wang <wonglam@amazon.com>
1 parent af53f24 commit 57c0761

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

cypress/integration/plugins/ml-commons-dashboards/overview_spec.js

+13-25
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,28 @@
44
*/
55
import { MLC_URL, MLC_DASHBOARD_API } from '../../../utils/constants';
66

7+
const UPLOAD_MODEL_NAME = 'huggingface/sentence-transformers/all-MiniLM-L6-v2';
8+
79
if (Cypress.env('ML_COMMONS_DASHBOARDS_ENABLED')) {
810
describe('MLC Overview page', () => {
911
let uploadedModelId;
1012
let uploadedModelLoadedError;
11-
const uploadModelName = `traced_small_model-${new Date()
12-
.getTime()
13-
.toString(34)}`;
13+
1414
before(() => {
1515
// Disable only_run_on_ml_node to avoid model upload error in case of cluster no ml nodes
1616
cy.disableOnlyRunOnMLNode();
1717
cy.disableNativeMemoryCircuitBreaker();
18-
cy.enableRegisterModelViaURL();
1918
cy.wait(1000);
2019

2120
cy.registerModelGroup({
22-
name: 'model-group',
21+
name: `model-group-${new Date().getTime().toString(34)}`,
2322
})
2423
.then(({ model_group_id }) =>
25-
cy.uploadModelByUrl({
26-
name: uploadModelName,
27-
version: '1.0.0',
28-
model_format: 'TORCH_SCRIPT',
29-
model_task_type: 'text_embedding',
24+
cy.registerModel({
25+
name: UPLOAD_MODEL_NAME,
26+
version: '1.0.1',
3027
model_group_id,
31-
model_content_hash_value:
32-
'e13b74006290a9d0f58c1376f9629d4ebc05a0f9385f40db837452b167ae9021',
33-
model_config: {
34-
model_type: 'bert',
35-
embedding_dimension: 768,
36-
framework_type: 'sentence_transformers',
37-
all_config:
38-
'{"architectures":["BertModel"],"max_position_embeddings":512,"model_type":"bert","num_attention_heads":12,"num_hidden_layers":6}',
39-
},
40-
url: 'https://github.com/opensearch-project/ml-commons/blob/2.x/ml-algorithms/src/test/resources/org/opensearch/ml/engine/algorithms/text_embedding/traced_small_model.zip?raw=true',
28+
model_format: 'TORCH_SCRIPT',
4129
})
4230
)
4331
.then(({ task_id: taskId }) =>
@@ -80,13 +68,13 @@ if (Cypress.env('ML_COMMONS_DASHBOARDS_ENABLED')) {
8068
cy.contains('h1', 'Overview');
8169
cy.contains('h2', 'Deployed models');
8270

83-
cy.get('[aria-label="Search by name or ID"]').type(uploadModelName);
71+
cy.get('[aria-label="Search by name or ID"]').type(uploadedModelId);
8472

8573
cy.contains(uploadedModelId)
8674
.closest('tr')
8775
.contains(uploadedModelLoadedError ? 'Not responding' : 'Responding')
8876
.closest('tr')
89-
.contains(uploadModelName);
77+
.contains(UPLOAD_MODEL_NAME);
9078

9179
cy.contains('h1', 'Overview');
9280
cy.contains('h2', 'Deployed models');
@@ -95,14 +83,14 @@ if (Cypress.env('ML_COMMONS_DASHBOARDS_ENABLED')) {
9583
it('should open preview panel after view detail button click', () => {
9684
cy.visit(MLC_URL.OVERVIEW);
9785

98-
cy.get('[aria-label="Search by name or ID"]').type(uploadModelName);
86+
cy.get('[aria-label="Search by name or ID"]').type(uploadedModelId);
9987

10088
cy.contains(uploadedModelId)
10189
.closest('tr')
10290
.find('[aria-label="view detail"]')
10391
.click();
10492

105-
cy.contains('.euiFlyoutHeader > h3', uploadModelName);
93+
cy.contains('.euiFlyoutHeader > h3', UPLOAD_MODEL_NAME);
10694
cy.contains('.euiFlyoutBody', uploadedModelId);
10795
});
10896

@@ -122,7 +110,7 @@ if (Cypress.env('ML_COMMONS_DASHBOARDS_ENABLED')) {
122110

123111
cy.visit(MLC_URL.OVERVIEW);
124112

125-
cy.get('[aria-label="Search by name or ID"]').type(uploadModelName);
113+
cy.get('[aria-label="Search by name or ID"]').type(uploadedModelId);
126114

127115
cy.contains(uploadedModelId)
128116
.closest('tr')

cypress/utils/plugins/ml-commons-dashboards/commands.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Cypress.Commands.add('cyclingCheckTask', ({ taskId, rejectOnError = true }) =>
3030
)
3131
);
3232

33-
Cypress.Commands.add('uploadModelByUrl', (body) =>
33+
Cypress.Commands.add('registerModel', (body) =>
3434
cy
3535
.request({
3636
method: 'POST',

cypress/utils/plugins/ml-commons-dashboards/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const MLC_API_BASE = `${BACKEND_BASE_PATH}/_plugins/_ml`;
2222

2323
export const MLC_API = {
2424
MODEL_BASE: `${MLC_API_BASE}/models`,
25-
MODEL_UPLOAD: `${MLC_API_BASE}/models/_upload`,
25+
MODEL_UPLOAD: `${MLC_API_BASE}/models/_register`,
2626
MODEL_GROUP_REGISTER: `${MLC_API_BASE}/model_groups/_register`,
2727
TASK_BASE: `${MLC_API_BASE}/tasks`,
2828
};

0 commit comments

Comments
 (0)