Skip to content

Commit 9bf0e27

Browse files
elena-kolevskaelena-kolevska
committed
Updates protos and renames parameter
Signed-off-by: Elena Kolevska <[email protected]>
1 parent ae378bb commit 9bf0e27

File tree

12 files changed

+539
-453
lines changed

12 files changed

+539
-453
lines changed

‎dapr/aio/clients/grpc/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ async def converse_alpha1(
17441744
DaprInternalError: If the Dapr runtime returns an error
17451745
"""
17461746
inputs_pb = [
1747-
api_v1.ConversationInput(message=inp.message, role=inp.role, scrubPII=inp.scrub_pii)
1747+
api_v1.ConversationInput(content=inp.content, role=inp.role, scrubPII=inp.scrub_pii)
17481748
for inp in inputs
17491749
]
17501750

‎dapr/clients/grpc/_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,6 @@ def __next__(self):
425425
class ConversationInput:
426426
"""A single input message for the conversation."""
427427

428-
message: str
428+
content: str
429429
role: Optional[str] = None
430430
scrub_pii: Optional[bool] = None

‎dapr/clients/grpc/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ def converse_alpha1(
17471747
"""
17481748

17491749
inputs_pb = [
1750-
api_v1.ConversationInput(message=inp.message, role=inp.role, scrubPII=inp.scrub_pii)
1750+
api_v1.ConversationInput(content=inp.content, role=inp.role, scrubPII=inp.scrub_pii)
17511751
for inp in inputs
17521752
]
17531753

‎dapr/proto/common/v1/common_pb2.pyi

+38-30
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
"""
16+
1617
import builtins
1718
import collections.abc
1819
import google.protobuf.any_pb2
@@ -30,7 +31,7 @@ else:
3031

3132
DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
3233

33-
@typing_extensions.final
34+
@typing.final
3435
class HTTPExtension(google.protobuf.message.Message):
3536
"""HTTPExtension includes HTTP verb and querystring
3637
when Dapr runtime delivers HTTP content.
@@ -89,11 +90,11 @@ class HTTPExtension(google.protobuf.message.Message):
8990
verb: global___HTTPExtension.Verb.ValueType = ...,
9091
querystring: builtins.str = ...,
9192
) -> None: ...
92-
def ClearField(self, field_name: typing_extensions.Literal["querystring", b"querystring", "verb", b"verb"]) -> None: ...
93+
def ClearField(self, field_name: typing.Literal["querystring", b"querystring", "verb", b"verb"]) -> None: ...
9394

9495
global___HTTPExtension = HTTPExtension
9596

96-
@typing_extensions.final
97+
@typing.final
9798
class InvokeRequest(google.protobuf.message.Message):
9899
"""InvokeRequest is the message to invoke a method with the data.
99100
This message is used in InvokeService of Dapr gRPC Service and OnInvoke
@@ -108,24 +109,26 @@ class InvokeRequest(google.protobuf.message.Message):
108109
HTTP_EXTENSION_FIELD_NUMBER: builtins.int
109110
method: builtins.str
110111
"""Required. method is a method name which will be invoked by caller."""
111-
@property
112-
def data(self) -> google.protobuf.any_pb2.Any:
113-
"""Required in unary RPCs. Bytes value or Protobuf message which caller sent.
114-
Dapr treats Any.value as bytes type if Any.type_url is unset.
115-
"""
116112
content_type: builtins.str
117113
"""The type of data content.
118114
119115
This field is required if data delivers http request body
120116
Otherwise, this is optional.
121117
"""
118+
@property
119+
def data(self) -> google.protobuf.any_pb2.Any:
120+
"""Required in unary RPCs. Bytes value or Protobuf message which caller sent.
121+
Dapr treats Any.value as bytes type if Any.type_url is unset.
122+
"""
123+
122124
@property
123125
def http_extension(self) -> global___HTTPExtension:
124126
"""HTTP specific fields if request conveys http-compatible request.
125127
126128
This field is required for http-compatible request. Otherwise,
127129
this field is optional.
128130
"""
131+
129132
def __init__(
130133
self,
131134
*,
@@ -134,12 +137,12 @@ class InvokeRequest(google.protobuf.message.Message):
134137
content_type: builtins.str = ...,
135138
http_extension: global___HTTPExtension | None = ...,
136139
) -> None: ...
137-
def HasField(self, field_name: typing_extensions.Literal["data", b"data", "http_extension", b"http_extension"]) -> builtins.bool: ...
138-
def ClearField(self, field_name: typing_extensions.Literal["content_type", b"content_type", "data", b"data", "http_extension", b"http_extension", "method", b"method"]) -> None: ...
140+
def HasField(self, field_name: typing.Literal["data", b"data", "http_extension", b"http_extension"]) -> builtins.bool: ...
141+
def ClearField(self, field_name: typing.Literal["content_type", b"content_type", "data", b"data", "http_extension", b"http_extension", "method", b"method"]) -> None: ...
139142

140143
global___InvokeRequest = InvokeRequest
141144

142-
@typing_extensions.final
145+
@typing.final
143146
class InvokeResponse(google.protobuf.message.Message):
144147
"""InvokeResponse is the response message including data and its content type
145148
from app callback.
@@ -151,23 +154,24 @@ class InvokeResponse(google.protobuf.message.Message):
151154

