Skip to content

Commit

Permalink
fix: fix override of empty docs (#4350)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoanFM committed Feb 16, 2022
1 parent d566e5b commit 3420f5e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
1 change: 0 additions & 1 deletion jina/orchestrate/flow/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,6 @@ def client(self) -> 'BaseClient':
host=self.host,
port=self.port_expose,
protocol=self.protocol,
results_as_docarray=True,
)
kwargs.update(self._common_kwargs)
return Client(**kwargs)
Expand Down
2 changes: 1 addition & 1 deletion jina/types/request/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def docs(self, value: DocumentArray):
:param value: a DocumentArray
"""
if value:
if value is not None:
self._loaded_doc_array = None
self._content.docs.CopyFrom(value.to_protobuf())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ def foo(self, docs, **kwargs):
return docs


class ClearDocsExecutor(Executor):
@requests
def foo(self, docs, **kwargs):
docs.clear()


@pytest.fixture()
def logger():
return JinaLogger('data request handler')
Expand Down Expand Up @@ -112,3 +118,19 @@ async def test_data_request_handler_change_docs_from_partial_requests(logger):
assert len(response.docs) == 10 * NUM_PARTIAL_REQUESTS
for doc in response.docs:
assert doc.text == 'changed document'


@pytest.mark.asyncio
async def test_data_request_handler_clear_docs(logger):
args = set_pod_parser().parse_args(['--uses', 'ClearDocsExecutor'])
handler = DataRequestHandler(args, logger)

req = list(
request_generator(
'/', DocumentArray([Document(text='input document') for _ in range(10)])
)
)[0]
assert len(req.docs) == 10
response = await handler.handle(requests=[req])

assert len(response.docs) == 0

0 comments on commit 3420f5e

Please sign in to comment.