-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: setting 64bit fields from strings supported (#267)
Due to limitations in certain browser/javascript combinations, fields that are 64 bit integer types are converted to strings when encoding a message to JSON or a dict. Decoding from JSON handles this explicitly, but it makes converting back from a dict an error. This fix adds support for setting these 64 bit fields explicitly from strings. E.g. class Squid(proto.Message): mass_kg = proto.Field(proto.INT64, number=1) s = Squid(mass_kg=10) s_dict = Squid.to_dict(s) # Demonstrate the issue assert type(s_dict["mass_kg"]) == str # Demonstrate the round trip conversion is transparent assert s == Squid(s_dict) s.mass_kg = "20" # Works as an implementation side effect
- Loading branch information
1 parent
debd16f
commit ea7b911
Showing
6 changed files
with
133 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# Copyright (C) 2021 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from proto.primitives import ProtoType | ||
|
||
|
||
class StringyNumberRule: | ||
"""A marshal between certain numeric types and strings | ||
This is a necessary hack to allow round trip conversion | ||
from messages to dicts back to messages. | ||
See https://github.com/protocolbuffers/protobuf/issues/2679 | ||
and | ||
https://developers.google.com/protocol-buffers/docs/proto3#json | ||
for more details. | ||
""" | ||
|
||
def to_python(self, value, *, absent: bool = None): | ||
return value | ||
|
||
def to_proto(self, value): | ||
return self._python_type(value) | ||
|
||
|
||
class Int64Rule(StringyNumberRule): | ||
_python_type = int | ||
_proto_type = ProtoType.INT64 | ||
|
||
|
||
class UInt64Rule(StringyNumberRule): | ||
_python_type = int | ||
_proto_type = ProtoType.UINT64 | ||
|
||
|
||
class SInt64Rule(StringyNumberRule): | ||
_python_type = int | ||
_proto_type = ProtoType.SINT64 | ||
|
||
|
||
class Fixed64Rule(StringyNumberRule): | ||
_python_type = int | ||
_proto_type = ProtoType.FIXED64 | ||
|
||
|
||
class SFixed64Rule(StringyNumberRule): | ||
_python_type = int | ||
_proto_type = ProtoType.SFIXED64 | ||
|
||
|
||
STRINGY_NUMBER_RULES = [ | ||
Int64Rule, | ||
UInt64Rule, | ||
SInt64Rule, | ||
Fixed64Rule, | ||
SFixed64Rule, | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters