refactor: do not return response object (#6195)

.github/workflows/cd.yml

@@ -402,7 +402,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
 
       - name: Upload wheels as artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: dist/*.whl
 

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - uses: wagoid/commitlint-github-action@v4
+      - uses: wagoid/commitlint-github-action@v3
 
   lint-flake-8:
     runs-on: ubuntu-latest
@@ -691,7 +691,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
 
       - name: Upload wheels as artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: dist/*.whl
 

.github/workflows/force-release.yml

@@ -142,7 +142,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
           
       - name: Upload wheels as artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: dist/*.whl
 

jina/clients/base/helper.py

@@ -178,8 +178,9 @@ async def send_message(self, request: 'Request'):
                         r_str = await response.json()
                     except aiohttp.ContentTypeError:
                         r_str = await response.text()
+                    r_status = response.status
                     handle_response_status(response.status, r_str, self.url)
-                    return response
+                    return r_status, r_str
             except (ValueError, ConnectionError, BadClient, aiohttp.ClientError, aiohttp.ClientConnectionError) as err:
                 self.logger.debug(f'Got an error: {err} sending POST to {self.url} in attempt {attempt}/{self.max_attempts}')
                 await retry.wait_or_raise_err(

jina/clients/base/http.py

@@ -193,9 +193,7 @@ def _result_handler(result):
             async for response in streamer.stream(
                 request_iterator=request_iterator, results_in_order=results_in_order
             ):
-                r_status = response.status
-
-                r_str = await response.json()
+                r_status, r_str = response
                 handle_response_status(r_status, r_str, url)
 
                 da = None

tests/unit/clients/test_helper.py

@@ -37,8 +37,8 @@ async def test_http_clientlet():
         ) as iolet:
             request = _new_data_request('/', None, {'a': 'b'})
             assert request.header.target_executor == ''
-            r = await iolet.send_message(request)
-            response = DataRequest(await r.json())
+            r_status, r_json = await iolet.send_message(request)
+            response = DataRequest(r_json)
     assert response.header.exec_endpoint == '/'
     assert response.parameters == {'a': 'b'}
 
@@ -55,7 +55,8 @@ async def test_http_clientlet_target():
             request = _new_data_request('/', 'nothing', {'a': 'b'})
             assert request.header.target_executor == 'nothing'
             r = await iolet.send_message(request)
-            response = DataRequest(await r.json())
+            r_status, r_json = r
+            response = DataRequest(r_json)
     assert response.header.exec_endpoint == '/'
     assert response.parameters == {'a': 'b'}