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.

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

[Backport 2.x] add new data fields in the memory layer and update tests #1753

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 01cf00c from #1730

* add new data fields in the memory layer and update tests

Signed-off-by: Xun Zhang <xunzh@amazon.com>

* add more tests coverage and address comments

Signed-off-by: Xun Zhang <xunzh@amazon.com>

* address comments and more tests

Signed-off-by: Xun Zhang <xunzh@amazon.com>

---------

Signed-off-by: Xun Zhang <xunzh@amazon.com>
(cherry picked from commit 01cf00c)
@ylwu-amzn
Copy link
Collaborator

@Zhangxunmt IT failed, take a look ?

52 tests completed, 1 failed, 10 skipped
Tests with failures:
 - org.opensearch.ml.rest.RestMemoryGetConversationsActionIT.testGetConversations_nextPage


=== Standard output of node `node{:opensearch-ml-plugin:integTest-0}` ===
�    ? errors and warnings from D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\logs\opensearch.stdout.log ?

=== Standard error of node `node{:opensearch-ml-plugin:integTest-0}` ===
� WARN ][o.o.g.DanglingIndicesState] [integTest-0] gateway.auto_import_dangling_indices is disabled, dangling indices will not be automatically detected or imported and must be managed manually
� WARN ][o.o.d.FileBasedSeedHostsProvider] [integTest-0] expected, but did not find, a dynamic hosts list at [D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\config\unicast_hosts.txt]
� ERROR][o.o.m.a.MLModelAutoReDeployer] [integTest-0] Failed to query need undeploy models, no action will be performed
�   ? repeated 42 times ?
� WARN ][r.suppressed             ] [integTest-0] path: /_plugins/_ml/models/111222333, params: {model_id=111222333}
�  org.opensearch.ml.common.exception.MLResourceNotFoundException: Fail to find model
�  	at org.opensearch.ml.action.models.GetModelTransportAction.lambda$doExecute$4(GetModelTransportAction.java:126) [opensearch-ml-2.12.0.0-SNAPSHOT.jar:2.12.0.0-SNAPSHOT]

@dhrubo-os
Copy link
Collaborator

@Zhangxunmt IT failed, take a look ?

52 tests completed, 1 failed, 10 skipped
Tests with failures:
 - org.opensearch.ml.rest.RestMemoryGetConversationsActionIT.testGetConversations_nextPage


=== Standard output of node `node{:opensearch-ml-plugin:integTest-0}` ===
�    ? errors and warnings from D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\logs\opensearch.stdout.log ?

=== Standard error of node `node{:opensearch-ml-plugin:integTest-0}` ===
� WARN ][o.o.g.DanglingIndicesState] [integTest-0] gateway.auto_import_dangling_indices is disabled, dangling indices will not be automatically detected or imported and must be managed manually
� WARN ][o.o.d.FileBasedSeedHostsProvider] [integTest-0] expected, but did not find, a dynamic hosts list at [D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\config\unicast_hosts.txt]
� ERROR][o.o.m.a.MLModelAutoReDeployer] [integTest-0] Failed to query need undeploy models, no action will be performed
�   ? repeated 42 times ?
� WARN ][r.suppressed             ] [integTest-0] path: /_plugins/_ml/models/111222333, params: {model_id=111222333}
�  org.opensearch.ml.common.exception.MLResourceNotFoundException: Fail to find model
�  	at org.opensearch.ml.action.models.GetModelTransportAction.lambda$doExecute$4(GetModelTransportAction.java:126) [opensearch-ml-2.12.0.0-SNAPSHOT.jar:2.12.0.0-SNAPSHOT]

This is usually a flaky test. @HenryL27 did you get time to look at this? Thanks

Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Attention: 36 lines in your changes are missing coverage. Please review.

Comparison is base (16e2cdf) 81.31% compared to head (ee339f5) 81.71%.

Files Patch % Lines
...opensearch/ml/common/conversation/Interaction.java 42.85% 13 Missing and 7 partials ⚠️
...y/index/OpenSearchConversationalMemoryHandler.java 57.14% 6 Missing ⚠️
.../action/conversation/CreateInteractionRequest.java 89.79% 2 Missing and 3 partials ⚠️
...earch/ml/common/conversation/ConversationMeta.java 69.23% 2 Missing and 2 partials ⚠️
...conversation/CreateInteractionTransportAction.java 83.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x    #1753      +/-   ##
============================================
+ Coverage     81.31%   81.71%   +0.39%     
- Complexity     4372     4411      +39     
============================================
  Files           425      425              
  Lines         17478    17637     +159     
  Branches       1849     1862      +13     
============================================
+ Hits          14213    14412     +199     
+ Misses         2539     2477      -62     
- Partials        726      748      +22     
Flag Coverage Δ
ml-commons 81.71% <82.77%> (+0.39%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Zhangxunmt
Copy link
Collaborator

@Zhangxunmt IT failed, take a look ?

52 tests completed, 1 failed, 10 skipped
Tests with failures:
 - org.opensearch.ml.rest.RestMemoryGetConversationsActionIT.testGetConversations_nextPage


=== Standard output of node `node{:opensearch-ml-plugin:integTest-0}` ===
�    ? errors and warnings from D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\logs\opensearch.stdout.log ?

=== Standard error of node `node{:opensearch-ml-plugin:integTest-0}` ===
� WARN ][o.o.g.DanglingIndicesState] [integTest-0] gateway.auto_import_dangling_indices is disabled, dangling indices will not be automatically detected or imported and must be managed manually
� WARN ][o.o.d.FileBasedSeedHostsProvider] [integTest-0] expected, but did not find, a dynamic hosts list at [D:\a\ml-commons\ml-commons\plugin\build\testclusters\integTest-0\config\unicast_hosts.txt]
� ERROR][o.o.m.a.MLModelAutoReDeployer] [integTest-0] Failed to query need undeploy models, no action will be performed
�   ? repeated 42 times ?
� WARN ][r.suppressed             ] [integTest-0] path: /_plugins/_ml/models/111222333, params: {model_id=111222333}
�  org.opensearch.ml.common.exception.MLResourceNotFoundException: Fail to find model
�  	at org.opensearch.ml.action.models.GetModelTransportAction.lambda$doExecute$4(GetModelTransportAction.java:126) [opensearch-ml-2.12.0.0-SNAPSHOT.jar:2.12.0.0-SNAPSHOT]

This is usually a flaky test. @HenryL27 did you get time to look at this? Thanks

@ylwu-amzn @dhrubo-os I rerun the test and it passed. Can you help approve this backport PR? Fixing the flaky test shouldn't be included in this backport.

@Zhangxunmt Zhangxunmt merged commit a881bc7 into 2.x Dec 12, 2023
9 of 13 checks passed
@github-actions github-actions bot deleted the backport/backport-1730-to-2.x branch December 12, 2023 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants