Struct support

Author: AdrienVannson

betterproto2/src/betterproto2/__init__.py

@@ -138,6 +138,9 @@
 NEG_INFINITY = "-Infinity"
 NAN = "NaN"
 
+# For Struct support
+JSON = int | float | bool | str | list["JSON"] | dict[str, "JSON"] | None
+
 
 class Casing(builtin_enum.Enum):
     """Casing constants for serialization."""

betterproto2_compiler/pyproject.toml

@@ -15,13 +15,17 @@ keywords = [
 requires-python = ">=3.10,<4.0"
 dependencies = [
     # TODO use the version from the current repo?
-    "betterproto2[grpclib]>=0.7.0,<0.8",
+    # "betterproto2[grpclib]>=0.7.0,<0.8",
+    "betterproto2[grpclib]",
     "ruff~=0.9.3",
     "jinja2>=3.0.3",
     "typing-extensions>=4.7.1,<5",
     "strenum>=0.4.15,<0.5 ; python_version == '3.10'",
 ]
 
+[tool.uv.sources]
+"betterproto2" = { path = "../betterproto2" }
+
 [project.urls]
 Documentation = "https://betterproto.github.io/python-betterproto2/"
 Repository = "https://github.com/betterproto/python-betterproto2"

betterproto2_compiler/src/betterproto2_compiler/known_types/__init__.py

@@ -13,6 +13,7 @@
     UInt32Value,
     UInt64Value,
 )
+from .struct import ListValue, Struct, Value
 from .timestamp import Timestamp
 
 # For each (package, message name), lists the methods that should be added to the message definition.
@@ -92,6 +93,24 @@
         BytesValue.from_wrapped,
         BytesValue.to_wrapped,
     ],
+    ("google.protobuf", "Struct"): [
+        Struct.from_dict,
+        Struct.to_dict,
+        Struct.from_wrapped,
+        Struct.to_wrapped,
+    ],
+    ("google.protobuf", "ListValue"): [
+        ListValue.from_dict,
+        ListValue.to_dict,
+        ListValue.from_wrapped,
+        ListValue.to_wrapped,
+    ],
+    ("google.protobuf", "Value"): [
+        Value.from_dict,
+        Value.to_dict,
+        Value.from_wrapped,
+        Value.to_wrapped,
+    ],
 }
 
 # A wrapped type is the type of a message that is automatically replaced by a known Python type.
@@ -107,4 +126,7 @@
     ("google.protobuf", "BytesValue"): "bytes",
     ("google.protobuf", "Timestamp"): "datetime.datetime",
     ("google.protobuf", "Duration"): "datetime.timedelta",
+    ("google.protobuf", "Struct"): "dict[str, betterproto2.JSON]",
+    ("google.protobuf", "ListValue"): "list[betterproto2.JSON]",
+    ("google.protobuf", "Value"): "betterproto2.JSON",
 }