Fix duration formatting

Still issues with tests using below-microsecond nanosecond values, but
these tests use millisecond values, so we can fix them up.

Author: stefanvanburen

protovalidate/internal/string_format.py

@@ -14,6 +14,7 @@
 
 import celpy  # type: ignore
 from celpy import celtypes  # type: ignore
+from decimal import Decimal
 
 QUOTE_TRANS = str.maketrans(
     {
@@ -154,6 +155,8 @@ def format_string(self, arg: celtypes.Value) -> celpy.Result:
             return celtypes.StringType(str(arg).lower())
         if isinstance(arg, celtypes.DoubleType):
             return celtypes.StringType(f"{arg:.0f}")
+        if isinstance(arg, celtypes.DurationType):
+            return celtypes.StringType(self._format_duration(arg))
         if isinstance(arg, celtypes.TimestampType):
             base = arg.isoformat()
             if arg.getMilliseconds() != 0:
@@ -167,7 +170,7 @@ def format_value(self, arg: celtypes.Value) -> celpy.Result:
         if isinstance(arg, celtypes.UintType):
             return celtypes.StringType(arg)
         if isinstance(arg, celtypes.DurationType):
-            return celtypes.StringType(f'duration("{arg.seconds + (arg.microseconds // 1e6):.0f}s")')
+            return celtypes.StringType(f'duration("{self._format_duration(arg)}")')
         if isinstance(arg, celtypes.DoubleType):
             return celtypes.StringType(f"{arg:f}")
         return self.format_string(arg)
@@ -181,6 +184,9 @@ def format_list(self, arg: celtypes.ListType) -> celpy.Result:
         result += "]"
         return celtypes.StringType(result)
 
+    def _format_duration(self, arg: celtypes.DurationType) -> celpy.Result:
+        return f"{arg.seconds + Decimal(arg.microseconds) / Decimal(1_000_000):f}s"
+
 
 _default_format = StringFormat("en_US")
 format = _default_format.format  # noqa: A001

tests/conformance/nonconforming.yaml

@@ -3,12 +3,7 @@
 standard_constraints/well_known_types/duration:
  - gte_lte/invalid/above
  - lte/invalid
- - gte/invalid
- - gt/invalid
- - in/invalid
- - "not in/valid"
+ - not in/valid
 standard_constraints/well_known_types/timestamp:
  - gte_lte/invalid/above
  - lte/invalid
-standard_constraints/repeated:
- - duration/gte/invalid