Change vers in build to generate stubs with correct protobuf vers (#1759)

* Change vers in build to generate stubs with correct protobuf vers

* Fix imports

* More grpc versions for better compatibility

---------

Co-authored-by: Dirk Kulawiak <[email protected]>

Author: tsmith023

weaviate/proto/v1/__init__.py

@@ -19,14 +19,22 @@ def get_protobuf_version() -> version.Version:
 
 
 pb_version = get_protobuf_version()
-if pb_version >= version.parse("1.70.0"):
-    from weaviate.proto.v1.v6.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
-elif pb_version >= version.parse("1.66.2"):
-    from weaviate.proto.v1.v52.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
-elif pb_version >= version.parse("1.60.0"):
-    from weaviate.proto.v1.v51.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
-elif pb_version >= version.parse("1.50.0"):
-    from weaviate.proto.v1.v4.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+if pb_version >= version.parse("1.72.1"):
+    from weaviate.proto.v1.v1721.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.71.0"):
+    from weaviate.proto.v1.v1710.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.69.0"):
+    from weaviate.proto.v1.v1690.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.67.0"):
+    from weaviate.proto.v1.v1670.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.65.1"):
+    from weaviate.proto.v1.v1651.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.63.0"):
+    from weaviate.proto.v1.v1630.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.61.3"):
+    from weaviate.proto.v1.v1613.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
+elif pb_version >= version.parse("1.59.5"):
+    from weaviate.proto.v1.v1595.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, properties_pb2, search_get_pb2, tenants_pb2
 else:
     raise RuntimeError(f"Unsupported grpcio-tools version: {pb_version}. Only versions 1.50.0+ and <1.80 are supported.")
 

weaviate/proto/v1/regen.sh

@@ -2,7 +2,7 @@
 
 set -e  # Exit on any error
 
-echo "This script compiles protos for Protobuf 4, 5.1, 5.2, and 6 versions."
+echo "This script compiles protos for Protobuf 4, 5, and 6 versions."
 
 # Get script directory and navigate to project root
 SCRIPT_DIR="${0%/*}"
@@ -24,22 +24,15 @@ source "$PROTO_VENV/bin/activate"
 pip install --upgrade pip
 
 compile_protos() {
-    local version=$1
-    local output_dir="$PROJECT_ROOT/$version"
+
+
+    local pip_version=${1}
+    local version=v${1//./}
+
+    local output_dir="$PROJECT_ROOT/${version}"
 
     echo "Installing protobuf $version and grpcio-tools..."
-    if [ "$version" = "v4" ]; then
-        pip install "grpcio-tools==1.59.5"
-    elif [ "$version" = "v51" ]; then
-        pip install "grpcio-tools==1.60.0"
-    elif [ "$version" = "v52" ]; then
-        pip install "grpcio-tools==1.66.2"
-    elif [ "$version" = "v6" ]; then
-        pip install "grpcio-tools==1.70.0"
-    else
-        echo "Unsupported version: $version"
-        exit 1
-    fi
+    pip install "grpcio-tools==$pip_version"
 
     echo "Compiling protos for Protobuf $version... in $output_dir"
 
@@ -67,10 +60,19 @@ compile_protos() {
     fi
 }
 
+# v4
+compile_protos "1.59.5"
+compile_protos "1.61.3"   # no earlier versions on pypi
+
+# v5
+compile_protos "1.63.0"
+compile_protos "1.65.1"  # .0 was yanked
+compile_protos "1.67.0"
+compile_protos "1.69.0"
+compile_protos "1.71.0"
 
-for version in "v4" "v51" "v52" "v6"; do
-   compile_protos "$version"
-done
+#v6
+compile_protos "1.72.1" # .0 was yanked
 
 deactivate
 rm -rf "$PROTO_VENV"

weaviate/proto/v1/v4/__init__.py weaviate/proto/v1/v1595/__init__.pyweaviate/proto/v1/v4/__init__.py renamed to weaviate/proto/v1/v1595/__init__.py

@@ -1,5 +1,5 @@
-from weaviate.proto.v1.v4.v1 import base_pb2 as _base_pb2
-from weaviate.proto.v1.v4.v1 import base_search_pb2 as _base_search_pb2
+from weaviate.proto.v1.v1595.v1 import base_pb2 as _base_pb2
+from weaviate.proto.v1.v1595.v1 import base_search_pb2 as _base_search_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message