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

CV2-5080 update request model alegre calls to use presto-based alegre querying #2014

Closed
wants to merge 2 commits into from
Closed

CV2-5080 update request model alegre calls to use presto-based alegre querying #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817d16e
CV2-5080 update request model alegre calls to use presto-based alegre…
DGaffney Aug 29, 2024
5d372e8
retrigger tests
DGaffney Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def attach_to_similar_request!(alegre_limit = 20)
models_thresholds = self.text_similarity_settings.reject{ |_k, v| v['min_words'] > words }
if models_thresholds.count > 0
params = { text: media.quote, models: models_thresholds.keys, per_model_threshold: models_thresholds.transform_values{ |v| v['threshold'] }, limit: alegre_limit, context: context }
similar_request_id = ::Bot::Alegre.request('post', '/text/similarity/search/', params)&.dig('result').to_a.collect{ |result| result&.dig('_source', 'context', 'request_id').to_i }.find{ |id| id != 0 && id < self.id }
similar_request_id = ::Bot::Alegre.get_async_with_params(params, "text")&.dig('result').to_a.collect{ |result| result&.dig('_source', 'context', 'request_id').to_i }.find{ |id| id != 0 && id < self.id }
end
# elsif ['UploadedImage', 'UploadedAudio', 'UploadedVideo'].include?(media.type)
# threshold = 0.85 #FIXME: Should be feed setting
Expand Down Expand Up @@ -194,7 +194,7 @@ def self.send_to_alegre(id)
models: request.text_similarity_settings.keys(),
context: context
}
::Bot::Alegre.request('post', '/text/similarity/', params)
::Bot::Alegre.get_async_with_params(params, "text")
# elsif ['UploadedImage', 'UploadedAudio', 'UploadedVideo'].include?(media.type)
# type = media.type.gsub(/^Uploaded/, '').downcase
# url = media.file&.file&.public_url
Expand Down
4 changes: 2 additions & 2 deletions test/models/request_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def setup
m2 = Media.create! type: 'Claim', quote: 'Foo bar foo bar 2'
r2 = create_request media: m2, feed: f
response = { 'result' => [{ '_source' => { 'context' => { 'request_id' => r1.id } } }] }
Bot::Alegre.stubs(:request).with('post', '/text/similarity/search/', { text: 'Foo bar foo bar 2', models: [::Bot::Alegre::ELASTICSEARCH_MODEL, ::Bot::Alegre::MEAN_TOKENS_MODEL], per_model_threshold: {::Bot::Alegre::ELASTICSEARCH_MODEL => 0.85, ::Bot::Alegre::MEAN_TOKENS_MODEL => 0.9}, limit: 20, context: { feed_id: f.id } }).returns(response)
Bot::Alegre.stubs(:request).with('post', '/similarity/async/text/', { text: 'Foo bar foo bar 2', models: [::Bot::Alegre::ELASTICSEARCH_MODEL, ::Bot::Alegre::MEAN_TOKENS_MODEL], per_model_threshold: {::Bot::Alegre::ELASTICSEARCH_MODEL => 0.85, ::Bot::Alegre::MEAN_TOKENS_MODEL => 0.9}, limit: 20, context: { feed_id: f.id } }).returns(response)
r2.attach_to_similar_request!
#Alegre should be called with ES and vector model for request with 4 or more words
assert_equal r1, r2.reload.similar_to_request
Expand All @@ -155,7 +155,7 @@ def setup
m2 = Media.create! type: 'Claim', quote: 'Foo bar 2'
r2 = create_request media: m2, feed: f
response = { 'result' => [{ '_source' => { 'context' => { 'request_id' => r1.id } } }] }
Bot::Alegre.stubs(:request).with('post', '/text/similarity/search/', { text: 'Foo bar 2', models: [::Bot::Alegre::MEAN_TOKENS_MODEL], per_model_threshold: {::Bot::Alegre::MEAN_TOKENS_MODEL => 0.9}, limit: 20, context: { feed_id: f.id } }).returns(response)
Bot::Alegre.stubs(:request).with('post', '/similarity/async/text/', { text: 'Foo bar 2', models: [::Bot::Alegre::MEAN_TOKENS_MODEL], per_model_threshold: {::Bot::Alegre::MEAN_TOKENS_MODEL => 0.9}, limit: 20, context: { feed_id: f.id } }).returns(response)
r2.attach_to_similar_request!
#Alegre should only be called with vector models for 2 or 3 word request
assert_equal r1, r2.reload.similar_to_request
Expand Down
Loading