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

[FIX] Semantic search: fix wrong output when response is None #826

Merged
merged 1 commit into from
May 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions orangecontrib/text/semantic_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,7 @@ def __call__(
for chunk in chunks_:
chunks.append([chunk, queries_enc])

# temporary callback - will be changed when ServerEmbedderCommunicator
# change callback - return proportion instead bool
ticks = iter(np.linspace(0.0, 1.0, len(chunks)))

def cb(success=True):
if success:
callback(next(ticks))

result_ = self._server_communicator.embedd_data(chunks, processed_callback=cb)
result_ = self._server_communicator.embedd_data(chunks, callback=callback)
if result_ is None:
return [None] * len(texts)

Expand All @@ -93,7 +85,7 @@ def cb(success=True):
for res_chunk, orig_chunk in zip(result_, chunks):
if res_chunk is None:
# when embedder fails (Timeout or other error) result will be None
result.extend([None] * len(orig_chunk))
result.extend([None] * len(orig_chunk[0]))
else:
result.extend(res_chunk)

Expand Down
7 changes: 6 additions & 1 deletion orangecontrib/text/tests/test_semantic_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ def test_none_result(self):
result = self.semantic_search(self.corpus.documents, QUERIES)
self.assertEqual(result, IDEAL_RESPONSE[:-1] + [None])

@patch(PATCH_METHOD, make_dummy_post(None))
def test_all_none(self):
result = self.semantic_search(self.corpus.documents * 10, QUERIES)
self.assertListEqual(result, [None] * len(self.corpus.documents) * 10)

@patch(PATCH_METHOD, make_dummy_post(RESPONSE[0]))
def test_success_chunks(self):
num_docs = len(self.corpus.documents)
Expand All @@ -129,4 +134,4 @@ def test_success_chunks(self):


if __name__ == "__main__":
unittest.main()
unittest.main()