diff --git a/poetry.lock b/poetry.lock index 74abe31f..8616c72e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -46,14 +46,14 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "betterproto2" -version = "0.2.3" +version = "0.3.0" description = "A better Protobuf / gRPC generator & library" optional = false python-versions = "<4.0,>=3.10" groups = ["main"] files = [ - {file = "betterproto2-0.2.3-py3-none-any.whl", hash = "sha256:fe39192af360bc65768b348cf671df8ebc223c52229018f73bbb155a1388a37c"}, - {file = "betterproto2-0.2.3.tar.gz", hash = "sha256:621f973d9428479328a1c10618e890d59cf4adac0e49097b287129ec5db6ffed"}, + {file = "betterproto2-0.3.0-py3-none-any.whl", hash = "sha256:c8e8264a101357f50625daba73fbf2f68324095c3299619fa091f7668ddfcfc7"}, + {file = "betterproto2-0.3.0.tar.gz", hash = "sha256:7492389498cf9ad80cdcbaed3895db55c3ff3044f9eb938fca1aa2ea64491b73"}, ] [package.dependencies] @@ -2229,4 +2229,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "6bfaaf69273fd7c2dde163d0aa47ece0103aa700ac442f575baabb5035c4ee6b" +content-hash = "d7c4da6043d4bc5d251d1ccc5b258bf48dcc3c3ecac629563c1a8cd4430120d1" diff --git a/pyproject.toml b/pyproject.toml index f77f44cb..d4d47f74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "betterproto2_compiler" -version = "0.2.4" +version = "0.3.0" description = "Compiler for betterproto2" authors = [ { name = "Adrien Vannson", email = "adrien.vannson@protonmail.com" }, @@ -26,7 +26,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.10" -betterproto2 = "^0.2.3" +betterproto2 = "^0.3.0" # betterproto2 = { git="https://github.com/betterproto/python-betterproto2" } # The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml ruff = "~0.9.3" diff --git a/src/betterproto2_compiler/lib/google/protobuf/__init__.py b/src/betterproto2_compiler/lib/google/protobuf/__init__.py index 6a9991c6..569cc870 100644 --- a/src/betterproto2_compiler/lib/google/protobuf/__init__.py +++ b/src/betterproto2_compiler/lib/google/protobuf/__init__.py @@ -98,7 +98,7 @@ from ...message_pool import default_message_pool -betterproto2.check_compiler_version("0.2.0") +betterproto2.check_compiler_version("0.3.0") class Edition(betterproto2.Enum): @@ -792,7 +792,7 @@ class Api(betterproto2.Message): Included interfaces. See [Mixin][]. """ - syntax: "Syntax" = betterproto2.field(7, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax.try_value(0)) + syntax: "Syntax" = betterproto2.field(7, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax(0)) """ The source syntax of the service. """ @@ -1082,7 +1082,7 @@ class Enum(betterproto2.Message): The source context. """ - syntax: "Syntax" = betterproto2.field(5, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax.try_value(0)) + syntax: "Syntax" = betterproto2.field(5, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax(0)) """ The source syntax. """ @@ -1299,7 +1299,7 @@ class ExtensionRangeOptions(betterproto2.Message): """ verification: "ExtensionRangeOptionsVerificationState" = betterproto2.field( - 3, betterproto2.TYPE_ENUM, default_factory=lambda: ExtensionRangeOptionsVerificationState.try_value(0) + 3, betterproto2.TYPE_ENUM, default_factory=lambda: ExtensionRangeOptionsVerificationState(0) ) """ The verification state of the range. @@ -1365,27 +1365,27 @@ class FeatureSet(betterproto2.Message): """ field_presence: "FeatureSetFieldPresence" = betterproto2.field( - 1, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetFieldPresence.try_value(0) + 1, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetFieldPresence(0) ) enum_type: "FeatureSetEnumType" = betterproto2.field( - 2, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetEnumType.try_value(0) + 2, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetEnumType(0) ) repeated_field_encoding: "FeatureSetRepeatedFieldEncoding" = betterproto2.field( - 3, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetRepeatedFieldEncoding.try_value(0) + 3, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetRepeatedFieldEncoding(0) ) utf8_validation: "FeatureSetUtf8Validation" = betterproto2.field( - 4, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetUtf8Validation.try_value(0) + 4, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetUtf8Validation(0) ) message_encoding: "FeatureSetMessageEncoding" = betterproto2.field( - 5, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetMessageEncoding.try_value(0) + 5, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetMessageEncoding(0) ) json_format: "FeatureSetJsonFormat" = betterproto2.field( - 6, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetJsonFormat.try_value(0) + 6, betterproto2.TYPE_ENUM, default_factory=lambda: FeatureSetJsonFormat(0) ) @@ -1406,7 +1406,7 @@ class FeatureSetDefaults(betterproto2.Message): ) minimum_edition: "Edition" = betterproto2.field( - 4, betterproto2.TYPE_ENUM, default_factory=lambda: Edition.try_value(0) + 4, betterproto2.TYPE_ENUM, default_factory=lambda: Edition(0) ) """ The minimum supported edition (inclusive) when this was constructed. @@ -1414,7 +1414,7 @@ class FeatureSetDefaults(betterproto2.Message): """ maximum_edition: "Edition" = betterproto2.field( - 5, betterproto2.TYPE_ENUM, default_factory=lambda: Edition.try_value(0) + 5, betterproto2.TYPE_ENUM, default_factory=lambda: Edition(0) ) """ The maximum known edition (inclusive) when this was constructed. Editions @@ -1434,7 +1434,7 @@ class FeatureSetDefaultsFeatureSetEditionDefault(betterproto2.Message): be used. This field must be in strict ascending order by edition. """ - edition: "Edition" = betterproto2.field(3, betterproto2.TYPE_ENUM, default_factory=lambda: Edition.try_value(0)) + edition: "Edition" = betterproto2.field(3, betterproto2.TYPE_ENUM, default_factory=lambda: Edition(0)) features: "Optional[FeatureSet]" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, optional=True) @@ -1450,13 +1450,13 @@ class Field(betterproto2.Message): A single field of a message type. """ - kind: "FieldKind" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: FieldKind.try_value(0)) + kind: "FieldKind" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: FieldKind(0)) """ The field type. """ cardinality: "FieldCardinality" = betterproto2.field( - 2, betterproto2.TYPE_ENUM, default_factory=lambda: FieldCardinality.try_value(0) + 2, betterproto2.TYPE_ENUM, default_factory=lambda: FieldCardinality(0) ) """ The field cardinality. @@ -1519,11 +1519,11 @@ class FieldDescriptorProto(betterproto2.Message): number: "int" = betterproto2.field(3, betterproto2.TYPE_INT32) label: "FieldDescriptorProtoLabel" = betterproto2.field( - 4, betterproto2.TYPE_ENUM, default_factory=lambda: FieldDescriptorProtoLabel.try_value(0) + 4, betterproto2.TYPE_ENUM, default_factory=lambda: FieldDescriptorProtoLabel(0) ) type: "FieldDescriptorProtoType" = betterproto2.field( - 5, betterproto2.TYPE_ENUM, default_factory=lambda: FieldDescriptorProtoType.try_value(0) + 5, betterproto2.TYPE_ENUM, default_factory=lambda: FieldDescriptorProtoType(0) ) """ If type_name is set, this need not be set. If both this and type_name @@ -1813,7 +1813,7 @@ class FieldMask(betterproto2.Message): @dataclass(eq=False, repr=False) class FieldOptions(betterproto2.Message): ctype: "FieldOptionsCType" = betterproto2.field( - 1, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsCType.try_value(0) + 1, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsCType(0) ) """ The ctype option instructs the C++ code generator to use a different @@ -1836,7 +1836,7 @@ class FieldOptions(betterproto2.Message): """ jstype: "FieldOptionsJsType" = betterproto2.field( - 6, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsJsType.try_value(0) + 6, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsJsType(0) ) """ The jstype option determines the JavaScript type used for values of the @@ -1913,7 +1913,7 @@ class FieldOptions(betterproto2.Message): """ retention: "FieldOptionsOptionRetention" = betterproto2.field( - 17, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsOptionRetention.try_value(0) + 17, betterproto2.TYPE_ENUM, default_factory=lambda: FieldOptionsOptionRetention(0) ) targets: "List[FieldOptionsOptionTargetType]" = betterproto2.field(19, betterproto2.TYPE_ENUM, repeated=True) @@ -1940,7 +1940,7 @@ class FieldOptions(betterproto2.Message): @dataclass(eq=False, repr=False) class FieldOptionsEditionDefault(betterproto2.Message): - edition: "Edition" = betterproto2.field(3, betterproto2.TYPE_ENUM, default_factory=lambda: Edition.try_value(0)) + edition: "Edition" = betterproto2.field(3, betterproto2.TYPE_ENUM, default_factory=lambda: Edition(0)) value: "str" = betterproto2.field(2, betterproto2.TYPE_STRING) """ @@ -2012,7 +2012,7 @@ class FileDescriptorProto(betterproto2.Message): If `edition` is present, this value must be "editions". """ - edition: "Edition" = betterproto2.field(14, betterproto2.TYPE_ENUM, default_factory=lambda: Edition.try_value(0)) + edition: "Edition" = betterproto2.field(14, betterproto2.TYPE_ENUM, default_factory=lambda: Edition(0)) """ The edition of the proto file. """ @@ -2113,7 +2113,7 @@ class FileOptions(betterproto2.Message): """ optimize_for: "FileOptionsOptimizeMode" = betterproto2.field( - 9, betterproto2.TYPE_ENUM, default_factory=lambda: FileOptionsOptimizeMode.try_value(0) + 9, betterproto2.TYPE_ENUM, default_factory=lambda: FileOptionsOptimizeMode(0) ) go_package: "str" = betterproto2.field(11, betterproto2.TYPE_STRING) @@ -2289,7 +2289,7 @@ class GeneratedCodeInfoAnnotation(betterproto2.Message): """ semantic: "GeneratedCodeInfoAnnotationSemantic" = betterproto2.field( - 5, betterproto2.TYPE_ENUM, default_factory=lambda: GeneratedCodeInfoAnnotationSemantic.try_value(0) + 5, betterproto2.TYPE_ENUM, default_factory=lambda: GeneratedCodeInfoAnnotationSemantic(0) ) @@ -2482,7 +2482,7 @@ class Method(betterproto2.Message): Any metadata attached to the method. """ - syntax: "Syntax" = betterproto2.field(7, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax.try_value(0)) + syntax: "Syntax" = betterproto2.field(7, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax(0)) """ The source syntax of this method. """ @@ -2539,7 +2539,7 @@ class MethodOptions(betterproto2.Message): """ idempotency_level: "MethodOptionsIdempotencyLevel" = betterproto2.field( - 34, betterproto2.TYPE_ENUM, default_factory=lambda: MethodOptionsIdempotencyLevel.try_value(0) + 34, betterproto2.TYPE_ENUM, default_factory=lambda: MethodOptionsIdempotencyLevel(0) ) features: "Optional[FeatureSet]" = betterproto2.field(35, betterproto2.TYPE_MESSAGE, optional=True) @@ -3162,7 +3162,7 @@ class Type(betterproto2.Message): The source context. """ - syntax: "Syntax" = betterproto2.field(6, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax.try_value(0)) + syntax: "Syntax" = betterproto2.field(6, betterproto2.TYPE_ENUM, default_factory=lambda: Syntax(0)) """ The source syntax. """ diff --git a/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py b/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py index eeae42dc..b3490851 100644 --- a/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py +++ b/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py @@ -22,7 +22,7 @@ from ....message_pool import default_message_pool -betterproto2.check_compiler_version("0.2.0") +betterproto2.check_compiler_version("0.3.0") class CodeGeneratorResponseFeature(betterproto2.Enum): diff --git a/src/betterproto2_compiler/plugin/models.py b/src/betterproto2_compiler/plugin/models.py index b2ea333b..ea385cf1 100644 --- a/src/betterproto2_compiler/plugin/models.py +++ b/src/betterproto2_compiler/plugin/models.py @@ -320,7 +320,7 @@ def betterproto_field_args(self) -> list[str]: elif self.repeated: args.append("repeated=True") elif self.field_type == FieldType.TYPE_ENUM: - args.append(f"default_factory=lambda: {self.py_type}.try_value(0)") + args.append(f"default_factory=lambda: {self.py_type}(0)") return args @property