betterproto2-compiler 0.5.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

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.6.0")
 
 
 class FieldCardinality(betterproto2.Enum):

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.6.0")
 
 
 class CodeGeneratorResponseFeature(betterproto2.Enum):

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/plugin/models.py

@@ -353,8 +353,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 +410,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:

betterproto2_compiler/templates/header.py.j2

@@ -6,15 +6,8 @@
 # This file has been @generated
 
 __all__ = (
-    {% for _, enum in output_file.enums|dictsort(by="key") %}
-        "{{ enum.py_name }}",
-    {%- endfor -%}
-    {% for _, message in output_file.messages|dictsort(by="key") %}
-        "{{ message.py_name }}",
-    {%- endfor -%}
-    {% for _, service in output_file.services|dictsort(by="key") %}
-        "{{ service.py_name }}Stub",
-        "{{ service.py_name }}Base",
+    {%- for name in all -%}
+    "{{ name }}",
     {%- endfor -%}
 )
 
@@ -28,6 +21,7 @@ import typing
 from typing import TYPE_CHECKING
 
 {% if output_file.settings.pydantic_dataclasses %}
+import pydantic
 from pydantic.dataclasses import dataclass
 from pydantic import model_validator
 {%- else -%}

betterproto2_compiler/templates/service_stub.py.j2

@@ -1,4 +1,4 @@
-class {% block class_name %}{% endblock %}({% block inherit_from %}{% endblock %}):
+class {% filter add_to_all %}{% block class_name %}{% endblock %}{% endfilter %}({% block inherit_from %}{% endblock %}):
     {% block service_docstring scoped %}
     {% if service.comment %}
     """

betterproto2_compiler/templates/template.py.j2

@@ -1,5 +1,5 @@
 {% for _, enum in output_file.enums|dictsort(by="key") %}
-class {{ enum.py_name }}(betterproto2.Enum):
+class {{ enum.py_name | add_to_all }}(betterproto2.Enum):
     {% if enum.comment %}
     """
     {{ enum.comment | indent(4) }}
@@ -31,7 +31,7 @@ class {{ enum.py_name }}(betterproto2.Enum):
 {% else %}
 @dataclass(eq=False, repr=False)
 {% endif %}
-class {{ message.py_name }}(betterproto2.Message):
+class {{ message.py_name | add_to_all }}(betterproto2.Message):
     {% if message.comment or message.oneofs %}
     """
     {{ message.comment | indent(4) }}
@@ -104,7 +104,7 @@ default_message_pool.register_message("{{ output_file.package }}", "{{ message.p
 
 {% if output_file.settings.server_generation == "async" %}
 {% for _, service in output_file.services|dictsort(by="key") %}
-class {{ service.py_name }}Base(ServiceBase):
+class {{ (service.py_name + "Base") | add_to_all }}(ServiceBase):
     {% if service.comment %}
     """
     {{ service.comment | indent(4) }}

betterproto2_compiler-0.6.0.dist-info/METADATA

@@ -0,0 +1,15 @@
+Metadata-Version: 2.4
+Name: betterproto2_compiler
+Version: 0.6.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.7,>=0.6.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.dist-info → betterproto2_compiler-0.6.0.dist-info}/RECORD

@@ -1,5 +1,7 @@
 betterproto2_compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 betterproto2_compiler/casing.py,sha256=HSXLXAOqZzEnu-tC1SZjpW0LIjzdPqUNJEwy1BHzfgg,3056
+betterproto2_compiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+betterproto2_compiler/settings.py,sha256=ggLU8qYTTACwdNN94cSznQchu-fJSJxZz041FXRwq7Y,1976
 betterproto2_compiler/compile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 betterproto2_compiler/compile/importing.py,sha256=cJZ1BqjSHaDwXlfseH7f73pMnBZTiqLyOQfQfyganVM,6256
 betterproto2_compiler/compile/naming.py,sha256=zf0VOmNojzyv33upOGelGxjZTEDE8JULEEED5_3inHg,562
@@ -9,27 +11,24 @@ betterproto2_compiler/known_types/duration.py,sha256=M-qsFeiHsw5Z_AoSata1ZUjfkho
 betterproto2_compiler/known_types/google_values.py,sha256=7JoPXVs6cVg_ihIWlWIDElSSuW0BymRnPHerz1bFuH4,6688
 betterproto2_compiler/known_types/timestamp.py,sha256=y1sNWG2Q0FWv6nIte1UTifFVCsryp7T8foXZqp4qhQQ,3409
 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=yC7k_A1XA9-CPzhIaJfWJSIBpqyaLx7IVVuvXrqD-iQ,102114
-betterproto2_compiler/lib/google/protobuf/compiler/__init__.py,sha256=IriT5naeEkcxA-R2EpzOGBMLVGgVO6CXqvrR8HVaR28,9600
 betterproto2_compiler/lib/message_pool.py,sha256=4-cRhhiM6bmfpUJZ8qxc8LEyqHBHpLCcotjbyZxl7JM,71
+betterproto2_compiler/lib/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+betterproto2_compiler/lib/google/protobuf/__init__.py,sha256=UWGp10_l07eCd2AW1qVVJHrfWf7DiQHQqWoBLOxbDfI,102114
+betterproto2_compiler/lib/google/protobuf/compiler/__init__.py,sha256=NSY2v-qU_CIqGHtXv02fXs1D6K_bPWJtr5Gf9byPFpA,9600
 betterproto2_compiler/plugin/__init__.py,sha256=L3pW0b4CvkM5x53x_sYt1kYiSFPO0_vaeH6EQPq9FAM,43
 betterproto2_compiler/plugin/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-betterproto2_compiler/plugin/compiler.py,sha256=3sPbCtdzjAGftVvoGe5dvxE8uTzJ78hABA-_f-1rEUo,2471