152155
DATA_FIELD_NUMBER: builtins.int
153156
CONTENT_TYPE_FIELD_NUMBER: builtins.int
157+
content_type: builtins.str
158+
"""Required. The type of data content."""
154159
@property
155160
def data(self) -> google.protobuf.any_pb2.Any:
156161
"""Required in unary RPCs. The content body of InvokeService response."""
157-
content_type: builtins.str
158-
"""Required. The type of data content."""
162+
159163
def __init__(
160164
self,
161165
*,
162166
data: google.protobuf.any_pb2.Any | None = ...,
163167
content_type: builtins.str = ...,
164168
) -> None: ...
165-
def HasField(self, field_name: typing_extensions.Literal["data", b"data"]) -> builtins.bool: ...
166-
def ClearField(self, field_name: typing_extensions.Literal["content_type", b"content_type", "data", b"data"]) -> None: ...
169+
def HasField(self, field_name: typing.Literal["data", b"data"]) -> builtins.bool: ...
170+
def ClearField(self, field_name: typing.Literal["content_type", b"content_type", "data", b"data"]) -> None: ...
167171

168172
global___InvokeResponse = InvokeResponse
169173

170-
@typing_extensions.final
174+
@typing.final
171175
class StreamPayload(google.protobuf.message.Message):
172176
"""Chunk of data sent in a streaming request or response.
173177
This is used in requests including InternalInvokeRequestStream.
@@ -191,17 +195,17 @@ class StreamPayload(google.protobuf.message.Message):
191195
data: builtins.bytes = ...,
192196
seq: builtins.int = ...,
193197
) -> None: ...
194-
def ClearField(self, field_name: typing_extensions.Literal["data", b"data", "seq", b"seq"]) -> None: ...
198+
def ClearField(self, field_name: typing.Literal["data", b"data", "seq", b"seq"]) -> None: ...
195199

196200
global___StreamPayload = StreamPayload
197201

198-
@typing_extensions.final
202+
@typing.final
199203
class StateItem(google.protobuf.message.Message):
200204
"""StateItem represents state key, value, and additional options to save state."""
201205

202206
DESCRIPTOR: google.protobuf.descriptor.Descriptor
203207

204-
@typing_extensions.final
208+
@typing.final
205209
class MetadataEntry(google.protobuf.message.Message):
206210
DESCRIPTOR: google.protobuf.descriptor.Descriptor
207211

@@ -215,7 +219,7 @@ class StateItem(google.protobuf.message.Message):
215219
key: builtins.str = ...,
216220
value: builtins.str = ...,
217221
) -> None: ...
218-
def ClearField(self, field_name: typing_extensions.Literal["key", b"key", "value", b"value"]) -> None: ...
222+
def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ...
219223

220224
KEY_FIELD_NUMBER: builtins.int
221225
VALUE_FIELD_NUMBER: builtins.int
@@ -231,12 +235,15 @@ class StateItem(google.protobuf.message.Message):
231235
"""The entity tag which represents the specific version of data.
232236
The exact ETag format is defined by the corresponding data store.
233237
"""
238+
234239
@property
235240
def metadata(self) -> google.protobuf.internal.containers.ScalarMap[builtins.str, builtins.str]:
236241
"""The metadata which will be passed to state store component."""
242+
237243
@property
238244
def options(self) -> global___StateOptions:
239245
"""Options for concurrency and consistency to save the state."""
246+
240247
def __init__(
241248
self,
242249
*,
@@ -246,12 +253,12 @@ class StateItem(google.protobuf.message.Message):
246253
metadata: collections.abc.Mapping[builtins.str, builtins.str] | None = ...,
247254
options: global___StateOptions | None = ...,
248255
) -> None: ...
249-
def HasField(self, field_name: typing_extensions.Literal["etag", b"etag", "options", b"options"]) -> builtins.bool: ...
250-
def ClearField(self, field_name: typing_extensions.Literal["etag", b"etag", "key", b"key", "metadata", b"metadata", "options", b"options", "value", b"value"]) -> None: ...
256+
def HasField(self, field_name: typing.Literal["etag", b"etag", "options", b"options"]) -> builtins.bool: ...
257+
def ClearField(self, field_name: typing.Literal["etag", b"etag", "key", b"key", "metadata", b"metadata", "options", b"options", "value", b"value"]) -> None: ...
251258

252259
global___StateItem = StateItem
253260

254-
@typing_extensions.final
261+
@typing.final
255262
class Etag(google.protobuf.message.Message):
256263
"""Etag represents a state item version"""
257264

@@ -265,11 +272,11 @@ class Etag(google.protobuf.message.Message):
265272
*,
266273
value: builtins.str = ...,
267274
) -> None: ...
268-
def ClearField(self, field_name: typing_extensions.Literal["value", b"value"]) -> None: ...
275+
def ClearField(self, field_name: typing.Literal["value", b"value"]) -> None: ...
269276

270277
global___Etag = Etag
271278

272-
@typing_extensions.final
279+
@typing.final
273280
class StateOptions(google.protobuf.message.Message):
274281
"""StateOptions configures concurrency and consistency for state operations"""
275282

@@ -319,17 +326,17 @@ class StateOptions(google.protobuf.message.Message):
319326
concurrency: global___StateOptions.StateConcurrency.ValueType = ...,
320327
consistency: global___StateOptions.StateConsistency.ValueType = ...,
321328
) -> None: ...
322-
def ClearField(self, field_name: typing_extensions.Literal["concurrency", b"concurrency", "consistency", b"consistency"]) -> None: ...
329+
def ClearField(self, field_name: typing.Literal["concurrency", b"concurrency", "consistency", b"consistency"]) -> None: ...
323330

324331
global___StateOptions = StateOptions
325332

326-
@typing_extensions.final
333+
@typing.final
327334
class ConfigurationItem(google.protobuf.message.Message):
328335
"""ConfigurationItem represents all the configuration with its name(key)."""
329336

330337
DESCRIPTOR: google.protobuf.descriptor.Descriptor
331338

332-
@typing_extensions.final
339+
@typing.final
333340
class MetadataEntry(google.protobuf.message.Message):
334341
DESCRIPTOR: google.protobuf.descriptor.Descriptor
335342

@@ -343,7 +350,7 @@ class ConfigurationItem(google.protobuf.message.Message):
343350
key: builtins.str = ...,
344351
value: builtins.str = ...,
345352
) -> None: ...
346-
def ClearField(self, field_name: typing_extensions.Literal["key", b"key", "value", b"value"]) -> None: ...
353+
def ClearField(self, field_name: typing.Literal["key", b"key", "value", b"value"]) -> None: ...
347354

348355
VALUE_FIELD_NUMBER: builtins.int
349356
VERSION_FIELD_NUMBER: builtins.int
@@ -355,13 +362,14 @@ class ConfigurationItem(google.protobuf.message.Message):
355362
@property
356363
def metadata(self) -> google.protobuf.internal.containers.ScalarMap[builtins.str, builtins.str]:
357364
"""the metadata which will be passed to/from configuration store component."""
365+
358366
def __init__(
359367
self,
360368
*,
361369
value: builtins.str = ...,
362370
version: builtins.str = ...,
363371
metadata: collections.abc.Mapping[builtins.str, builtins.str] | None = ...,
364372
) -> None: ...
365-
def ClearField(self, field_name: typing_extensions.Literal["metadata", b"metadata", "value", b"value", "version", b"version"]) -> None: ...
373+
def ClearField(self, field_name: typing.Literal["metadata", b"metadata", "value", b"value", "version", b"version"]) -> None: ...
366374

367375
global___ConfigurationItem = ConfigurationItem

0 commit comments

Comments
 (0)