Commit0d5ed37

MarkDaoust

and

parthea

authored

fix: ImproveAny decode error (#712)

* Improve Any decoding-error.Was:TypeError: Could not convert Any to PredictLongRunningResponseNow:TypeError: Could not convert Any[google.ai.generativelanguage.v1main.PredictLongRunningResponse] to google.ai.generativelanguage.v1beta.PredictLongRunningResponse* update test* update error message* address review feedback---------Co-authored-by: Anthonios Partheniou <partheniou@google.com>

1 parent4dbb405 commit0d5ed37Copy full SHA for 0d5ed37

File tree

2 files changed

-4

lines changed

google/api_core
- protobuf_helpers.py
tests/unit
- test_protobuf_helpers.py

2 files changed

-4

lines changed

`‎google/api_core/protobuf_helpers.py‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,7 @@ def from_any_pb(pb_type, any_pb):`
`63`	`63`	`# Unpack the Any object and populate the protobuf message instance.`
`64`	`64`	`ifnotany_pb.Unpack(msg_pb):`
`65`	`65`	`raiseTypeError(`
`66`		`-"Could not convert {} to {}".format(`
`67`		`-any_pb.__class__.__name__,pb_type.__name__`
`68`		`- )`
	`66`	+f"Could not convert `{any_pb.TypeName()}` with underlying type `google.protobuf.any_pb2.Any` to `{msg_pb.DESCRIPTOR.full_name}`"
`69`	`67`	`)`
`70`	`68`
`71`	`69`	`# Done; return the message.`

`‎tests/unit/test_protobuf_helpers.py‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importpytest`
	`16`	`+importre`
`16`	`17`
`17`	`18`	`fromgoogle.apiimporthttp_pb2`
`18`	`19`	`fromgoogle.api_coreimportprotobuf_helpers`
`@@ -65,7 +66,12 @@ def test_from_any_pb_failure():`
`65`	`66`	`in_message=any_pb2.Any()`
`66`	`67`	`in_message.Pack(date_pb2.Date(year=1990))`
`67`	`68`
`68`		`-withpytest.raises(TypeError):`
	`69`	`+withpytest.raises(`
	`70`	`+TypeError,`
	`71`	`+match=re.escape(`
	`72`	+"Could not convert `google.type.Date` with underlying type `google.protobuf.any_pb2.Any` to `google.type.TimeOfDay`"
	`73`	`+ ),`
	`74`	`+ ):`
`69`	`75`	`protobuf_helpers.from_any_pb(timeofday_pb2.TimeOfDay,in_message)`
`70`	`76`
`71`	`77`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0d5ed37

File tree

2 files changed

2 files changed

`‎google/api_core/protobuf_helpers.py‎`

`‎tests/unit/test_protobuf_helpers.py‎`

0 commit comments