betterproto2-compiler 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

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/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/lib/google/protobuf/__init__.py

@@ -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)
 

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.dist-info → betterproto2_compiler-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: betterproto2_compiler
-Version: 0.2.3
+Version: 0.2.4
 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.2.3,<0.3.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.dist-info → betterproto2_compiler-0.2.4.dist-info}/RECORD

@@ -4,12 +4,12 @@ betterproto2_compiler/compile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 betterproto2_compiler/compile/importing.py,sha256=2DF9zpYhjX_H3PCyUHCXhho1J2QdGAtXitlNneZZfFs,7129
 betterproto2_compiler/compile/naming.py,sha256=zf0VOmNojzyv33upOGelGxjZTEDE8JULEEED5_3inHg,562
 betterproto2_compiler/known_types/__init__.py,sha256=Exqo-3ubDuik0TZDTw5ZPqf-dVb2uPJTZxMG7X58E6U,780
-betterproto2_compiler/known_types/any.py,sha256=QnfSKTXzazZwmsxaFu8_SYNmLww1D2mFdmi29_8Nzb4,1432
+betterproto2_compiler/known_types/any.py,sha256=eRMenvvrn-1Wiss3YxhqRsjZ4XqiqPb1YQuinoA8wI4,1899
 betterproto2_compiler/known_types/duration.py,sha256=jy9GPnQTT9qhi12pQDG_ptdFAdm2gYkq3NH75zUTDOU,895
-betterproto2_compiler/known_types/timestamp.py,sha256=lw7kQPYJn76Q2wR4l3nCshj7VZ3s8h_xRcvrGIno4z0,2155
+betterproto2_compiler/known_types/timestamp.py,sha256=dUfJmdrVg1NW-zkquAc8kxMH6nqdxQ2x_MKeP4N5ksY,2153
 betterproto2_compiler/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 betterproto2_compiler/lib/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-betterproto2_compiler/lib/google/protobuf/__init__.py,sha256=ajfzhKfLLdrg1eESD9LR18chGNDI2EerRtjLTUnWxKY,109428
+betterproto2_compiler/lib/google/protobuf/__init__.py,sha256=dGC8iW2zPQQxxNMGmS2IjY5bOhYUmNvcasB-GC2CtHQ,108191
 betterproto2_compiler/lib/google/protobuf/compiler/__init__.py,sha256=bWYhEcL4nz0_4H6FTCmN3F419FQWXkY49LGE2hJJ6jM,8906
 betterproto2_compiler/lib/message_pool.py,sha256=4-cRhhiM6bmfpUJZ8qxc8LEyqHBHpLCcotjbyZxl7JM,71
 betterproto2_compiler/plugin/__init__.py,sha256=L3pW0b4CvkM5x53x_sYt1kYiSFPO0_vaeH6EQPq9FAM,43
@@ -22,10 +22,10 @@ betterproto2_compiler/plugin/parser.py,sha256=MIA5-pAIJsng59wk3KYEKBARNCsQEQeetn
 betterproto2_compiler/plugin/plugin.bat,sha256=lfLT1WguAXqyerLLsRL6BfHA0RqUE6QG79v-1BYVSpI,48
 betterproto2_compiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 betterproto2_compiler/settings.py,sha256=FQwco5j9ViBXtDYoFqog7SlXhX2YcbgEnFP77znYiwc,94
-betterproto2_compiler/templates/header.py.j2,sha256=fZZ10HP8ZKD2iaRXyx_x4WYp8ffMOlu-J3Q_1h-pi3Y,1595
+betterproto2_compiler/templates/header.py.j2,sha256=HrISX0IKmUsVpIlGIT6XlD9e3LgWWPN7jYRpws5_-CY,1609
 betterproto2_compiler/templates/template.py.j2,sha256=Kwbw302GGzSEQ007eSHmHYGF0lHw01n_c0sGbtV9pWI,8419
-betterproto2_compiler-0.2.3.dist-info/LICENSE.md,sha256=Pgl2pReU-2yw2miGeQ55UFlyzqAZ_EpYVyZ2nWjwRv4,1121
-betterproto2_compiler-0.2.3.dist-info/METADATA,sha256=u6OTIRaAg9s2lIdSNif-FzAiSDYxATAHg6ktrj9LDj0,1099
-betterproto2_compiler-0.2.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-betterproto2_compiler-0.2.3.dist-info/entry_points.txt,sha256=re3Qg8lLljbVobeeKH2f1FVQZ114wfZkGv3zCZTD8Ok,84
-betterproto2_compiler-0.2.3.dist-info/RECORD,,
+betterproto2_compiler-0.2.4.dist-info/LICENSE.md,sha256=Pgl2pReU-2yw2miGeQ55UFlyzqAZ_EpYVyZ2nWjwRv4,1121
+betterproto2_compiler-0.2.4.dist-info/METADATA,sha256=bQ5WSjI-tm0jNx_WK_1fwlCd3qIP37SZF0EpyFBoI9k,1188
+betterproto2_compiler-0.2.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+betterproto2_compiler-0.2.4.dist-info/entry_points.txt,sha256=re3Qg8lLljbVobeeKH2f1FVQZ114wfZkGv3zCZTD8Ok,84
+betterproto2_compiler-0.2.4.dist-info/RECORD,,