betterproto2-compiler 0.5.1__tar.gz → 0.7.0__tar.gz

betterproto2_compiler-0.7.0/.gitignore

@@ -0,0 +1,21 @@
+.coverage
+.DS_Store
+.env
+.vscode/settings.json
+.mypy_cache
+.pytest_cache
+.python-version
+build/
+*/tests/output_*
+**/__pycache__
+dist
+**/*.egg-info
+output
+.idea
+.DS_Store
+.tox
+.venv
+.asv
+venv
+.devcontainer
+.ruff_cache

betterproto2_compiler-0.7.0/PKG-INFO

@@ -0,0 +1,15 @@
+Metadata-Version: 2.4
+Name: betterproto2_compiler
+Version: 0.7.0
+Summary: Compiler for betterproto2
+Project-URL: Documentation, https://betterproto.github.io/python-betterproto2/
+Project-URL: Repository, https://github.com/betterproto/python-betterproto2
+Author-email: Adrien Vannson <adrien.vannson@protonmail.com>, "Daniel G. Taylor" <danielgtaylor@gmail.com>
+License-Expression: MIT
+Keywords: compiler,gRPC,protobuf
+Requires-Python: <4.0,>=3.10
+Requires-Dist: betterproto2[grpclib]<0.8,>=0.7.0
+Requires-Dist: jinja2>=3.0.3
+Requires-Dist: ruff~=0.9.3
+Requires-Dist: strenum<0.5,>=0.4.15; python_version == '3.10'
+Requires-Dist: typing-extensions<5,>=4.7.1

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/pyproject.toml

@@ -1,54 +1,63 @@
 [project]
 name = "betterproto2_compiler"
-version = "0.5.1"
+version = "0.7.0"
 description = "Compiler for betterproto2"
 authors = [
     { name = "Adrien Vannson", email = "adrien.vannson@protonmail.com" },
     { name = "Daniel G. Taylor", email = "danielgtaylor@gmail.com" },
 ]
-readme = "README.md"
-keywords = ["protobuf", "gRPC", "compiler"]
 license = "MIT"
+keywords = [
+    "protobuf",
+    "gRPC",
+    "compiler",
+]
 requires-python = ">=3.10,<4.0"
-dynamic = ["dependencies"]
+dependencies = [
+    # TODO use the version from the current repo?
+    "betterproto2[grpclib]>=0.7.0,<0.8",
+    "ruff~=0.9.3",
+    "jinja2>=3.0.3",
+    "typing-extensions>=4.7.1,<5",
+    "strenum>=0.4.15,<0.5 ; python_version == '3.10'",
+]
 
 [project.urls]
-Documentation = "https://betterproto.github.io/python-betterproto2-compiler/"
-Repository = "https://github.com/betterproto/python-betterproto2-compiler"
+Documentation = "https://betterproto.github.io/python-betterproto2/"
+Repository = "https://github.com/betterproto/python-betterproto2"
 
 [project.scripts]
 protoc-gen-python_betterproto2 = "betterproto2_compiler.plugin:main"
 
-[tool.poetry]
-packages = [
-    { include = "betterproto2_compiler", from = "src" }
+[dependency-groups]
+dev = [
+    "pre-commit>=2.17.0,<3",
+    "grpcio-tools>=1.54.2,<2",
+    "poethepoet>=0.32.2,<0.33",
+    "pyright>=1.1.391,<2",
+    "ipykernel>=6.29.5,<7",
 ]
-
-[tool.poetry.dependencies]
-python = "^3.10"
-betterproto2 = { version = "^0.5.1", extras = ["grpclib"] }
-# betterproto2 = { git="https://github.com/betterproto/python-betterproto2" }
-# betterproto2 = { path = "../python-betterproto2", extras = ["grpclib"] }
-# The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml
-ruff = "~0.9.3"
-jinja2 = ">=3.0.3"
-typing-extensions = "^4.7.1"
-strenum = [
-    {version = "^0.4.15", python = "=3.10"},
+test = [
+    "pytest>=8.3.4,<9",
+    "protobuf>=5.29.3,<6",
 ]
 
-[tool.poetry.group.dev.dependencies]
-pre-commit = "^2.17.0"
-grpcio-tools = "^1.54.2"
-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.uv]
+package = true
+default-groups = "all"
+
+# [tool.hatch.build.targets.sdist]
+# include = ["src/betterproto2_compiler"]
+
+# [tool.hatch.build.targets.wheel]
+# include = ["src/betterproto2_compiler"]
+
+# [tool.hatch.build.targets.wheel.sources]
+# "src/betterproto2_compiler" = "betterproto2_compiler"
 
-[tool.poetry.group.test.dependencies]
-pytest = "^8.3.4"
-protobuf = "^5.29.3"
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [tool.ruff]
 extend-exclude = ["tests/output_*", "src/betterproto2_compiler/lib"]
@@ -71,12 +80,9 @@ select = [
     "I",
 ]
 
-
 [tool.ruff.lint.isort]
 combine-as-imports = true
 
-# Dev workflow tasks
-
 [tool.poe.tasks.test]
 cmd = "pytest"
 help = "Run tests"
@@ -116,6 +122,20 @@ python -m grpc.tools.protoc \
     google/protobuf/timestamp.proto \
     google/protobuf/type.proto \
     google/protobuf/wrappers.proto
+
+python -m grpc.tools.protoc \
+    --python_betterproto2_out=tests/output_betterproto_descriptor \
+    --python_betterproto2_opt=google_protobuf_descriptors \
+    google/protobuf/any.proto \
+    google/protobuf/api.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
 """
 
 [tool.poe.tasks.typecheck]
@@ -146,14 +166,6 @@ help = "Check that the source code is formatted"
 cmd = "ruff check src tests"
 help = "Check the code with the Ruff linter"
 
-[tool.poe.tasks.serve-docs]
-cmd = "mkdocs serve"
-help = "Serve the documentation locally"
-
-[build-system]
-requires = ["poetry-core>=2.0.0,<3"]
-build-backend = "poetry.core.masonry.api"
-
 # python -m grpc.tools.protoc \
 #     --python_betterproto2_out=src/lib2 \
 #     google/protobuf/any.proto \

betterproto2_compiler-0.7.0/pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+python_files = test_*.py
+python_classes =
+norecursedirs = **/output_*
+addopts = -p no:warnings

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/compile/importing.py

@@ -55,6 +55,32 @@ def parse_source_type_name(field_type_name: str, request: PluginRequestCompiler)
     raise ValueError(f"can't find type name: {field_type_name}")
 
 
+def get_symbol_reference(
+    *,
+    package: str,
+    imports: set,
+    source_package: str,
+    symbol: str,
+) -> tuple[str, str | None]:
+    """
+    Return a Python symbol within a proto package. Adds the import if
+    necessary and returns it as well for usage. Unwraps well known type if required.
+    """
+    current_package: list[str] = package.split(".") if package else []
+    py_package: list[str] = source_package.split(".") if source_package else []
+
+    if py_package == current_package:
+        return (reference_sibling(symbol), None)
+
+    if py_package[: len(current_package)] == current_package:
+        return reference_descendent(current_package, imports, py_package, symbol)
+
+    if current_package[: len(py_package)] == py_package:
+        return reference_ancestor(current_package, imports, py_package, symbol)
+
+    return reference_cousin(current_package, imports, py_package, symbol)
+
+
 def get_type_reference(
     *,
     package: str,
@@ -73,30 +99,25 @@ def get_type_reference(
     if wrap and (source_package, source_type) in WRAPPED_TYPES:
         return WRAPPED_TYPES[(source_package, source_type)]
 
-    current_package: list[str] = package.split(".") if package else []
-    py_package: list[str] = source_package.split(".") if source_package else []
     py_type: str = pythonize_class_name(source_type)
-
-    if py_package == current_package:
-        return reference_sibling(py_type)
-
-    if py_package[: len(current_package)] == current_package:
-        return reference_descendent(current_package, imports, py_package, py_type)
-
-    if current_package[: len(py_package)] == py_package:
-        return reference_ancestor(current_package, imports, py_package, py_type)
-
-    return reference_cousin(current_package, imports, py_package, py_type)
+    (ref, _) = get_symbol_reference(
+        package=package,
+        imports=imports,
+        source_package=source_package,
+        symbol=py_type,
+    )
+    return ref
 
 
-def reference_absolute(imports: set[str], py_package: list[str], py_type: str) -> str:
+def reference_absolute(imports: set[str], py_package: list[str], py_type: str) -> tuple[str, str]:
     """
     Returns a reference to a python type located in the root, i.e. sys.path.
     """
     string_import = ".".join(py_package)
     string_alias = "__".join([safe_snake_case(name) for name in py_package])
-    imports.add(f"import {string_import} as {string_alias}")
-    return f"{string_alias}.{py_type}"
+    import_to_add = f"import {string_import} as {string_alias}"
+    imports.add(import_to_add)
+    return (f"{string_alias}.{py_type}", import_to_add)
 
 
 def reference_sibling(py_type: str) -> str:
@@ -106,7 +127,9 @@ def reference_sibling(py_type: str) -> str:
     return f"{py_type}"
 
 
-def reference_descendent(current_package: list[str], imports: set[str], py_package: list[str], py_type: str) -> str:
+def reference_descendent(
+    current_package: list[str], imports: set[str], py_package: list[str], py_type: str
+) -> tuple[str, str]:
     """
     Returns a reference to a python type in a package that is a descendent of the
     current package, and adds the required import that is aliased to avoid name
@@ -116,15 +139,19 @@ def reference_descendent(current_package: list[str], imports: set[str], py_packa
     string_from = ".".join(importing_descendent[:-1])
     string_import = importing_descendent[-1]
     if string_from:
-        string_alias = "_".join(importing_descendent)
-        imports.add(f"from .{string_from} import {string_import} as {string_alias}")
-        return f"{string_alias}.{py_type}"
+        string_alias = f"{'_'.join(importing_descendent)}"
+        import_to_add = f"from .{string_from} import {string_import} as {string_alias}"
+        imports.add(import_to_add)
+        return (f"{string_alias}.{py_type}", import_to_add)
     else:
-        imports.add(f"from . import {string_import}")
-        return f"{string_import}.{py_type}"
+        import_to_add = f"from . import {string_import}"
+        imports.add(import_to_add)
+        return (f"{string_import}.{py_type}", import_to_add)
 
 
-def reference_ancestor(current_package: list[str], imports: set[str], py_package: list[str], py_type: str) -> str:
+def reference_ancestor(
+    current_package: list[str], imports: set[str], py_package: list[str], py_type: str
+) -> tuple[str, str]:
     """
     Returns a reference to a python type in a package which is an ancestor to the
     current package, and adds the required import that is aliased (if possible) to avoid
@@ -137,15 +164,19 @@ def reference_ancestor(current_package: list[str], imports: set[str], py_package
         string_import = py_package[-1]
         string_alias = f"_{'_' * distance_up}{string_import}__"
         string_from = f"..{'.' * distance_up}"
-        imports.add(f"from {string_from} import {string_import} as {string_alias}")
-        return f"{string_alias}.{py_type}"
+        import_to_add = f"from {string_from} import {string_import} as {string_alias}"
+        imports.add(import_to_add)
+        return (f"{string_alias}.{py_type}", import_to_add)
     else:
         string_alias = f"{'_' * distance_up}{py_type}__"
-        imports.add(f"from .{'.' * distance_up} import {py_type} as {string_alias}")
-        return string_alias
+        import_to_add = f"from .{'.' * distance_up} import {py_type} as {string_alias}"
+        imports.add(import_to_add)
+        return (string_alias, import_to_add)
 
 
-def reference_cousin(current_package: list[str], imports: set[str], py_package: list[str], py_type: str) -> str:
+def reference_cousin(
+    current_package: list[str], imports: set[str], py_package: list[str], py_type: str
+) -> tuple[str, str]:
     """
     Returns a reference to a python type in a package that is not descendent, ancestor
     or sibling, and adds the required import that is aliased to avoid name conflicts.
@@ -161,5 +192,6 @@ def reference_cousin(current_package: list[str], imports: set[str], py_package:
         + "__".join([safe_snake_case(name) for name in py_package[len(shared_ancestry) :]])
         + "__"
     )
-    imports.add(f"from {string_from} import {string_import} as {string_alias}")
-    return f"{string_alias}.{py_type}"
+    import_to_add = f"from {string_from} import {string_import} as {string_alias}"
+    imports.add(import_to_add)
+    return (f"{string_alias}.{py_type}", import_to_add)

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/lib/google/protobuf/__init__.py

@@ -80,7 +80,7 @@ import dateutil.parser
 
 from ...message_pool import default_message_pool
 
-betterproto2.check_compiler_version("0.5.0")
+betterproto2.check_compiler_version("0.7.0")
 
 
 class FieldCardinality(betterproto2.Enum):

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py

@@ -17,7 +17,7 @@ import betterproto2
 
 from ....message_pool import default_message_pool
 
-betterproto2.check_compiler_version("0.5.0")
+betterproto2.check_compiler_version("0.7.0")
 
 
 class CodeGeneratorResponseFeature(betterproto2.Enum):

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/plugin/compiler.py

@@ -33,17 +33,27 @@ def outputfile_compiler(output_file: OutputTemplate) -> str:
         loader=jinja2.FileSystemLoader(templates_folder),
         undefined=jinja2.StrictUndefined,
     )
-    # Load the body first so we have a compleate list of imports needed.
+
+    # List of the symbols that should appear in the `__all__` variable of the file
+    all: list[str] = []
+
+    def add_to_all(name: str) -> str:
+        all.append(name)
+        return name
+
+    env.filters["add_to_all"] = add_to_all
+
     body_template = env.get_template("template.py.j2")
     header_template = env.get_template("header.py.j2")
 
+    # Load the body first do know the symbols defined in the file
     code = body_template.render(output_file=output_file)
-    code = header_template.render(output_file=output_file, version=version) + "\n" + code
+    code = header_template.render(output_file=output_file, version=version, all=all) + "\n" + code
 
     try:
-        # Sort imports, delete unused ones
+        # Sort imports, delete unused ones, sort __all__
         code = subprocess.check_output(
-            ["ruff", "check", "--select", "I,F401,TCH005", "--fix", "--silent", "-"],
+            ["ruff", "check", "--select", "I,F401,TC005,RUF022", "--fix", "--silent", "-"],
             input=code,
             encoding="utf-8",
         )

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/plugin/models.py

@@ -53,6 +53,7 @@ from betterproto2_compiler.lib.google.protobuf import (
     MethodDescriptorProto,
     OneofDescriptorProto,
     ServiceDescriptorProto,
+    SourceCodeInfo,
 )
 from betterproto2_compiler.lib.google.protobuf.compiler import CodeGeneratorRequest
 from betterproto2_compiler.settings import Settings
@@ -216,6 +217,33 @@ class OutputTemplate:
         """
         return sorted([f.name for f in self.input_files])
 
+    def get_descriptor_name(self, source_file: FileDescriptorProto):
+        return f"{source_file.name.replace('/', '_').replace('.', '_').upper()}_DESCRIPTOR"
+
+    @property
+    def descriptors(self):
+        """Google protobuf library descriptors.
+
+        Returns
+        -------
+        str
+            A list of pool registrations for proto descriptors.
+        """
+        descriptors: list[str] = []
+
+        for f in self.input_files:
+            # Remove the source_code_info field since it is not needed at runtime.
+            source_code_info: SourceCodeInfo | None = f.source_code_info
+            f.source_code_info = None
+
+            descriptors.append(
+                f"{self.get_descriptor_name(f)} = default_google_proto_descriptor_pool.AddSerializedFile({bytes(f)})"
+            )
+
+            f.source_code_info = source_code_info
+
+        return "\n".join(descriptors)
+
 
 @dataclass(kw_only=True)
 class MessageCompiler(ProtoContentBase):
@@ -223,6 +251,7 @@ class MessageCompiler(ProtoContentBase):
 
     output_file: OutputTemplate
     proto_obj: DescriptorProto
+    prefixed_proto_name: str
     fields: list["FieldCompiler"] = field(default_factory=list)
     oneofs: list["OneofCompiler"] = field(default_factory=list)
     builtins_types: set[str] = field(default_factory=set)
@@ -233,7 +262,7 @@ class MessageCompiler(ProtoContentBase):
 
     @property
     def py_name(self) -> str:
-        return pythonize_class_name(self.proto_name)
+        return pythonize_class_name(self.prefixed_proto_name)
 
     @property
     def deprecated(self) -> bool:
@@ -266,6 +295,17 @@ class MessageCompiler(ProtoContentBase):
 
         return methods_source
 
+    @property
+    def descriptor_name(self) -> str:
+        """Google protobuf library descriptor name.
+
+        Returns
+        -------
+        str
+            The Python name of the descriptor to reference.
+        """
+        return self.output_file.get_descriptor_name(self.source_file)
+
 
 def is_map(proto_field_obj: FieldDescriptorProto, parent_message: DescriptorProto) -> bool:
     """True if proto_field_obj is a map, otherwise False."""
@@ -353,8 +393,7 @@ class FieldCompiler(ProtoContentBase):
 
     @property
     def field_type(self) -> FieldType:
-        # TODO it should be possible to remove constructor
-        return FieldType(self.proto_obj.type)
+        return self.proto_obj.type
 
     @property
     def packed(self) -> bool:
@@ -411,12 +450,46 @@ class FieldCompiler(ProtoContentBase):
     def unwrapped_py_type(self) -> str:
         return self._py_type(wrap=False)
 
+    @property
+    def annotations(self) -> list[str]:
+        """List of the Pydantic annotation to add to the field."""
+        assert self.output_file.settings.pydantic_dataclasses
+
+        annotations = []
+
+        if self.proto_obj.type in (FieldType.TYPE_INT32, FieldType.TYPE_SFIXED32, FieldType.TYPE_SINT32):
+            annotations.append("pydantic.Field(ge=-2**31, le=2**31 - 1)")
+
+        elif self.proto_obj.type in (FieldType.TYPE_UINT32, FieldType.TYPE_FIXED32):
+            annotations.append("pydantic.Field(ge=0, le=2**32 - 1)")
+
+        elif self.proto_obj.type in (FieldType.TYPE_INT64, FieldType.TYPE_SFIXED64, FieldType.TYPE_SINT64):
+            annotations.append("pydantic.Field(ge=-2**63, le=2**63 - 1)")
+
+        elif self.proto_obj.type in (FieldType.TYPE_UINT64, FieldType.TYPE_FIXED64):
+            annotations.append("pydantic.Field(ge=0, le=2**64 - 1)")
+
+        elif self.proto_obj.type == FieldType.TYPE_FLOAT:
+            annotations.append("pydantic.AfterValidator(betterproto2.validators.validate_float32)")
+
+        elif self.proto_obj.type == FieldType.TYPE_STRING:
+            annotations.append("pydantic.AfterValidator(betterproto2.validators.validate_string)")
+
+        return annotations
+
     @property
     def annotation(self) -> str:
         py_type = self.py_type
 
         if self.use_builtins:
             py_type = f"builtins.{py_type}"
+
+        # Add the pydantic annotation if needed
+        if self.output_file.settings.pydantic_dataclasses:
+            annotations = self.annotations
+            if annotations:
+                py_type = f"typing.Annotated[{py_type}, {', '.join(annotations)}]"
+
         if self.repeated:
             return f"list[{py_type}]"
         if self.optional:
@@ -529,6 +602,7 @@ class EnumDefinitionCompiler(ProtoContentBase):
 
     output_file: OutputTemplate
     proto_obj: EnumDescriptorProto
+    prefixed_proto_name: str
     entries: list["EnumDefinitionCompiler.EnumEntry"] = field(default_factory=list)
 
     @dataclass(unsafe_hash=True, kw_only=True)
@@ -556,12 +630,23 @@ class EnumDefinitionCompiler(ProtoContentBase):
 
     @property
     def py_name(self) -> str:
-        return pythonize_class_name(self.proto_name)
+        return pythonize_class_name(self.prefixed_proto_name)
 
     @property
     def deprecated(self) -> bool:
         return bool(self.proto_obj.options and self.proto_obj.options.deprecated)
 
+    @property
+    def descriptor_name(self) -> str:
+        """Google protobuf library descriptor name.
+
+        Returns
+        -------
+        str
+            The Python name of the descriptor to reference.
+        """
+        return self.output_file.get_descriptor_name(self.source_file)
+
 
 @dataclass(kw_only=True)
 class ServiceCompiler(ProtoContentBase):

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/plugin/parser.py

@@ -35,20 +35,21 @@ from .models import (
 
 def traverse(
     proto_file: FileDescriptorProto,
-) -> Generator[tuple[EnumDescriptorProto | DescriptorProto, list[int]], None, None]:
+) -> Generator[tuple[EnumDescriptorProto | DescriptorProto, list[int], str], None, None]:
     # Todo: Keep information about nested hierarchy
     def _traverse(
         path: list[int],
         items: list[EnumDescriptorProto] | list[DescriptorProto],
         prefix: str = "",
-    ) -> Generator[tuple[EnumDescriptorProto | DescriptorProto, list[int]], None, None]:
+    ) -> Generator[tuple[EnumDescriptorProto | DescriptorProto, list[int], str], None, None]:
         for i, item in enumerate(items):
             # Adjust the name since we flatten the hierarchy.
-            # Todo: don't change the name, but include full name in returned tuple
             should_rename = not isinstance(item, DescriptorProto) or not item.options or not item.options.map_entry
 
-            item.name = next_prefix = f"{prefix}.{item.name}" if prefix and should_rename else item.name
-            yield item, [*path, i]
+            # Record prefixed name but *do not* mutate original file.
+            # We use this prefixed name to create pythonized names.
+            prefixed_name = next_prefix = f"{prefix}.{item.name}" if prefix and should_rename else item.name
+            yield item, [*path, i], prefixed_name
 
             if isinstance(item, DescriptorProto):
                 # Get nested types.
@@ -81,6 +82,7 @@ def get_settings(plugin_options: list[str]) -> Settings:
 
     return Settings(
         pydantic_dataclasses="pydantic_dataclasses" in plugin_options,
+        google_protobuf_descriptors="google_protobuf_descriptors" in plugin_options,
         client_generation=client_generation,
         server_generation=server_generation,
     )
@@ -109,12 +111,13 @@ def generate_code(request: CodeGeneratorRequest) -> CodeGeneratorResponse:
     # get the references to input/output messages for each service
     for output_package_name, output_package in request_data.output_packages.items():
         for proto_input_file in output_package.input_files:
-            for item, path in traverse(proto_input_file):
+            for item, path, prefixed_proto_name in traverse(proto_input_file):
                 read_protobuf_type(
                     source_file=proto_input_file,
                     item=item,
                     path=path,
                     output_package=output_package,
+                    prefixed_proto_name=prefixed_proto_name,
                 )
 
     # Read Services
@@ -168,6 +171,15 @@ def generate_code(request: CodeGeneratorRequest) -> CodeGeneratorResponse:
         )
     )
 
+    if settings.google_protobuf_descriptors:
+        response.file.append(
+            CodeGeneratorResponseFile(
+                name="google_proto_descriptor_pool.py",
+                content="from google.protobuf import descriptor_pool\n\n"
+                + "default_google_proto_descriptor_pool = descriptor_pool.DescriptorPool()\n",
+            )
+        )
+
     for output_package_name in sorted(output_paths.union(init_files)):
         print(f"Writing {output_package_name}", file=sys.stderr)
 
@@ -179,6 +191,7 @@ def read_protobuf_type(
     path: list[int],
     source_file: "FileDescriptorProto",
     output_package: OutputTemplate,
+    prefixed_proto_name: str,
 ) -> None:
     if isinstance(item, DescriptorProto):
         if item.options and item.options.map_entry:
@@ -188,10 +201,11 @@ def read_protobuf_type(
         message_data = MessageCompiler(
             source_file=source_file,
             output_file=output_package,
+            prefixed_proto_name=prefixed_proto_name,
             proto_obj=item,
             path=path,
         )
-        output_package.messages[message_data.proto_name] = message_data
+        output_package.messages[message_data.prefixed_proto_name] = message_data
 
         for index, field in enumerate(item.field):
             if is_map(field, item):
@@ -243,10 +257,11 @@ def read_protobuf_type(
         enum = EnumDefinitionCompiler(
             source_file=source_file,
             output_file=output_package,
+            prefixed_proto_name=prefixed_proto_name,
             proto_obj=item,
             path=path,
         )
-        output_package.enums[enum.proto_name] = enum
+        output_package.enums[enum.prefixed_proto_name] = enum
 
 
 def read_protobuf_service(

{betterproto2_compiler-0.5.1 → betterproto2_compiler-0.7.0}/src/betterproto2_compiler/settings.py

@@ -68,6 +68,7 @@ class ServerGeneration(StrEnum):
 @dataclass
 class Settings:
     pydantic_dataclasses: bool
+    google_protobuf_descriptors: bool
 
     client_generation: ClientGeneration
     server_generation: ServerGeneration