Remove support for protobuf < 4

Author: gabrys

codegen/Dockerfile.proto_v3

@@ -14,4 +14,4 @@ RUN pip install grpcio-tools==1.60 \
 COPY docker.generate-proto.sh /app/
 RUN chmod +x /app/docker.generate-proto.sh
 
-ENTRYPOINT ["./docker.generate-proto.sh", "/app/src", "protobuf_v4plus"]
+ENTRYPOINT ["./docker.generate-proto.sh", "/app/src"]

codegen/Dockerfile.proto_v4plus

@@ -5,18 +5,17 @@
 set -euxo pipefail
 
 OUTPUT_DIR_BASE="${1:-}"
-OUTPUT_SUBMODULE_DIR="${2:-}"
 
-if [ -z "${OUTPUT_DIR_BASE}" ] || [ -z "${OUTPUT_SUBMODULE_DIR}" ]; then
-    echo "Usage: $0 <output_src_dir> <output_submodule_dir>"
+if [ -z "${OUTPUT_DIR_BASE}" ]; then
+    echo "Usage: $0 <output_src_dir>"
     exit 1
 fi
 
-mkdir -p "${OUTPUT_DIR_BASE}/neptune_api/proto/$OUTPUT_SUBMODULE_DIR"
+mkdir -p "${OUTPUT_DIR_BASE}/neptune_api/proto"
 
 python -m grpc_tools.protoc \
-  --python_out="${OUTPUT_DIR_BASE}/neptune_api/proto/$OUTPUT_SUBMODULE_DIR" \
-  --mypy_out="${OUTPUT_DIR_BASE}/neptune_api/proto/$OUTPUT_SUBMODULE_DIR" \
+  --python_out="${OUTPUT_DIR_BASE}/neptune_api/proto" \
+  --mypy_out="${OUTPUT_DIR_BASE}/neptune_api/proto" \
   --proto_path="./proto/" \
   "./proto/google_rpc/"*".proto" \
   "./proto/neptune_pb/ingest/v1/"*".proto" \
@@ -26,7 +25,7 @@ python -m grpc_tools.protoc \
 # Note that we're passing the protoc-path argument to protol, which makes sure
 # it's using the same protoc as above, instead of a system-wide installation.
 protol --create-package --in-place \
-  --python-out "${OUTPUT_DIR_BASE}/neptune_api/proto/$OUTPUT_SUBMODULE_DIR" \
+  --python-out "${OUTPUT_DIR_BASE}/neptune_api/proto" \
   protoc \
   --protoc-path="python -m grpc_tools.protoc" \
   --proto-path "./proto" \

codegen/docker.generate-proto.sh

@@ -13,12 +13,6 @@ cd "$script_dir"
 
 src_dir="$script_dir/../src/"
 
-docker build -t neptune-api-gen-proto_v3 -f Dockerfile.proto_v3 .
-docker run --rm \
-  -v "$script_dir/proto":"/app/proto" \
-  -v "$src_dir":"/app/src" \
-  neptune-api-gen-proto_v3
-
 docker build -t neptune-api-gen-proto_v4plus -f Dockerfile.proto_v4plus .
 docker run --rm \
   -v "$script_dir/proto":"/app/proto" \

codegen/generate-proto.sh

@@ -14,7 +14,7 @@ httpx = { version = ">=0.15.4,<0.28.2", extras = ["http2"] }
 attrs = ">=21.3.0"
 python-dateutil = "^2.8.0"
 PyJWT = "^2.0.0"
-protobuf = ">=3.19.6,<7"
+protobuf = ">=4.21.1,<7"
 
 [tool.poetry]
 name = "neptune-api"

pyproject.toml

@@ -1,11 +0,0 @@
-import importlib.metadata
-import sys
-
-PROTOBUF_VERSION = importlib.metadata.version("protobuf").split('.')
-
-if PROTOBUF_VERSION[0] == '3':
-    target_module = "protobuf_v3"
-else:
-    target_module = "protobuf_v4plus"
-
-sys.modules["neptune_api.proto"] = importlib.import_module(f"neptune_api.proto.{target_module}")

src/neptune_api/proto/__init__.py

@@ -1 +1,2 @@
-from .protobuf_v3 import google_rpc, neptune_pb
+from . import google_rpc
+from . import neptune_pb