Skip to content

Commit bba4d27

Browse files
committed
feat: update match_service proto for new embedding metadata fields
1 parent a5167ab commit bba4d27

4 files changed

Lines changed: 52 additions & 144 deletions

File tree

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
Steps to update the pb2 files before bazel generation is supported
22
Track bazel progress here: https://github.com/googleapis/python-aiplatform/issues/3037
33

4-
1 . Ensure that your environment is using python 3.10 or older which is needed
5-
for step 2. Consider using Anaconda to create envs with older python version.
4+
1 . Use protobuf version that matches the other pb files in the repo, currently 4.25.3.
65

7-
2. Use `pip install grpcio-tools==1.59.0` or newer to support protobuf 5.x
8-
9-
3. Copy the file from
6+
2. Copy the file from
107
`https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto`
118
into `google/rpc/status.proto`. Make sure that `google/rpc/status.proto`
129
exists relative to the root of the python-aiplatform repo.
1310

14-
4. In the root directory python-aiplatform run
11+
3. In the root directory python-aiplatform run
1512
```
1613
python -m grpc_tools.protoc --proto_path=. --python_out=. --grpc_python_out=. google/cloud/aiplatform/matching_engine/_protos/match_service.proto
1714
```
1815

19-
5. After running the command, change the import statements manually
16+
4. After running the command, change the import statements manually
2017
```
2118
from google.cloud.aiplatform.matching_engine._protos import match_service_pb2 as google_dot_cloud_dot_aiplatform_dot_matching__engine_dot___protos_dot_match__service__pb2
2219
```
@@ -28,8 +25,8 @@ Also, run a find a replace to change
2825
`google_dot_cloud_dot_aiplatform_dot_matching__engine_dot___protos_dot_match__service__pb2`
2926
to `match_service_pb2`
3027

31-
6. Run `black` on both files to reformat the code
28+
5. Run `black` on both files to reformat the code
3229

33-
7. Remove the status.proto added in step 3
30+
6. Remove the status.proto added in step 3
3431

35-
8. Create a Pull Request in GitHub
32+
7. Create a Pull Request in GitHub

google/cloud/aiplatform/matching_engine/_protos/match_service_pb2.py

Lines changed: 45 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,15 @@
1515
#
1616
# -*- coding: utf-8 -*-
1717
# Generated by the protocol buffer compiler. DO NOT EDIT!
18-
# NO CHECKED-IN PROTOBUF GENCODE
1918
# source: google/cloud/aiplatform/matching_engine/_protos/match_service.proto
20-
# Protobuf Python Version: 6.31.1
19+
# Protobuf Python Version: 4.25.3
2120
"""Generated protocol buffer code."""
21+
2222
from google.protobuf import descriptor as _descriptor
2323
from google.protobuf import descriptor_pool as _descriptor_pool
24-
from google.protobuf import runtime_version as _runtime_version
2524
from google.protobuf import symbol_database as _symbol_database
2625
from google.protobuf.internal import builder as _builder
27-
_runtime_version.ValidateProtobufRuntimeVersion(
28-
_runtime_version.Domain.PUBLIC,
29-
6,
30-
31,
31-
1,
32-
'',
33-
'google/cloud/aiplatform/matching_engine/_protos/match_service.proto'
34-
)
26+
3527
# @@protoc_insertion_point(imports)
3628

3729
_sym_db = _symbol_database.Default()
@@ -40,48 +32,49 @@
4032
from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
4133
from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
4234

