Skip to content
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.

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

Updates protos and fixes grpc-tools for protos generation #766

Merged
merged 2 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ The generated files will be found in `docs/_build`.
## Generate gRPC Protobuf client

```sh
pip3 install -r dev-requirements.txt

pip3 install -r tools/requirements.txt
./tools/regen_grpcclient.sh
```

Expand Down
2 changes: 1 addition & 1 deletion dapr/proto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source <env_name>/bin/activate
Run the following commands:

```sh
pip3 install -r dev-requirements.txt
pip3 install -r tools/requirements.txt
./tools/regen_grpcclient.sh
```

Expand Down
14 changes: 7 additions & 7 deletions dapr/proto/common/v1/common_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions dapr/proto/runtime/v1/appcallback_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

194 changes: 104 additions & 90 deletions dapr/proto/runtime/v1/dapr_pb2.py

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions dapr/proto/runtime/v1/dapr_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3261,8 +3261,8 @@ class DeleteJobResponse(google.protobuf.message.Message):
global___DeleteJobResponse = DeleteJobResponse

@typing_extensions.final
class ConversationAlpha1Request(google.protobuf.message.Message):
"""ConversationAlpha1Request is the request object for Conversation."""
class ConversationRequest(google.protobuf.message.Message):
"""ConversationRequest is the request object for Conversation."""

DESCRIPTOR: google.protobuf.descriptor.Descriptor

Expand Down Expand Up @@ -3308,7 +3308,7 @@ class ConversationAlpha1Request(google.protobuf.message.Message):
SCRUBPII_FIELD_NUMBER: builtins.int
TEMPERATURE_FIELD_NUMBER: builtins.int
name: builtins.str
"""The name of Coverstaion component"""
"""The name of Conversation component"""
contextID: builtins.str
"""The ID of an existing chat (like in ChatGPT)"""
@property
Expand Down Expand Up @@ -3344,7 +3344,7 @@ class ConversationAlpha1Request(google.protobuf.message.Message):
@typing.overload
def WhichOneof(self, oneof_group: typing_extensions.Literal["_temperature", b"_temperature"]) -> typing_extensions.Literal["temperature"] | None: ...

global___ConversationAlpha1Request = ConversationAlpha1Request
global___ConversationRequest = ConversationRequest

@typing_extensions.final
class ConversationInput(google.protobuf.message.Message):
Expand Down Expand Up @@ -3376,8 +3376,8 @@ class ConversationInput(google.protobuf.message.Message):
global___ConversationInput = ConversationInput

@typing_extensions.final
class ConversationAlpha1Result(google.protobuf.message.Message):
"""ConversationAlpha1Result is the result for one input."""
class ConversationResult(google.protobuf.message.Message):
"""ConversationResult is the result for one input."""

DESCRIPTOR: google.protobuf.descriptor.Descriptor

Expand Down Expand Up @@ -3414,11 +3414,11 @@ class ConversationAlpha1Result(google.protobuf.message.Message):
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["parameters", b"parameters", "result", b"result"]) -> None: ...

global___ConversationAlpha1Result = ConversationAlpha1Result
global___ConversationResult = ConversationResult

@typing_extensions.final
class ConversationAlpha1Response(google.protobuf.message.Message):
"""ConversationAlpha1Response is the response for Conversation."""
class ConversationResponse(google.protobuf.message.Message):
"""ConversationResponse is the response for Conversation."""

DESCRIPTOR: google.protobuf.descriptor.Descriptor

Expand All @@ -3427,16 +3427,16 @@ class ConversationAlpha1Response(google.protobuf.message.Message):
contextID: builtins.str
"""The ID of an existing chat (like in ChatGPT)"""
@property
def outputs(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ConversationAlpha1Result]:
def outputs(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___ConversationResult]:
"""An array of results."""
def __init__(
self,
*,
contextID: builtins.str | None = ...,
outputs: collections.abc.Iterable[global___ConversationAlpha1Result] | None = ...,
outputs: collections.abc.Iterable[global___ConversationResult] | None = ...,
) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["_contextID", b"_contextID", "contextID", b"contextID"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["_contextID", b"_contextID", "contextID", b"contextID", "outputs", b"outputs"]) -> None: ...
def WhichOneof(self, oneof_group: typing_extensions.Literal["_contextID", b"_contextID"]) -> typing_extensions.Literal["contextID"] | None: ...

global___ConversationAlpha1Response = ConversationAlpha1Response
global___ConversationResponse = ConversationResponse
12 changes: 6 additions & 6 deletions dapr/proto/runtime/v1/dapr_pb2_grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ def __init__(self, channel):
)
self.ConverseAlpha1 = channel.unary_unary(
'/dapr.proto.runtime.v1.Dapr/ConverseAlpha1',
request_serializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Request.SerializeToString,
response_deserializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Response.FromString,
request_serializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationRequest.SerializeToString,
response_deserializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationResponse.FromString,
)


Expand Down Expand Up @@ -1028,8 +1028,8 @@ def add_DaprServicer_to_server(servicer, server):
),
'ConverseAlpha1': grpc.unary_unary_rpc_method_handler(
servicer.ConverseAlpha1,
request_deserializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Request.FromString,
response_serializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Response.SerializeToString,
request_deserializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationRequest.FromString,
response_serializer=dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationResponse.SerializeToString,
),
}
generic_handler = grpc.method_handlers_generic_handler(
Expand Down Expand Up @@ -2040,7 +2040,7 @@ def ConverseAlpha1(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_unary(request, target, '/dapr.proto.runtime.v1.Dapr/ConverseAlpha1',
dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Request.SerializeToString,
dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationAlpha1Response.FromString,
dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationRequest.SerializeToString,
dapr_dot_proto_dot_runtime_dot_v1_dot_dapr__pb2.ConversationResponse.FromString,
options, channel_credentials,
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
2 changes: 1 addition & 1 deletion tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
grpcio-tools>=1.57.0
grpcio-tools==1.62.3
Loading