betterproto2-compiler 0.2.3__tar.gz → 0.3.0__tar.gz

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: betterproto2_compiler
-Version: 0.2.3
+Version: 0.3.0
 Summary: Compiler for betterproto2
 License: MIT
 Keywords: protobuf,gRPC,compiler
@@ -13,11 +13,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: betterproto2 (>=0.2.1,<0.3.0)
+Requires-Dist: betterproto2 (>=0.3.0,<0.4.0)
 Requires-Dist: grpclib (>=0.4.1,<0.5.0)
 Requires-Dist: jinja2 (>=3.0.3)
-Requires-Dist: ruff (>=0.7.4,<0.8.0)
+Requires-Dist: ruff (>=0.9.3,<0.10.0)
 Requires-Dist: typing-extensions (>=4.7.1,<5.0.0)
+Project-URL: Documentation, https://betterproto.github.io/python-betterproto2-compiler/
 Project-URL: Repository, https://github.com/betterproto/python-betterproto2-compiler
 Description-Content-Type: text/markdown
 

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/pyproject.toml

@@ -1,21 +1,35 @@
-[tool.poetry]
+[project]
 name = "betterproto2_compiler"
-version = "0.2.3"
+version = "0.3.0"
 description = "Compiler for betterproto2"
-authors = ["Adrien Vannson <adrien.vannson@protonmail.com>", "Daniel G. Taylor <danielgtaylor@gmail.com>"]
+authors = [
+    { name = "Adrien Vannson", email = "adrien.vannson@protonmail.com" },
+    { name = "Daniel G. Taylor", email = "danielgtaylor@gmail.com" },
+]
 readme = "README.md"
-repository = "https://github.com/betterproto/python-betterproto2-compiler"
 keywords = ["protobuf", "gRPC", "compiler"]
 license = "MIT"
+requires-python = ">=3.10,<4.0"
+dynamic = ["dependencies"]
+
+[project.urls]
+Documentation = "https://betterproto.github.io/python-betterproto2-compiler/"
+Repository = "https://github.com/betterproto/python-betterproto2-compiler"
+
+[project.scripts]
+protoc-gen-python_betterproto2 = "betterproto2_compiler.plugin:main"
+
+[tool.poetry]
 packages = [
     { include = "betterproto2_compiler", from = "src" }
 ]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-betterproto2 = "^0.2.1"
+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.7.4"
+ruff = "~0.9.3"
 grpclib = "^0.4.1"
 jinja2 = ">=3.0.3"
 typing-extensions = "^4.7.1"
@@ -23,18 +37,15 @@ typing-extensions = "^4.7.1"
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^2.17.0"
 grpcio-tools = "^1.54.2"
-mkdocs-material = {version = "^9.5.49", python = ">=3.10"}
-mkdocstrings = {version = "^0.27.0", python = ">=3.10", extras = ["python"]}
-poethepoet = ">=0.9.0"
+mkdocs-material = {version = "^9.5.49"}
+mkdocstrings = {version = "^0.27.0", extras = ["python"]}
+poethepoet = "^0.32.2"
 pyright = "^1.1.391"
 ipykernel = "^6.29.5"
 
 [tool.poetry.group.test.dependencies]
-pytest = "^6.2.5"
-protobuf = "^4"
-
-[tool.poetry.scripts]
-protoc-gen-python_betterproto2 = "betterproto2_compiler.plugin:main"
+pytest = "^8.3.4"
+protobuf = "^5.29.3"
 
 [tool.ruff]
 extend-exclude = ["tests/output_*", "src/betterproto2_compiler/lib"]
@@ -137,7 +148,7 @@ cmd = "mkdocs serve"
 help = "Serve the documentation locally"
 
 [build-system]
-requires = ["poetry-core>=1.0.0,<2"]
+requires = ["poetry-core>=2.0.0,<3"]
 build-backend = "poetry.core.masonry.api"
 
 # python -m grpc.tools.protoc \

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/known_types/any.py

@@ -1,3 +1,5 @@
+import typing
+
 import betterproto2
 
 from betterproto2_compiler.lib.google.protobuf import Any as VanillaAny
@@ -18,19 +20,37 @@ class Any(VanillaAny):
         self.type_url = message_pool.type_to_url[type(message)]
         self.value = bytes(message)
 
-    def unpack(self, message_pool: "betterproto2.MessagePool | None" = None) -> betterproto2.Message:
+    def unpack(self, message_pool: "betterproto2.MessagePool | None" = None) -> betterproto2.Message | None:
         """
         Return the message packed inside the `Any` object.
 
         The target message type must be registered in the message pool, which is done automatically when the module
         defining the message type is imported.
         """
+        if not self.type_url:
+            return None
+
         message_pool = message_pool or default_message_pool
 