+betterproto2_compiler/plugin/compiler.py,sha256=9jZcNlwxWLUQlZyCLKG33P2xCoJgqaIQHIgcZM40JGY,2730
 betterproto2_compiler/plugin/main.py,sha256=b1jDEdG1Iau-4cPq89uSjU0SHwC278SxqwiuFwIF8fA,1288
-betterproto2_compiler/plugin/models.py,sha256=rzCKsdoV-0QCwmRN82x2QZ6029W9EAAJCFbLGMkVoz8,22215
+betterproto2_compiler/plugin/models.py,sha256=2JZWVgzemhgoyZdeArLEh7fBdxBLpqQOvUXlx8cRD1c,23638
 betterproto2_compiler/plugin/module_validation.py,sha256=JnP8dSN83eJJVDP_UPJsHzq7E7Md3lah0PnKXDbFW5Q,4808
 betterproto2_compiler/plugin/parser.py,sha256=XJd7n78E6Gnv04L1faGyTCOV3v0sv1eD5-AenNhPDMQ,10197
 betterproto2_compiler/plugin/plugin.bat,sha256=lfLT1WguAXqyerLLsRL6BfHA0RqUE6QG79v-1BYVSpI,48
-betterproto2_compiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-betterproto2_compiler/settings.py,sha256=ggLU8qYTTACwdNN94cSznQchu-fJSJxZz041FXRwq7Y,1976
-betterproto2_compiler/templates/header.py.j2,sha256=nTUJ-BioeTTCrEr2ZbxPPUl6iBqHOxXr_NAVOGa8jYg,1622
-betterproto2_compiler/templates/service_stub.py.j2,sha256=r0AefgNbDCh-iDgFNV7aNx8fNe5kQY-8TNew-T_tUXc,929
+betterproto2_compiler/templates/header.py.j2,sha256=9W34FKHVKItXQzIpiWQQbjBLP1PzGdJOdnef1IlJGa4,1311
+betterproto2_compiler/templates/service_stub.py.j2,sha256=2fhbty6uw57EyxOskGcNlZjIjGELMKWY--pvq5ZEjFw,967
 betterproto2_compiler/templates/service_stub_async.py.j2,sha256=JNOAa8FPhzYS5D0zi0DPESVEwAjkdFsVQZ008Qi4JmE,2968
 betterproto2_compiler/templates/service_stub_sync.py.j2,sha256=V7HJIQJEgivX8VEBt7Ju6cXG5FeeCY9QyYMy1kicElM,2642
-betterproto2_compiler/templates/template.py.j2,sha256=kP1TMTK7BCv6sEFTGXPZs_jg39lC_IdvKTFWPHm8BgU,5415
-betterproto2_compiler-0.5.1.dist-info/LICENSE.md,sha256=Pgl2pReU-2yw2miGeQ55UFlyzqAZ_EpYVyZ2nWjwRv4,1121
-betterproto2_compiler-0.5.1.dist-info/METADATA,sha256=7wZ7cc4n5R4S9lnl2jBYY89Hib9WynJySv0zFk_3zjM,1225
-betterproto2_compiler-0.5.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-betterproto2_compiler-0.5.1.dist-info/entry_points.txt,sha256=re3Qg8lLljbVobeeKH2f1FVQZ114wfZkGv3zCZTD8Ok,84
-betterproto2_compiler-0.5.1.dist-info/RECORD,,
+betterproto2_compiler/templates/template.py.j2,sha256=0Cwq8b3cW6mnMjo6vGO03fz4SoGM7GXvVh6TzGB4Nk4,5461
+betterproto2_compiler-0.6.0.dist-info/METADATA,sha256=DSjcX8CLq6uxzwDY_DQYH6jnhgJc42CN-tSyuhn51sY,658
+betterproto2_compiler-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+betterproto2_compiler-0.6.0.dist-info/entry_points.txt,sha256=MXDaz7YfiaWx8KiSzArjUPLt6eTlMRbqzE4jCjXozuI,85
+betterproto2_compiler-0.6.0.dist-info/RECORD,,

{betterproto2_compiler-0.5.1.dist-info → betterproto2_compiler-0.6.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

betterproto2_compiler-0.6.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+protoc-gen-python_betterproto2 = betterproto2_compiler.plugin:main

betterproto2_compiler-0.5.1.dist-info/LICENSE.md

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Daniel G. Taylor
-Copyright (c) 2024 The betterproto contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

betterproto2_compiler-0.5.1.dist-info/METADATA

@@ -1,36 +0,0 @@
-Metadata-Version: 2.3
-Name: betterproto2_compiler
-Version: 0.5.1
-Summary: Compiler for betterproto2
-License: MIT
-Keywords: protobuf,gRPC,compiler
-Author: Adrien Vannson
-Author-email: adrien.vannson@protonmail.com
-Requires-Python: >=3.10,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-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[grpclib] (>=0.5.1,<0.6.0)
-Requires-Dist: jinja2 (>=3.0.3)
-Requires-Dist: ruff (>=0.9.3,<0.10.0)
-Requires-Dist: strenum (>=0.4.15,<0.5.0) ; python_version == "3.10"
-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
-
-![](https://github.com/betterproto/python-betterproto2-compiler/actions/workflows/ci.yml/badge.svg)
-
-
-
-## License
-
-Copyright © 2019 Daniel G. Taylor
-
-Copyright © 2024 The betterproto contributors
-

betterproto2_compiler-0.5.1.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-protoc-gen-python_betterproto2=betterproto2_compiler.plugin:main
-