docarray · hanxiao · Aug 26, 2022 · May 26, 2022 · May 26, 2022 · May 26, 2022
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -40,7 +40,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install wheel
-          pip install --no-cache-dir ".[full,test]"
+          # pip does not properly resolve dependency versions with syntax pip install --no-cache-dir ".[test,full]"
+          pip install --no-cache-dir ".[test]"
+          pip install --no-cache-dir ".[full]"
           sudo apt-get install libsndfile1
       - name: Test
         id: test

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,9 +60,9 @@ jobs:
         run: |
           pip install flake8
           # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,jina/resources/
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,docarray/proto/pb/docarray_pb2.py,docarray/proto/pb2/docarray_pb2.py
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,jina/resources/
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,docarray/proto/pb/docarray_pb2.py,docarray/proto/pb2/docarray_pb2.py
 
   check-black:
     runs-on: ubuntu-latest
@@ -129,7 +129,11 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install wheel
-          pip install --no-cache-dir ".[full,test]"
+          # test install jina with new proto version
+          pip install git+https://github.com/jina-ai/jina.git@feat-bump-protobuf
+          # pip does not properly resolve dependency versions with syntax pip install --no-cache-dir ".[test,full]"
+          pip install --no-cache-dir ".[test]"
+          pip install --no-cache-dir ".[full]"
           sudo apt-get install libsndfile1
       - name: Test
         id: test

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
   hooks:
   - id: black
     types: [python]
-    exclude: ^(docarray/proto/docarray_pb2.py|docs/|docarray/resources/)
+    exclude: ^(docarray/proto/pb/docarray_pb2.py|docarray/proto/pb2/docarray_pb2.py|docs/|docarray/resources/)
     args:
       - -S
 - repo: https://github.com/asottile/blacken-docs

diff --git a/docarray/__init__.py b/docarray/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.15.5'
+__version__ = '0.16.0'
 
 import os
 

diff --git a/docarray/helper.py b/docarray/helper.py
@@ -168,7 +168,7 @@ def get_full_version() -> Dict:
     return {
         'docarray': __version__,
         'protobuf': google.protobuf.__version__,
-        'proto-backend': api_implementation._default_implementation_type,
+        'proto-backend': api_implementation.Type(),
         'python': platform.python_version(),
         'platform': platform.system(),
         'platform-release': platform.release(),

diff --git a/docarray/proto/build-proto.sh b/docarray/proto/build-proto.sh
@@ -2,16 +2,25 @@
 set -ex
 
 # Do NOT use this directly, use jinaai/protogen image
+# use jinaai/protogen:3.21 in order to use compiler version == 21 (creates pb/docarray_pb2.py)
+# and use jinaai/protogen:latest to use compiler version <= 20 (creates pb2/docarray_pb2.py)
+# make sure to use jinaai/protogen:3.21 to avoid overriting the module
 #
-# current dir: docarray root (the one with README.md)
+# current dir: docarray/docarray
 # run the following in bash:
 # docker run -v $(pwd)/proto:/jina/proto jinaai/protogen
+# finally, set back owner of the generated files using: sudo chown -R $(id -u ${USER}):$(id -g ${USER}) .
 
 SRC_DIR=./
-SRC_NAME=docarray.proto
+MODULE=docarray
+SRC_NAME="${MODULE}.proto"
+COMP_OUT_NAME="${MODULE}_pb2.py"
+
+OUT_FOLDER="${2:-pb2}/"
+
 VER_FILE=../__init__.py
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -ne 1 ] && [ "$#" -ne 2 ]; then
     echo "Error: Please specify the [PATH_TO_GRPC_PYTHON_PLUGIN], refer more details at " \
       "https://docarray.jina.ai/"
     printf "\n"
@@ -25,4 +34,4 @@ PLUGIN_PATH=${1}  # /Volumes/TOSHIBA-4T/Documents/grpc/bins/opt/grpc_python_plug
 
 printf "\e[1;33mgenerating protobuf and grpc python interface\e[0m\n"
 
-protoc -I ${SRC_DIR} --python_out=${SRC_DIR} ${SRC_DIR}${SRC_NAME}
+protoc -I ${SRC_DIR} --python_out="${SRC_DIR}${OUT_FOLDER}" ${SRC_DIR}${SRC_NAME}