Supports exporting int as int

PiperOrigin-RevId: 859620391

Author: Etienne Pot

python/google/protobuf/json_format.py

@@ -86,6 +86,8 @@ def MessageToJson(
     descriptor_pool=None,
     ensure_ascii=True,
     always_print_fields_with_no_presence=False,
+    *,
+    unquote_int64_if_possible=False,
 ):
   """Converts protobuf message to JSON format.
 
@@ -107,6 +109,9 @@ def MessageToJson(
       default.
     ensure_ascii: If True, strings with non-ASCII characters are escaped. If
       False, Unicode strings are returned unchanged.
+    unquote_int64_if_possible: If True, unquote int64 fields for values that
+      are safe to emit as numbers (all values smaller than 2^53 and a sparse
+      set of values that are larger).
 
   Returns:
     A string containing the JSON formatted protocol buffer message.
@@ -116,6 +121,7 @@ def MessageToJson(
       use_integers_for_enums,
       descriptor_pool,
       always_print_fields_with_no_presence,
+      unquote_int64_if_possible=unquote_int64_if_possible,
   )
   return printer.ToJsonString(message, indent, sort_keys, ensure_ascii)
 
@@ -126,6 +132,8 @@ def MessageToDict(
     preserving_proto_field_name=False,
     use_integers_for_enums=False,
     descriptor_pool=None,
+    *,
+    unquote_int64_if_possible=False,
 ):
   """Converts protobuf message to a dictionary.
 
@@ -143,6 +151,9 @@ def MessageToDict(
     use_integers_for_enums: If true, print integers instead of enum names.
     descriptor_pool: A Descriptor Pool for resolving types. If None use the
       default.
+    unquote_int64_if_possible: If True, unquote int64 fields for values that
+      are safe to emit as numbers (all values smaller than 2^53 and a sparse
+      set of values that are larger).
 
   Returns:
     A dict representation of the protocol buffer message.
@@ -152,6 +163,7 @@ def MessageToDict(
       use_integers_for_enums,
       descriptor_pool,
       always_print_fields_with_no_presence,
+      unquote_int64_if_possible=unquote_int64_if_possible,
   )
   # pylint: disable=protected-access
   return printer._MessageToJsonObject(message)
@@ -174,13 +186,16 @@ def __init__(
       use_integers_for_enums=False,
       descriptor_pool=None,
       always_print_fields_with_no_presence=False,
+      *,
+      unquote_int64_if_possible=False,
   ):
     self.always_print_fields_with_no_presence = (
         always_print_fields_with_no_presence
     )
     self.preserving_proto_field_name = preserving_proto_field_name
     self.use_integers_for_enums = use_integers_for_enums
     self.descriptor_pool = descriptor_pool
+    self.unquote_int64_if_possible = unquote_int64_if_possible
 
   def ToJsonString(self, message, indent, sort_keys, ensure_ascii):
     js = self._MessageToJsonObject(message)
@@ -294,7 +309,10 @@ def _FieldToJsonObject(self, field, value):
     elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_BOOL:
       return bool(value)
     elif field.cpp_type in _INT64_TYPES:
-      return str(value)
+      if self.unquote_int64_if_possible and float(value) == value:
+        return value
+      else:
+        return str(value)
     elif field.cpp_type in _FLOAT_TYPES:
       if math.isinf(value):
         if value < 0.0: