Merge branch 'master' of https://github.com/jina-ai/jina into jina-v-…

…raft

jina/proto/docarray.proto

@@ -3,7 +3,7 @@ syntax = "proto3";
 package docarray;
 
 /*
- this file is just a placeholder for the DA coming from jina._docarray dependency
+ this file is just a placeholder for the DA coming from docarray dependency
  */
 message DocumentArrayProto {
 

jina/serve/executors/__init__.py

@@ -318,7 +318,7 @@ def write_endpoints(self):
         if hasattr(self, '_write_methods'):
             endpoints = []
             for endpoint, fn in self.requests.items():
-                if fn.__name__ in self._write_methods:
+                if fn.fn.__name__ in self._write_methods:
                     endpoints.append(endpoint)
             return endpoints
         else:

jina/serve/executors/decorators.py

@@ -207,20 +207,22 @@ def __call__(self, *args, **kwargs):
 
 
 def requests(
-        func: Optional[
-            Callable[
-                [
-                    'DocumentArray',
-                    Dict,
-                    'DocumentArray',
-                    List['DocumentArray'],
-                    List['DocumentArray'],
-                ],
-                Optional[Union['DocumentArray', Dict]],
-            ]
-        ] = None,
-        *,
-        on: Optional[Union[str, Sequence[str]]] = None,
+    func: Optional[
+        Callable[
+            [
+                'DocumentArray',
+                Dict,
+                'DocumentArray',
+                List['DocumentArray'],
+                List['DocumentArray'],
+            ],
+            Optional[Union['DocumentArray', Dict]],
+        ]
+    ] = None,
+    *,
+    on: Optional[Union[str, Sequence[str]]] = None,
+    request_schema: Optional[Type[DocumentArray]] = None,
+    response_schema: Optional[Type[DocumentArray]] = None,
 ):
     """
     `@requests` defines the endpoints of an Executor. It has a keyword `on=` to
@@ -322,7 +324,9 @@ def _unwrap_write_decorator(self, fn):
             else:
                 return fn
 
-        def _inject_owner_attrs(self, owner, name):
+        def _inject_owner_attrs(
+            self, owner, name, request_schema_arg, response_schema_arg
+        ):
             if not hasattr(owner, 'requests'):
                 owner.requests = {}
 
@@ -351,7 +355,7 @@ def _inject_owner_attrs(self, owner, name):
             else:
                 owner.requests_by_class[owner.__name__][
                     on or __default_endpoint__
-                    ] = self.fn
+                ] = fn_with_schema
 
             setattr(owner, name, self.fn)
 

jina/serve/runtimes/worker/request_handling.py

@@ -3,7 +3,7 @@
 import json
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
-from docarray import DocumentArray
+from jina._docarray import DocumentArray
 from jina.constants import __default_endpoint__
 from jina.excepts import BadConfigSource
 from jina.importer import ImportExtensions

jina/serve/streamer.py

@@ -4,8 +4,7 @@
 import threading
 from typing import TYPE_CHECKING, Dict, List, Optional, Sequence, Union
 
-from docarray import DocumentArray
-
+from jina._docarray import DocumentArray
 from jina.logging.logger import JinaLogger
 from jina.serve.networking import GrpcConnectionPool
 from jina.serve.runtimes.gateway.graph.topology_graph import TopologyGraph