fix: construct messages with nested duration in protobuf 5.28+ (#519)

* fix: construct messages with nested duration in protobuf 5.28+

* Valueerror -> ValueError

Co-authored-by: Victor Chudnovsky <[email protected]>

* Use public issue links

Co-authored-by: Victor Chudnovsky <[email protected]>

* rename variables in test

---------

Co-authored-by: Victor Chudnovsky <[email protected]>

Author: parthea

packages/proto-plus/proto/marshal/rules/message.py

@@ -34,14 +34,15 @@ def to_proto(self, value):
             try:
                 # Try the fast path first.
                 return self._descriptor(**value)
-            except (TypeError, ValueError) as ex:
-                # If we have a TypeError or Valueerror,
+            except (TypeError, ValueError, AttributeError) as ex:
+                # If we have a TypeError, ValueError or AttributeError,
                 # try the slow path in case the error
                 # was:
                 # - an int64/string issue.
                 # - a missing key issue in case a key only exists with a `_` suffix.
                 #   See related issue: https://github.com/googleapis/python-api-core/issues/227.
-                # - a missing key issue due to nested struct. See: b/321905145.
+                # - a missing key issue due to nested struct. See: https://github.com/googleapis/proto-plus-python/issues/424.
+                # - a missing key issue due to nested duration. See: https://github.com/googleapis/google-cloud-python/issues/13350.
                 return self._wrapper(value)._pb
         return value
 

packages/proto-plus/tests/test_marshal_types_dates.py

@@ -241,6 +241,26 @@ class Foo(proto.Message):
     assert Foo.pb(foo).ttl.seconds == 120
 
 
+def test_duration_write_string_nested():
+    class Foo(proto.Message):
+        foo_field: duration_pb2.Duration = proto.Field(
+            proto.MESSAGE,
+            number=1,
+            message=duration_pb2.Duration,
+        )
+
+    Foo(foo_field="300s")
+
+    class Bar(proto.Message):
+        bar_field = proto.Field(proto.MESSAGE, number=1, message=Foo)
+
+    bar = Bar({"bar_field": {"foo_field": "300s"}})
+    assert isinstance(bar.bar_field.foo_field, timedelta)
+    assert isinstance(Bar.pb(bar).bar_field.foo_field, duration_pb2.Duration)
+    assert bar.bar_field.foo_field.seconds == 300
+    assert Bar.pb(bar).bar_field.foo_field.seconds == 300
+
+
 def test_duration_del():
     class Foo(proto.Message):
         ttl = proto.Field(