-        message_type = message_pool.url_to_type[self.type_url]
+        try:
+            message_type = message_pool.url_to_type[self.type_url]
+        except KeyError:
+            raise TypeError(f"Can't unpack unregistered type: {self.type_url}")
 
         return message_type().parse(self.value)
 
-    def to_dict(self) -> dict:  # pyright: ignore [reportIncompatibleMethodOverride]
-        # TOOO improve when dict is updated
-        return {"@type": self.type_url, "value": self.unpack().to_dict()}
+    def to_dict(self, **kwargs) -> dict[str, typing.Any]:
+        # TODO allow passing a message pool to `to_dict`
+        output: dict[str, typing.Any] = {"@type": self.type_url}
+
+        value = self.unpack()
+
+        if value is None:
+            return output
+
+        if type(value).to_dict == betterproto2.Message.to_dict:
+            output.update(value.to_dict(**kwargs))
+        else:
+            output["value"] = value.to_dict(**kwargs)
+
+        return output

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/known_types/timestamp.py

@@ -37,9 +37,9 @@ class Timestamp(VanillaTimestamp):
             return f"{result}Z"
         if (nanos % 1e6) == 0:
             # Serialize 3 fractional digits.
-            return f"{result}.{int(nanos // 1e6) :03d}Z"
+            return f"{result}.{int(nanos // 1e6):03d}Z"
         if (nanos % 1e3) == 0:
             # Serialize 6 fractional digits.
-            return f"{result}.{int(nanos // 1e3) :06d}Z"
+            return f"{result}.{int(nanos // 1e3):06d}Z"
         # Serialize 9 fractional digits.
         return f"{result}.{nanos:09d}"

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/lib/google/protobuf/__init__.py

@@ -98,7 +98,7 @@ import betterproto2
 
 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):
@@ -724,35 +724,6 @@ class Any(betterproto2.Message):
     Must be a valid serialized protocol buffer of the above specified type.
     """
 
-    def pack(self, message: betterproto2.Message, message_pool: "betterproto2.MessagePool | None" = None) -> None:
-        """
-        Pack the given message in the `Any` object.
-
-        The message type must be registered in the message pool, which is done automatically when the module defining
-        the message type is imported.
-        """
-        message_pool = message_pool or default_message_pool
-
-        self.type_url = message_pool.type_to_url[type(message)]
-        self.value = bytes(message)
-
-    def unpack(self, message_pool: "betterproto2.MessagePool | None" = None) -> betterproto2.Message:
-        """
-        Return the message packed inside the `Any` object.
-
-        The target message type must be registered in the message pool, which is done automatically when the module
-        defining the message type is imported.
-        """
-        message_pool = message_pool or default_message_pool
-
-        message_type = message_pool.url_to_type[self.type_url]
-
-        return message_type().parse(self.value)
-
-    def to_dict(self) -> dict:  # pyright: ignore [reportIncompatibleMethodOverride]
-        # TOOO improve when dict is updated
-        return {"@type": self.type_url, "value": self.unpack().to_dict()}
-
 
 default_message_pool.register_message("google.protobuf", "Any", Any)
 
@@ -821,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.
     """
@@ -1111,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.
     """
@@ -1328,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.
@@ -1394,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)
     )
 
 
@@ -1435,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.
@@ -1443,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
@@ -1463,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)
 
@@ -1479,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.
@@ -1548,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
@@ -1842,7 +1813,7 @@ default_message_pool.register_message("google.protobuf", "FieldMask", FieldMask)
 @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
@@ -1865,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
@@ -1942,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)
@@ -1969,7 +1940,7 @@ default_message_pool.register_message("google.protobuf", "FieldOptions", FieldOp
 
 @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)
     """
@@ -2041,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.
     """
@@ -2142,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)
@@ -2318,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)
     )
 
 
@@ -2511,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.
     """
@@ -2568,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)
@@ -3191,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.
     """

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py

@@ -22,7 +22,7 @@ import betterproto2
 
 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):

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/plugin/models.py

@@ -320,7 +320,7 @@ class FieldCompiler(ProtoContentBase):
         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

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/templates/header.py.j2

@@ -22,6 +22,7 @@ import builtins
 import datetime
 import warnings
 from collections.abc import AsyncIterable, AsyncIterator, Iterable
+import typing
 from typing import TYPE_CHECKING
 
 {% if output_file.settings.pydantic_dataclasses %}

{betterproto2_compiler-0.2.3 → betterproto2_compiler-0.3.0}/src/betterproto2_compiler/templates/template.py.j2

@@ -235,7 +235,7 @@ class {{ service.py_name }}Base(ServiceBase):
 
     {% endfor %}
 
-    def __mapping__(self) -> "dict[str, grpclib.const.Handler":
+    def __mapping__(self) -> "dict[str, grpclib.const.Handler]":
         return {
         {% for method in service.methods %}
         "{{ method.route }}": grpclib.const.Handler(