Skip to content

Rollback modification of proto file descriptor at client.py #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whdalsrnt merged 1 commit into from
Aug 23, 2024
Merged

Rollback modification of proto file descriptor at client.py #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/spaceone/core/pygrpc/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import types
import grpc
from google.protobuf.json_format import ParseDict
from google.protobuf.message_factory import MessageFactory, GetMessageClass
from google.protobuf.message_factory import MessageFactory #, GetMessageClass
from google.protobuf.descriptor_pool import DescriptorPool
from google.protobuf.descriptor import ServiceDescriptor, MethodDescriptor
from grpc_reflection.v1alpha.proto_reflection_descriptor_database import (
Expand Down Expand Up @@ -207,14 +207,14 @@ def _bind_grpc_method(
request_desc = self._desc_pool.FindMessageTypeByName(
method_desc.input_type.full_name
)
# request_message_desc = MessageFactory(self._desc_pool).GetPrototype(request_desc)
request_message_desc = GetMessageClass(request_desc)
request_message_desc = MessageFactory(self._desc_pool).GetPrototype(request_desc)
# request_message_desc = GetMessageClass(request_desc)

response_desc = self._desc_pool.FindMessageTypeByName(
method_desc.output_type.full_name
)
# response_message_desc = MessageFactory(self._desc_pool).GetPrototype(response_desc)
response_message_desc = GetMessageClass(response_desc)
response_message_desc = MessageFactory(self._desc_pool).GetPrototype(response_desc)
# response_message_desc = GetMessageClass(response_desc)

if method_desc.client_streaming and method_desc.server_streaming:
setattr(
Expand Down Expand Up @@ -286,8 +286,8 @@ def _init_grpc_reflection(self):
request_desc = self._desc_pool.FindMessageTypeByName(
method_desc.input_type.full_name
)
# self._request_map[method_key] = MessageFactory(self._desc_pool).GetPrototype(request_desc)
self._request_map[method_key] = GetMessageClass(request_desc)
self._request_map[method_key] = MessageFactory(self._desc_pool).GetPrototype(request_desc)
# self._request_map[method_key] = GetMessageClass(request_desc)

if service_desc.name not in self._api_resources:
self._api_resources[service_name] = []
Expand Down