[do not merge] Enum and import fixes (based on v2.0.0b4) #2
Conversation
This file contains hidden or 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
taiye-ts
approved these changes
Jul 25, 2022
yinnie
reviewed
Jul 25, 2022
| global_vars = {} | ||
| for base in inspect.getmro(cls): | ||
| module = inspect.getmodule(base) | ||
| global_vars.update(vars(module)) |
There was a problem hiding this comment.
is the bug that original implementation didn't loop over base classes of the cls ? why loop?
not much info in globalns here https://docs.python.org/3/library/typing.html#typing.get_type_hints
There was a problem hiding this comment.
the problem appears because betterproto generates code that uses type aliases, like:
class Msg:
device_type: '__common__.DeviceType'
from ... import common as __common__
when we inherit that class, by default python doesn't know anything about __common__ and we need that trick
Actually that's Andrey's fix from previous PR, I just moved it above new version
yinnie
reviewed
Jul 25, 2022
| @@ -1226,9 +1251,9 @@ def from_dict(self: T, value: Dict[str, Any]) -> T: | |||
| elif meta.proto_type == TYPE_ENUM: | |||
| enum_cls = self._betterproto.cls_by_field[field_name] | |||
| if isinstance(v, list): | |||
| v = [enum_cls.from_string(e) for e in v] | |||
| elif isinstance(v, str): | |||
| v = enum_cls.from_string(v) | |||
yinnie
approved these changes
Jul 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix inheritance from betterproto messages (cover cases when it tries to resolve module by name in the module the class sits).
Serialize enum by value, instead of by name to be comapartible with DomainModel/json which serializes by value