fix: set direct docs

Author: Joan Martinez

jina/clients/base/http.py

@@ -219,7 +219,7 @@ def _result_handler(result):
 
                 resp = DataRequest(r_str)
                 if da is not None:
-                    resp.data.docs = da
+                    resp.direct_docs = da
 
                 callback_exec(
                     response=resp,

jina/clients/mixin.py

@@ -414,7 +414,7 @@ async def _get_results(*args, **kwargs):
                     if return_responses:
                         result.append(resp)
                     else:
-                        result.extend(resp.data.docs)
+                        result.extend(resp.docs)
             if return_results:
                 if not return_responses and is_singleton and len(result) == 1:
                     return result[0]
@@ -538,7 +538,7 @@ async def post(
                     is_singleton = True
                     result.document_array_cls = DocList[return_type]
             if not return_responses:
-                ret_docs = result.data.docs
+                ret_docs = result.docs
                 if is_singleton and len(ret_docs) == 1:
                     yield ret_docs[0]
                 else:

jina/serve/runtimes/worker/http_fastapi_app.py

@@ -99,16 +99,16 @@ async def post(body: input_model, response: Response):
             data = body.data
             if isinstance(data, list):
                 if not docarray_v2:
-                    req.data.docs = DocumentArray.from_pydantic_model(data)
+                    req.direct_docs = DocumentArray.from_pydantic_model(data)
                 else:
                     req.document_array_cls = DocList[input_doc_model]
-                    req.data.docs = DocList[input_doc_list_model](data)
+                    req.direct_docs = DocList[input_doc_list_model](data)
             else:
                 if not docarray_v2:
-                    req.data.docs = DocumentArray([Document.from_pydantic_model(data)])
+                    req.direct_docs = DocumentArray([Document.from_pydantic_model(data)])
                 else:
                     req.document_array_cls = DocList[input_doc_model]
-                    req.data.docs = DocList[input_doc_list_model]([data])
+                    req.direct_docs = DocList[input_doc_list_model]([data])
                 if body.header is None:
                     req.header.request_id = req.docs[0].id
 
@@ -152,10 +152,10 @@ async def streaming_get(request: Request = None, body: input_doc_model = None):
             req = DataRequest()
             req.header.exec_endpoint = endpoint_path
             if not docarray_v2:
-                req.data.docs = DocumentArray([body])
+                req.direct_docs = DocumentArray([body])
             else:
                 req.document_array_cls = DocList[input_doc_model]
-                req.data.docs = DocList[input_doc_model]([body])
+                req.direct_docs = DocList[input_doc_model]([body])
             event_generator = _gen_dict_documents(await caller(req))
             return EventSourceResponse(event_generator)
 

jina/types/request/data.py

@@ -114,6 +114,8 @@ def __init__(
         self._pb_body = None
         self._document_array_cls = DocumentArray
         self._data = None
+        # to be used to bypass proto extra transforms
+        self.direct_docs = None
 
         try:
             if isinstance(request, jina_pb2.DataRequestProto):
@@ -275,7 +277,10 @@ def docs(self) -> 'DocumentArray':
         """Get the :class: `DocumentArray` with sequence `data.docs` as content.
 
         .. # noqa: DAR201"""
-        return self.data.docs
+        if self.direct_docs is not None:
+            return self.direct_docs
+        else:
+            return self.data.docs
 
     @property
     def data(self) -> 'DataRequest._DataContent':
@@ -441,6 +446,8 @@ def __init__(
         self._document_cls = Document
         self.buffer = None
         self._data = None
+        # to be used to bypass proto extra transforms
+        self.direct_doc = None
 
         try:
             if isinstance(request, jina_pb2.SingleDocumentRequestProto):
@@ -606,7 +613,10 @@ def doc(self) -> 'Document':
         """Get the :class: `DocumentArray` with sequence `data.docs` as content.
 
         .. # noqa: DAR201"""
-        return self.data.doc
+        if self.direct_doc is not None:
+            return self.direct_doc
+        else:
+            return self.data.doc
 
     @property
     def data(self) -> 'SingleDocumentRequest._DataContent':