43-
44-
from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
45-
from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
46-
47-
48-
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\nCgoogle/cloud/aiplatform/matching_engine/_protos/match_service.proto\x12$google.cloud.aiplatform.container.v1\x1a\x17google/rpc/status.proto\x1a\x1cgoogle/protobuf/struct.proto\"7\n\x0fSparseEmbedding\x12\x11\n\tfloat_val\x18\x01 \x03(\x02\x12\x11\n\tdimension\x18\x02 \x03(\x03\"\xff\x04\n\x0cMatchRequest\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x11\n\tfloat_val\x18\x02 \x03(\x02\x12O\n\x10sparse_embedding\x18\x0c \x01(\x0b\x32\x35.google.cloud.aiplatform.container.v1.SparseEmbedding\x12\x45\n\x03rrf\x18\r \x01(\x0b\x32\x36.google.cloud.aiplatform.container.v1.MatchRequest.RRFH\x00\x12\x15\n\rnum_neighbors\x18\x03 \x01(\x05\x12\x42\n\trestricts\x18\x04 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Namespace\x12Q\n\x11numeric_restricts\x18\x0b \x03(\x0b\x32\x36.google.cloud.aiplatform.container.v1.NumericNamespace\x12,\n$per_crowding_attribute_num_neighbors\x18\x05 \x01(\x05\x12\x1c\n\x14\x61pprox_num_neighbors\x18\x06 \x01(\x05\x12-\n%leaf_nodes_to_search_percent_override\x18\x07 \x01(\x05\x12.\n&fraction_leaf_nodes_to_search_override\x18\t \x01(\x01\x12\x19\n\x11\x65mbedding_enabled\x18\x08 \x01(\x08\x12\x14\n\x0c\x65mbedding_id\x18\n \x01(\t\x1a\x14\n\x03RRF\x12\r\n\x05\x61lpha\x18\x01 \x01(\x02\x42\t\n\x07ranking\"\xe3\x02\n\tEmbedding\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfloat_val\x18\x02 \x03(\x02\x12O\n\x10sparse_embedding\x18\x06 \x01(\x0b\x32\x35.google.cloud.aiplatform.container.v1.SparseEmbedding\x12\x42\n\trestricts\x18\x03 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Namespace\x12Q\n\x11numeric_restricts\x18\x05 \x03(\x0b\x32\x36.google.cloud.aiplatform.container.v1.NumericNamespace\x12\x1a\n\x12\x63rowding_attribute\x18\x04 \x01(\x03\x12\x33\n\x12\x65mbedding_metadata\x18\x07 \x01(\x0b\x32\x17.google.protobuf.Struct\"\x83\x02\n\rMatchResponse\x12N\n\x08neighbor\x18\x01 \x03(\x0b\x32<.google.cloud.aiplatform.container.v1.MatchResponse.Neighbor\x12\x43\n\nembeddings\x18\x02 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Embedding\x1a]\n\x08Neighbor\x12\n\n\x02id\x18\x01 \x01(\t\x12\x10\n\x08\x64istance\x18\x02 \x01(\x01\x12\x17\n\x0fsparse_distance\x18\x04 \x01(\x01\x12\x1a\n\x12\x63rowding_attribute\x18\x03 \x01(\x03\"B\n\x19\x42\x61tchGetEmbeddingsRequest\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x03(\t\"a\n\x1a\x42\x61tchGetEmbeddingsResponse\x12\x43\n\nembeddings\x18\x01 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Embedding\"\x95\x02\n\x11\x42\x61tchMatchRequest\x12\x63\n\x08requests\x18\x01 \x03(\x0b\x32Q.google.cloud.aiplatform.container.v1.BatchMatchRequest.BatchMatchRequestPerIndex\x1a\x9a\x01\n\x19\x42\x61tchMatchRequestPerIndex\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x44\n\x08requests\x18\x02 \x03(\x0b\x32\x32.google.cloud.aiplatform.container.v1.MatchRequest\x12\x1c\n\x14low_level_batch_size\x18\x03 \x01(\x05\"\xa2\x02\n\x12\x42\x61tchMatchResponse\x12\x66\n\tresponses\x18\x01 \x03(\x0b\x32S.google.cloud.aiplatform.container.v1.BatchMatchResponse.BatchMatchResponsePerIndex\x1a\xa3\x01\n\x1a\x42\x61tchMatchResponsePerIndex\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x46\n\tresponses\x18\x02 \x03(\x0b\x32\x33.google.cloud.aiplatform.container.v1.MatchResponse\x12\"\n\x06status\x18\x03 \x01(\x0b\x32\x12.google.rpc.Status\"D\n\tNamespace\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\x0c\x61llow_tokens\x18\x02 \x03(\t\x12\x13\n\x0b\x64\x65ny_tokens\x18\x03 \x03(\t\"\xb4\x02\n\x10NumericNamespace\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\tvalue_int\x18\x02 \x01(\x03H\x00\x12\x15\n\x0bvalue_float\x18\x03 \x01(\x02H\x00\x12\x16\n\x0cvalue_double\x18\x04 \x01(\x01H\x00\x12K\n\x02op\x18\x05 \x01(\x0e\x32?.google.cloud.aiplatform.container.v1.NumericNamespace.Operator\"x\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\x08\n\x04LESS\x10\x01\x12\x0e\n\nLESS_EQUAL\x10\x02\x12\t\n\x05\x45QUAL\x10\x03\x12\x11\n\rGREATER_EQUAL\x10\x04\x12\x0b\n\x07GREATER\x10\x05\x12\r\n\tNOT_EQUAL\x10\x06\x42\x07\n\x05Value2\xa2\x03\n\x0cMatchService\x12r\n\x05Match\x12\x32.google.cloud.aiplatform.container.v1.MatchRequest\x1a\x33.google.cloud.aiplatform.container.v1.MatchResponse\"\x00\x12\x81\x01\n\nBatchMatch\x12\x37.google.cloud.aiplatform.container.v1.BatchMatchRequest\x1a\x38.google.cloud.aiplatform.container.v1.BatchMatchResponse\"\x00\x12\x99\x01\n\x12\x42\x61tchGetEmbeddings\x12?.google.cloud.aiplatform.container.v1.BatchGetEmbeddingsRequest\x1a@.google.cloud.aiplatform.container.v1.BatchGetEmbeddingsResponse\"\x00\x62\x06proto3')
35+
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
36+
b'\nCgoogle/cloud/aiplatform/matching_engine/_protos/match_service.proto\x12$google.cloud.aiplatform.container.v1\x1a\x17google/rpc/status.proto\x1a\x1cgoogle/protobuf/struct.proto"7\n\x0fSparseEmbedding\x12\x11\n\tfloat_val\x18\x01 \x03(\x02\x12\x11\n\tdimension\x18\x02 \x03(\x03"\xff\x04\n\x0cMatchRequest\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x11\n\tfloat_val\x18\x02 \x03(\x02\x12O\n\x10sparse_embedding\x18\x0c \x01(\x0b\x32\x35.google.cloud.aiplatform.container.v1.SparseEmbedding\x12\x45\n\x03rrf\x18\r \x01(\x0b\x32\x36.google.cloud.aiplatform.container.v1.MatchRequest.RRFH\x00\x12\x15\n\rnum_neighbors\x18\x03 \x01(\x05\x12\x42\n\trestricts\x18\x04 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Namespace\x12Q\n\x11numeric_restricts\x18\x0b \x03(\x0b\x32\x36.google.cloud.aiplatform.container.v1.NumericNamespace\x12,\n$per_crowding_attribute_num_neighbors\x18\x05 \x01(\x05\x12\x1c\n\x14\x61pprox_num_neighbors\x18\x06 \x01(\x05\x12-\n%leaf_nodes_to_search_percent_override\x18\x07 \x01(\x05\x12.\n&fraction_leaf_nodes_to_search_override\x18\t \x01(\x01\x12\x19\n\x11\x65mbedding_enabled\x18\x08 \x01(\x08\x12\x14\n\x0c\x65mbedding_id\x18\n \x01(\t\x1a\x14\n\x03RRF\x12\r\n\x05\x61lpha\x18\x01 \x01(\x02\x42\t\n\x07ranking"\xe3\x02\n\tEmbedding\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfloat_val\x18\x02 \x03(\x02\x12O\n\x10sparse_embedding\x18\x06 \x01(\x0b\x32\x35.google.cloud.aiplatform.container.v1.SparseEmbedding\x12\x42\n\trestricts\x18\x03 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Namespace\x12Q\n\x11numeric_restricts\x18\x05 \x03(\x0b\x32\x36.google.cloud.aiplatform.container.v1.NumericNamespace\x12\x1a\n\x12\x63rowding_attribute\x18\x04 \x01(\x03\x12\x33\n\x12\x65mbedding_metadata\x18\x07 \x01(\x0b\x32\x17.google.protobuf.Struct"\x83\x02\n\rMatchResponse\x12N\n\x08neighbor\x18\x01 \x03(\x0b\x32<.google.cloud.aiplatform.container.v1.MatchResponse.Neighbor\x12\x43\n\nembeddings\x18\x02 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Embedding\x1a]\n\x08Neighbor\x12\n\n\x02id\x18\x01 \x01(\t\x12\x10\n\x08\x64istance\x18\x02 \x01(\x01\x12\x17\n\x0fsparse_distance\x18\x04 \x01(\x01\x12\x1a\n\x12\x63rowding_attribute\x18\x03 \x01(\x03"B\n\x19\x42\x61tchGetEmbeddingsRequest\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x03(\t"a\n\x1a\x42\x61tchGetEmbeddingsResponse\x12\x43\n\nembeddings\x18\x01 \x03(\x0b\x32/.google.cloud.aiplatform.container.v1.Embedding"\x95\x02\n\x11\x42\x61tchMatchRequest\x12\x63\n\x08requests\x18\x01 \x03(\x0b\x32Q.google.cloud.aiplatform.container.v1.BatchMatchRequest.BatchMatchRequestPerIndex\x1a\x9a\x01\n\x19\x42\x61tchMatchRequestPerIndex\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x44\n\x08requests\x18\x02 \x03(\x0b\x32\x32.google.cloud.aiplatform.container.v1.MatchRequest\x12\x1c\n\x14low_level_batch_size\x18\x03 \x01(\x05"\xa2\x02\n\x12\x42\x61tchMatchResponse\x12\x66\n\tresponses\x18\x01 \x03(\x0b\x32S.google.cloud.aiplatform.container.v1.BatchMatchResponse.BatchMatchResponsePerIndex\x1a\xa3\x01\n\x1a\x42\x61tchMatchResponsePerIndex\x12\x19\n\x11\x64\x65ployed_index_id\x18\x01 \x01(\t\x12\x46\n\tresponses\x18\x02 \x03(\x0b\x32\x33.google.cloud.aiplatform.container.v1.MatchResponse\x12"\n\x06status\x18\x03 \x01(\x0b\x32\x12.google.rpc.Status"D\n\tNamespace\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\x0c\x61llow_tokens\x18\x02 \x03(\t\x12\x13\n\x0b\x64\x65ny_tokens\x18\x03 \x03(\t"\xb4\x02\n\x10NumericNamespace\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\tvalue_int\x18\x02 \x01(\x03H\x00\x12\x15\n\x0bvalue_float\x18\x03 \x01(\x02H\x00\x12\x16\n\x0cvalue_double\x18\x04 \x01(\x01H\x00\x12K\n\x02op\x18\x05 \x01(\x0e\x32?.google.cloud.aiplatform.container.v1.NumericNamespace.Operator"x\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\x08\n\x04LESS\x10\x01\x12\x0e\n\nLESS_EQUAL\x10\x02\x12\t\n\x05\x45QUAL\x10\x03\x12\x11\n\rGREATER_EQUAL\x10\x04\x12\x0b\n\x07GREATER\x10\x05\x12\r\n\tNOT_EQUAL\x10\x06\x42\x07\n\x05Value2\xa2\x03\n\x0cMatchService\x12r\n\x05Match\x12\x32.google.cloud.aiplatform.container.v1.MatchRequest\x1a\x33.google.cloud.aiplatform.container.v1.MatchResponse"\x00\x12\x81\x01\n\nBatchMatch\x12\x37.google.cloud.aiplatform.container.v1.BatchMatchRequest\x1a\x38.google.cloud.aiplatform.container.v1.BatchMatchResponse"\x00\x12\x99\x01\n\x12\x42\x61tchGetEmbeddings\x12?.google.cloud.aiplatform.container.v1.BatchGetEmbeddingsRequest\x1a@.google.cloud.aiplatform.container.v1.BatchGetEmbeddingsResponse"\x00\x62\x06proto3'
37+
)
4938

