feat: pydantic version of google pb

Author: ii64

docs/migrating.rst

@@ -85,17 +85,19 @@ wrappers used to provide optional zero value support. Each of these has a specia
 representation and is handled a little differently from normal messages. The Python
 mapping for these is as follows:
 
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``Google Message``            | ``Python Type``                               | ``Default``              |
-+===============================+===============================================+==========================+
-| ``google.protobuf.duration``  | :class:`datetime.timedelta`                   | ``0``                    |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.timestamp`` | ``Timezone-aware`` :class:`datetime.datetime` | ``1970-01-01T00:00:00Z`` |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.*Value``    | ``Optional[...]``/``None``                    | ``None``                 |
-+-------------------------------+-----------------------------------------------+--------------------------+
-| ``google.protobuf.*``         | ``betterproto.lib.google.protobuf.*``         | ``None``                 |
-+-------------------------------+-----------------------------------------------+--------------------------+
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``Google Message``            | ``Python Type``                                 | ``Default``              |
++===============================+=================================================+==========================+
+| ``google.protobuf.duration``  | :class:`datetime.timedelta`                     | ``0``                    |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.timestamp`` | ``Timezone-aware`` :class:`datetime.datetime`   | ``1970-01-01T00:00:00Z`` |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*Value``    | ``Optional[...]``/``None``                      | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*``         | ``betterproto.lib.std.google.protobuf.*``       | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
+| ``google.protobuf.*``         | ``betterproto.lib.pydantic.google.protobuf.*``  | ``None``                 |
++-------------------------------+-------------------------------------------------+--------------------------+
 
 
 For the wrapper types, the Python type corresponds to the wrapped type, e.g.

gen.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+export PB_REPO=${1}
+if [ ! -d ${PB_REPO} ] || [ -z ${PB_REPO} ]; then export PB_REPO=/mnt/p0/Personal/protobuf/src; fi
+if [ -z ${PROTOC} ]; then export PROTOC=protoc; fi
+export FLAGS="${FLAGS} -I${PB_REPO}"
+
+export SOURCES_PB="google/protobuf/any.proto google/protobuf/api.proto google/protobuf/descriptor.proto google/protobuf/duration.proto google/protobuf/empty.proto google/protobuf/field_mask.proto google/protobuf/source_context.proto google/protobuf/struct.proto google/protobuf/timestamp.proto google/protobuf/type.proto google/protobuf/wrappers.proto google/protobuf/compiler/plugin.proto"
+
+export OUT_LIB=src/betterproto/lib
+export OUT_LIB_PYDANTIC=${OUT_LIB}/pydantic
+export OUT_LIB_STD=${OUT_LIB}/std
+
+mkdir -p ${OUT_LIB_PYDANTIC} ${OUT_LIB_STD}
+touch ${OUT_LIB_PYDANTIC}/__init__.py ${OUT_LIB_STD}/__init__.py
+
+export PBS=$(for pb_pkg_path in ${SOURCES_PB}; do echo "${PB_REPO}/${pb_pkg_path}"; done)
+
+${PROTOC} ${FLAGS} \
+    --python_betterproto_opt=pydantic_dataclasses,INCLUDE_GOOGLE \
+    --python_betterproto_out=${OUT_LIB_PYDANTIC} \
+    ${PBS}
+
+${PROTOC} ${FLAGS} \
+    --python_betterproto_opt=INCLUDE_GOOGLE \
+    --python_betterproto_out=${OUT_LIB_STD} \
+    ${PBS}

pyproject.toml

@@ -95,11 +95,11 @@ cmd = """
 protoc
     --plugin=protoc-gen-custom=src/betterproto/plugin/main.py
     --custom_opt=INCLUDE_GOOGLE
-    --custom_out=src/betterproto/lib
+    --custom_out=src/betterproto/lib/std
     -I /usr/local/include/
     /usr/local/include/google/protobuf/**/*.proto
 """
-help = "Regenerate the types in betterproto.lib.google"
+help = "Regenerate the types in betterproto.lib.std.google"
 
 # CI tasks
 

src/betterproto/compile/importing.py

@@ -43,7 +43,7 @@ def parse_source_type_name(field_type_name: str) -> Tuple[str, str]:
 
 
 def get_type_reference(
-    *, package: str, imports: set, source_type: str, unwrap: bool = True
+    *, package: str, imports: set, source_type: str, unwrap: bool = True, pydantic: bool = False,
 ) -> str:
     """
     Return a Python type name for a proto type reference. Adds the import if
@@ -69,7 +69,7 @@ def get_type_reference(
     compiling_google_protobuf = current_package == ["google", "protobuf"]
     importing_google_protobuf = py_package == ["google", "protobuf"]
     if importing_google_protobuf and not compiling_google_protobuf:
-        py_package = ["betterproto", "lib"] + py_package
+        py_package = ["betterproto", "lib"] + (["pydantic"] if pydantic else []) + py_package
 
     if py_package[:1] == ["betterproto"]:
         return reference_absolute(imports, py_package, py_type)