From b55c26a6cb15dad4667d49e3d3359034bdef792a Mon Sep 17 00:00:00 2001 From: Rohit P Date: Wed, 13 Nov 2024 18:55:13 -0800 Subject: [PATCH] [BUG] Reverse all proto version changes. (#3135) ## Description of changes *Summarize the changes made by this PR.* - Improvements & Bug fixes - Fix staging protobuf issue. - Reverts all proto version changes. And re-generated protos. ## Test plan *How are these changes tested?* - [ ] Tests pass locally with `pytest` for python, `yarn test` for js, `cargo test` for rust ## Documentation Changes *Are all docstrings for user-facing APIs updated if required? Do we need to make documentation changes in the [docs repository](https://github.com/chroma-core/docs)?* n/a --- chromadb/proto/chroma_pb2.py | 3 +-- chromadb/proto/coordinator_pb2.py | 3 +-- chromadb/proto/coordinator_pb2_grpc.py | 14 +++++++------- chromadb/proto/logservice_pb2.py | 3 +-- chromadb/proto/logservice_pb2_grpc.py | 14 +++++++------- pyproject.toml | 2 +- requirements.txt | 3 +-- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/chromadb/proto/chroma_pb2.py b/chromadb/proto/chroma_pb2.py index 55cf1548bdd..3debec1b598 100644 --- a/chromadb/proto/chroma_pb2.py +++ b/chromadb/proto/chroma_pb2.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: chromadb/proto/chroma.proto -# Protobuf Python Version: 5.27.2 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool diff --git a/chromadb/proto/coordinator_pb2.py b/chromadb/proto/coordinator_pb2.py index f0a76eec24e..1947b77ff55 100644 --- a/chromadb/proto/coordinator_pb2.py +++ b/chromadb/proto/coordinator_pb2.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: chromadb/proto/coordinator.proto -# Protobuf Python Version: 5.27.2 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool diff --git a/chromadb/proto/coordinator_pb2_grpc.py b/chromadb/proto/coordinator_pb2_grpc.py index fcc004d9b39..ab6844b855f 100644 --- a/chromadb/proto/coordinator_pb2_grpc.py +++ b/chromadb/proto/coordinator_pb2_grpc.py @@ -6,8 +6,10 @@ from chromadb.proto import coordinator_pb2 as chromadb_dot_proto_dot_coordinator__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -GRPC_GENERATED_VERSION = '1.66.1' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -17,12 +19,10 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( - f'The grpc package installed is at version {GRPC_VERSION},' - + f' but the generated code in chromadb/proto/coordinator_pb2_grpc.py depends on' - + f' grpcio>={GRPC_GENERATED_VERSION}.' - + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' - + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + warnings.warn( + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) diff --git a/chromadb/proto/logservice_pb2.py b/chromadb/proto/logservice_pb2.py index 8df87552c9a..6724352d107 100644 --- a/chromadb/proto/logservice_pb2.py +++ b/chromadb/proto/logservice_pb2.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: chromadb/proto/logservice.proto -# Protobuf Python Version: 5.27.2 +# Protobuf Python Version: 5.26.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool diff --git a/chromadb/proto/logservice_pb2_grpc.py b/chromadb/proto/logservice_pb2_grpc.py index 675d3c0b624..1531f128756 100644 --- a/chromadb/proto/logservice_pb2_grpc.py +++ b/chromadb/proto/logservice_pb2_grpc.py @@ -5,8 +5,10 @@ from chromadb.proto import logservice_pb2 as chromadb_dot_proto_dot_logservice__pb2 -GRPC_GENERATED_VERSION = '1.66.1' +GRPC_GENERATED_VERSION = '1.63.0' GRPC_VERSION = grpc.__version__ +EXPECTED_ERROR_RELEASE = '1.65.0' +SCHEDULED_RELEASE_DATE = 'June 25, 2024' _version_not_supported = False try: @@ -16,12 +18,10 @@ _version_not_supported = True if _version_not_supported: - raise RuntimeError( - f'The grpc package installed is at version {GRPC_VERSION},' - + f' but the generated code in chromadb/proto/logservice_pb2_grpc.py depends on' - + f' grpcio>={GRPC_GENERATED_VERSION}.' - + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' - + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + warnings.warn( + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},' + + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.', + RuntimeWarning ) diff --git a/pyproject.toml b/pyproject.toml index f1691024e31..ef12ada7522 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ 'overrides >= 7.3.1', 'importlib-resources', 'graphlib_backport >= 1.0.3; python_version < "3.9"', - 'grpcio >= 1.66.1', + 'grpcio >= 1.58.0', 'protobuf >= 5.26.1, < 6.0dev', 'bcrypt >= 4.0.1', 'typer >= 0.9.0', diff --git a/requirements.txt b/requirements.txt index 21b2cf2f169..b7b621faf2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ bcrypt>=4.0.1 chroma-hnswlib==0.7.6 fastapi>=0.95.2 graphlib_backport==1.0.3; python_version < '3.9' -grpcio>=1.66.1 +grpcio>=1.58.0 httpx>=0.27.0 importlib-resources kubernetes>=28.1.0 @@ -17,7 +17,6 @@ orjson>=3.9.12, < 3.10.6 # 3.10.7 is currently missing a wheel for x86 glibc overrides>=7.3.1 posthog>=2.4.0 pydantic>=1.9 -protobuf>=5.26.1,<6.0dev pypika>=0.48.9 PyYAML>=6.0.0 rich>=10.11.0