5039
_globals = globals()
5140
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
52-
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.cloud.aiplatform.matching_engine._protos.match_service_pb2', _globals)
53-
if not _descriptor._USE_C_DESCRIPTORS:
54-
DESCRIPTOR._loaded_options = None
55-
_globals['_SPARSEEMBEDDING']._serialized_start=164
56-
_globals['_SPARSEEMBEDDING']._serialized_end=219
57-
_globals['_MATCHREQUEST']._serialized_start=222
58-
_globals['_MATCHREQUEST']._serialized_end=861
59-
_globals['_MATCHREQUEST_RRF']._serialized_start=830
60-
_globals['_MATCHREQUEST_RRF']._serialized_end=850
61-
_globals['_EMBEDDING']._serialized_start=864
62-
_globals['_EMBEDDING']._serialized_end=1219
63-
_globals['_MATCHRESPONSE']._serialized_start=1222
64-
_globals['_MATCHRESPONSE']._serialized_end=1481
65-
_globals['_MATCHRESPONSE_NEIGHBOR']._serialized_start=1388
66-
_globals['_MATCHRESPONSE_NEIGHBOR']._serialized_end=1481
67-
_globals['_BATCHGETEMBEDDINGSREQUEST']._serialized_start=1483
68-
_globals['_BATCHGETEMBEDDINGSREQUEST']._serialized_end=1549
69-
_globals['_BATCHGETEMBEDDINGSRESPONSE']._serialized_start=1551
70-
_globals['_BATCHGETEMBEDDINGSRESPONSE']._serialized_end=1648
71-
_globals['_BATCHMATCHREQUEST']._serialized_start=1651
72-
_globals['_BATCHMATCHREQUEST']._serialized_end=1928
73-
_globals['_BATCHMATCHREQUEST_BATCHMATCHREQUESTPERINDEX']._serialized_start=1774
74-
_globals['_BATCHMATCHREQUEST_BATCHMATCHREQUESTPERINDEX']._serialized_end=1928
75-
_globals['_BATCHMATCHRESPONSE']._serialized_start=1931
76-
_globals['_BATCHMATCHRESPONSE']._serialized_end=2221
77-
_globals['_BATCHMATCHRESPONSE_BATCHMATCHRESPONSEPERINDEX']._serialized_start=2058
78-
_globals['_BATCHMATCHRESPONSE_BATCHMATCHRESPONSEPERINDEX']._serialized_end=2221
79-
_globals['_NAMESPACE']._serialized_start=2223
80-
_globals['_NAMESPACE']._serialized_end=2291
81-
_globals['_NUMERICNAMESPACE']._serialized_start=2294
82-
_globals['_NUMERICNAMESPACE']._serialized_end=2602
83-
_globals['_NUMERICNAMESPACE_OPERATOR']._serialized_start=2473
84-
_globals['_NUMERICNAMESPACE_OPERATOR']._serialized_end=2593
85-
_globals['_MATCHSERVICE']._serialized_start=2605
86-
_globals['_MATCHSERVICE']._serialized_end=3023
41+
_builder.BuildTopDescriptorsAndMessages(
42+
DESCRIPTOR,
43+
"google.cloud.aiplatform.matching_engine._protos.match_service_pb2",
44+
_globals,
45+
)
46+
if _descriptor._USE_C_DESCRIPTORS == False:
47+
DESCRIPTOR._options = None
48+
_globals["_SPARSEEMBEDDING"]._serialized_start = 164
49+
_globals["_SPARSEEMBEDDING"]._serialized_end = 219
50+
_globals["_MATCHREQUEST"]._serialized_start = 222
51+
_globals["_MATCHREQUEST"]._serialized_end = 861
52+
_globals["_MATCHREQUEST_RRF"]._serialized_start = 830
53+
_globals["_MATCHREQUEST_RRF"]._serialized_end = 850
54+
_globals["_EMBEDDING"]._serialized_start = 864
55+
_globals["_EMBEDDING"]._serialized_end = 1219
56+
_globals["_MATCHRESPONSE"]._serialized_start = 1222
57+
_globals["_MATCHRESPONSE"]._serialized_end = 1481
58+
_globals["_MATCHRESPONSE_NEIGHBOR"]._serialized_start = 1388
59+
_globals["_MATCHRESPONSE_NEIGHBOR"]._serialized_end = 1481
60+
_globals["_BATCHGETEMBEDDINGSREQUEST"]._serialized_start = 1483
61+
_globals["_BATCHGETEMBEDDINGSREQUEST"]._serialized_end = 1549
62+
_globals["_BATCHGETEMBEDDINGSRESPONSE"]._serialized_start = 1551
63+
_globals["_BATCHGETEMBEDDINGSRESPONSE"]._serialized_end = 1648
64+
_globals["_BATCHMATCHREQUEST"]._serialized_start = 1651
65+
_globals["_BATCHMATCHREQUEST"]._serialized_end = 1928
66+
_globals["_BATCHMATCHREQUEST_BATCHMATCHREQUESTPERINDEX"]._serialized_start = 1774
67+
_globals["_BATCHMATCHREQUEST_BATCHMATCHREQUESTPERINDEX"]._serialized_end = 1928
68+
_globals["_BATCHMATCHRESPONSE"]._serialized_start = 1931
69+
_globals["_BATCHMATCHRESPONSE"]._serialized_end = 2221
70+
_globals["_BATCHMATCHRESPONSE_BATCHMATCHRESPONSEPERINDEX"]._serialized_start = 2058
71+
_globals["_BATCHMATCHRESPONSE_BATCHMATCHRESPONSEPERINDEX"]._serialized_end = 2221
72+
_globals["_NAMESPACE"]._serialized_start = 2223
73+
_globals["_NAMESPACE"]._serialized_end = 2291
74+
_globals["_NUMERICNAMESPACE"]._serialized_start = 2294
75+
_globals["_NUMERICNAMESPACE"]._serialized_end = 2602
76+
_globals["_NUMERICNAMESPACE_OPERATOR"]._serialized_start = 2473
77+
_globals["_NUMERICNAMESPACE_OPERATOR"]._serialized_end = 2593
78+
_globals["_MATCHSERVICE"]._serialized_start = 2605
79+
_globals["_MATCHSERVICE"]._serialized_end = 3023
8780
# @@protoc_insertion_point(module_scope)

google/cloud/aiplatform/matching_engine/_protos/match_service_pb2_grpc.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
32
# Copyright 2022 Google LLC
43
#
54
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,32 +17,9 @@
1817
"""Client and server classes corresponding to protobuf-defined services."""
1918

2019
import grpc
21-
import warnings
2220

2321
from google.cloud.aiplatform.matching_engine._protos import match_service_pb2
2422

25-
GRPC_GENERATED_VERSION = "1.78.0"
26-
GRPC_VERSION = grpc.__version__
27-
_version_not_supported = False
28-
29-
try:
30-
from grpc._utilities import first_version_is_lower
31-
32-
_version_not_supported = first_version_is_lower(
33-
GRPC_VERSION, GRPC_GENERATED_VERSION
34-
)
35-
except ImportError:
36-
_version_not_supported = True
37-
38-
if _version_not_supported:
39-
raise RuntimeError(
40-
f"The grpc package installed is at version {GRPC_VERSION},"
41-
+ " but the generated code in google/cloud/aiplatform/matching_engine/_protos/match_service_pb2_grpc.py depends on"
42-
+ f" grpcio>={GRPC_GENERATED_VERSION}."
43-
+ f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}"
44-
+ f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}."
45-
)
46-
4723

4824
class MatchServiceStub(object):
4925
"""MatchService is a Google managed service for efficient vector similarity
@@ -60,19 +36,16 @@ def __init__(self, channel):
6036
"/google.cloud.aiplatform.container.v1.MatchService/Match",
6137
request_serializer=match_service_pb2.MatchRequest.SerializeToString,
6238
response_deserializer=match_service_pb2.MatchResponse.FromString,
63-
_registered_method=True,
6439
)
6540
self.BatchMatch = channel.unary_unary(
6641
"/google.cloud.aiplatform.container.v1.MatchService/BatchMatch",
6742
request_serializer=match_service_pb2.BatchMatchRequest.SerializeToString,
6843
response_deserializer=match_service_pb2.BatchMatchResponse.FromString,
69-
_registered_method=True,
7044
)
7145
self.BatchGetEmbeddings = channel.unary_unary(
7246
"/google.cloud.aiplatform.container.v1.MatchService/BatchGetEmbeddings",
7347
request_serializer=match_service_pb2.BatchGetEmbeddingsRequest.SerializeToString,
7448
response_deserializer=match_service_pb2.BatchGetEmbeddingsResponse.FromString,
75-
_registered_method=True,
7649
)
7750

7851

@@ -126,9 +99,6 @@ def add_MatchServiceServicer_to_server(servicer, server):
12699
"google.cloud.aiplatform.container.v1.MatchService", rpc_method_handlers
127100
)
128101
server.add_generic_rpc_handlers((generic_handler,))
129-
server.add_registered_method_handlers(
130-
"google.cloud.aiplatform.container.v1.MatchService", rpc_method_handlers
131-
)
132102

133103

134104
# This class is part of an EXPERIMENTAL API.
@@ -164,7 +134,6 @@ def Match(
164134
wait_for_ready,
165135
timeout,
166136
metadata,
167-
_registered_method=True,
168137
)
169138

170139
@staticmethod
@@ -194,7 +163,6 @@ def BatchMatch(
194163
wait_for_ready,
195164
timeout,
196165
metadata,
197-
_registered_method=True,
198166
)
199167

200168
@staticmethod
@@ -224,5 +192,4 @@ def BatchGetEmbeddings(
224192
wait_for_ready,
225193
timeout,
226194
metadata,
227-
_registered_method=True,
228195
)

0 commit comments

Comments
 (0)