betterproto2-compiler 0.8.0__tar.gz → 0.9.0__tar.gz

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: betterproto2_compiler
-Version: 0.8.0
+Version: 0.9.0
 Summary: Compiler for betterproto2
 Project-URL: Documentation, https://betterproto.github.io/python-betterproto2/
 Project-URL: Repository, https://github.com/betterproto/python-betterproto2
@@ -8,7 +8,7 @@ Author-email: Adrien Vannson <adrien.vannson@protonmail.com>, "Daniel G. Taylor"
 License-Expression: MIT
 Keywords: compiler,gRPC,protobuf
 Requires-Python: <4.0,>=3.10
-Requires-Dist: betterproto2[grpclib]<0.9,>=0.8.0
+Requires-Dist: betterproto2<0.10,>=0.9.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'

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "betterproto2_compiler"
-version = "0.8.0"
+version = "0.9.0"
 description = "Compiler for betterproto2"
 authors = [
     { name = "Adrien Vannson", email = "adrien.vannson@protonmail.com" },
@@ -15,8 +15,8 @@ keywords = [
 requires-python = ">=3.10,<4.0"
 dependencies = [
     # TODO use the version from the current repo?
-    "betterproto2[grpclib]>=0.8.0,<0.9",
-    # "betterproto2[grpclib]",
+    "betterproto2>=0.9.0,<0.10",
+    # "betterproto2",
     "ruff~=0.9.3",
     "jinja2>=3.0.3",
     "typing-extensions>=4.7.1,<5",
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 # [tool.uv.sources]
-# "betterproto2" = { path = "../betterproto2" }
+# betterproto2 = { path = "../betterproto2" }
 
 [project.urls]
 Documentation = "https://betterproto.github.io/python-betterproto2/"
@@ -35,7 +35,7 @@ protoc-gen-python_betterproto2 = "betterproto2_compiler.plugin:main"
 
 [dependency-groups]
 dev = [
-    "pre-commit>=2.17.0,<3",
+    "pre-commit>=4.2.0,<5",
     "grpcio-tools>=1.54.2,<2",
     "poethepoet>=0.32.2,<0.33",
     "pyright>=1.1.391,<2",

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/lib/__init__.py

@@ -8,5 +8,5 @@ __all__ = ()
 
 import betterproto2
 
-_COMPILER_VERSION = "0.8.0"
+_COMPILER_VERSION = "0.9.0"
 betterproto2.check_compiler_version(_COMPILER_VERSION)

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/lib/google/protobuf/__init__.py

@@ -97,7 +97,7 @@ import dateutil.parser
 
 from ...message_pool import default_message_pool
 
-_COMPILER_VERSION = "0.8.0"
+_COMPILER_VERSION = "0.9.0"
 betterproto2.check_compiler_version(_COMPILER_VERSION)
 
 
@@ -2965,13 +2965,15 @@ default_message_pool.register_message("google.protobuf", "MethodDescriptorProto"
 
 @dataclass(eq=False, repr=False)
 class MethodOptions(betterproto2.Message):
-    deprecated: "bool" = betterproto2.field(33, betterproto2.TYPE_BOOL)
     """
     Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
       framework.  We apologize for hoarding these numbers to ourselves, but
       we were already using them long before we decided to release Protocol
       Buffers.
+    """
 
+    deprecated: "bool" = betterproto2.field(33, betterproto2.TYPE_BOOL)
+    """
     Is this method deprecated?
     Depending on the target platform, this can emit Deprecated annotations
     for the method, or it will be completely ignored; in the very least,
@@ -3445,7 +3447,7 @@ class Struct(betterproto2.Message):
         for key, val in value.items():
             fields[key] = Value.from_dict(val)
 
-        return cls(fields=fields)
+        return cls(fields=fields)  # type: ignore[reportArgumentType]
 
     def to_dict(
         self,

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/lib/google/protobuf/compiler/__init__.py

@@ -17,7 +17,7 @@ import betterproto2
 
 from ....message_pool import default_message_pool
 
-_COMPILER_VERSION = "0.8.0"
+_COMPILER_VERSION = "0.9.0"
 betterproto2.check_compiler_version(_COMPILER_VERSION)
 
 

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/templates/header.py.j2

@@ -29,7 +29,7 @@ from dataclasses import dataclass
 {% endif %}
 
 import betterproto2
-from betterproto2.grpc.grpclib_server import ServiceBase
+from betterproto2 import grpclib as betterproto2_grpclib
 import grpc
 import grpclib
 from google.protobuf.descriptor import Descriptor, EnumDescriptor
@@ -49,7 +49,7 @@ from .google_proto_descriptor_pool import default_google_proto_descriptor_pool
 
 if TYPE_CHECKING:
     import grpclib.server
-    from betterproto2.grpc.grpclib_client import MetadataLike
+    from betterproto2.grpclib.grpclib_client import MetadataLike
     from grpclib.metadata import Deadline
 
 _COMPILER_VERSION="{{ version }}"

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/templates/service_stub_async.py.j2

@@ -2,7 +2,7 @@
 
 {# Class definition #}
 {% block class_name %}{{ service.py_name }}{% if output_file.settings.client_generation.is_async_prefixed %}Async{% endif %}Stub{% endblock %}
-{% block inherit_from %}betterproto2.ServiceStub{% endblock %}
+{% block inherit_from %}betterproto2_grpclib.ServiceStub{% endblock %}
 
 {# Methods definition #}
 {% block method_definition %}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/src/betterproto2_compiler/templates/template.py.j2

@@ -139,7 +139,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") | add_to_all }}(ServiceBase):
+class {{ (service.py_name + "Base") | add_to_all }}(betterproto2_grpclib.ServiceBase):
     {% if service.comment %}
     """
     {{ service.comment | indent(4) }}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/generate.py

@@ -17,6 +17,7 @@ async def generate_test(
     reference: bool = False,
     pydantic: bool = False,
     descriptors: bool = False,
+    client_generation: str = "async_sync",
 ):
     await semaphore.acquire()
 
@@ -41,6 +42,7 @@ async def generate_test(
         reference=reference,
         pydantic_dataclasses=pydantic,
         google_protobuf_descriptors=descriptors,
+        client_generation=client_generation,
     )
 
     if options:
@@ -74,14 +76,14 @@ async def main_async():
         generate_test("casing", semaphore),
         generate_test("compiler_lib", semaphore),
         generate_test("deprecated", semaphore, reference=True),
-        generate_test("deprecated", semaphore),
-        generate_test("documentation", semaphore),
+        generate_test("deprecated", semaphore, client_generation="async"),
+        generate_test("documentation", semaphore, client_generation="async"),
         generate_test("double", semaphore, reference=True),
         generate_test("double", semaphore),
         generate_test("encoding_decoding", semaphore),
         generate_test("enum", semaphore, reference=True),
         generate_test("enum", semaphore),
-        generate_test("example_service", semaphore),
+        generate_test("example_service", semaphore, client_generation="async"),
         generate_test("features", semaphore),
         generate_test("field_name_identical_to_type", semaphore, reference=True),
         generate_test("field_name_identical_to_type", semaphore),
@@ -92,20 +94,20 @@ async def main_async():
         generate_test("google_impl_behavior_equivalence", semaphore, reference=True),
         generate_test("google_impl_behavior_equivalence", semaphore),
         generate_test("google", semaphore),
-        generate_test("googletypes_request", semaphore),
-        generate_test("googletypes_response_embedded", semaphore),
-        generate_test("googletypes_response", semaphore),
+        generate_test("googletypes_request", semaphore, client_generation="async"),
+        generate_test("googletypes_response_embedded", semaphore, client_generation="async"),
+        generate_test("googletypes_response", semaphore, client_generation="async"),
         generate_test("googletypes_struct", semaphore, reference=True),
         generate_test("googletypes_struct", semaphore),
         generate_test("googletypes_value", semaphore, reference=True),
         generate_test("googletypes_value", semaphore),
         generate_test("googletypes", semaphore, reference=True),
         generate_test("googletypes", semaphore),
-        generate_test("grpclib_reflection", semaphore, descriptors=True),
-        generate_test("grpclib_reflection", semaphore),
+        generate_test("grpclib_reflection", semaphore, descriptors=True, client_generation="async"),
+        generate_test("grpclib_reflection", semaphore, client_generation="async"),
         generate_test("import_cousin_package_same_name", semaphore, descriptors=True),
         generate_test("import_cousin_package_same_name", semaphore),
-        generate_test("import_service_input_message", semaphore),
+        generate_test("import_service_input_message", semaphore, client_generation="async"),
         generate_test("int32", semaphore, reference=True),
         generate_test("int32", semaphore),
         generate_test("invalid_field", semaphore, pydantic=True),
@@ -152,8 +154,8 @@ async def main_async():
         generate_test("repeatedmessage", semaphore),
         generate_test("repeatedpacked", semaphore, reference=True),
         generate_test("repeatedpacked", semaphore),
-        generate_test("rpc_empty_input_message", semaphore),
-        generate_test("service_uppercase", semaphore),
+        generate_test("rpc_empty_input_message", semaphore, client_generation="async"),
+        generate_test("service_uppercase", semaphore, client_generation="async"),
         generate_test("service", semaphore),
         generate_test("signed", semaphore, reference=True),
         generate_test("signed", semaphore),

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/any/any.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-import "google/protobuf/any.proto";
-
 package any;
 
+import "google/protobuf/any.proto";
+
 message Person {
-    string first_name = 1;
-    string last_name = 2;
+  string first_name = 1;
+  string last_name = 2;
 }

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/bool/bool.proto

@@ -3,5 +3,5 @@ syntax = "proto3";
 package bool;
 
 message Test {
-    bool value = 1;
+  bool value = 1;
 }

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/bytes/bytes.proto

@@ -3,5 +3,5 @@ syntax = "proto3";
 package bytes;
 
 message Test {
-    bytes data = 1;
+  bytes data = 1;
 }

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/casing/casing.proto

@@ -15,6 +15,4 @@ message Test {
   int32 UPPERCASE = 4;
 }
 
-message snake_case_message {
-
-}
+message snake_case_message {}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/casing_inner_class/casing_inner_class.proto

@@ -8,4 +8,4 @@ message Test {
     sint32 old_exp = 1;
   }
   inner_class inner = 2;
-}
+}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto

@@ -6,4 +6,4 @@ message Test {
   int32 UPPERCASE = 1;
   int32 UPPERCASE_V2 = 2;
   int32 UPPER_CAMEL_CASE = 3;
-}
+}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/compiler_lib/plugin.proto

@@ -21,13 +21,13 @@
 syntax = "proto2";
 
 package google.protobuf.compiler;
-option java_package = "com.google.protobuf.compiler";
-option java_outer_classname = "PluginProtos";
 
 import "google/protobuf/descriptor.proto";
 
 option csharp_namespace = "Google.Protobuf.Compiler";
 option go_package = "google.golang.org/protobuf/types/pluginpb";
+option java_outer_classname = "PluginProtos";
+option java_package = "com.google.protobuf.compiler";
 
 // The version number of protocol compiler.
 message Version {
@@ -177,4 +177,4 @@ message CodeGeneratorResponse {
     optional GeneratedCodeInfo generated_code_info = 16;
   }
   repeated File file = 15;
-}
+}

betterproto2_compiler-0.9.0/tests/inputs/deprecated/deprecated.proto

@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package deprecated;
+
+// Some documentation about the Test message.
+message Test {
+  Message message = 1 [deprecated = true];
+  int32 value = 2;
+  message Nested {
+    int32 nested_value = 1 [deprecated = true];
+  }
+}
+
+message Message {
+  option deprecated = true;
+  string value = 1;
+}
+
+message Empty {}
+
+service TestService {
+  rpc func(Empty) returns (Empty);
+  rpc deprecated_func(Empty) returns (Empty) {
+    option deprecated = true;
+  }
+}

betterproto2_compiler-0.9.0/tests/inputs/documentation/documentation.proto

@@ -0,0 +1,62 @@
+syntax = "proto3";
+package documentation;
+
+// Documentation of message 1
+// other line 1
+
+// Documentation of message 2
+// other line 2
+message Test { // Documentation of message 3
+  // Documentation of field 1
+  // other line 1
+
+  // Documentation of field 2
+  // other line 2
+  uint32 x = 1; // Documentation of field 3
+
+  // Documentation of oneof 1
+  // other line 1
+
+  // Documentation of oneof 2
+  // other line 2
+  oneof oneof_example { // Documentation of oneof 3
+    // Documentation of oneof field 1
+    // other line 1
+
+    // Documentation of oneof field 2
+    // other line 2
+    int32 a = 2; // Documentation of oneof field 3
+  }
+}
+
+// Documentation of enum 1
+// other line 1
+
+// Documentation of enum 2
+// other line 2
+enum Enum { // Documentation of enum 3
+  // Documentation of variant 1
+  // other line 1
+
+  // Documentation of variant 2
+  // other line 2
+  Enum_Variant = 0; // Documentation of variant 3
+}
+
+// Documentation of service 1
+// other line 1
+
+// Documentation of service 2
+// other line 2
+service Service { // Documentation of service 3
+  // Documentation of method 1
+  // other line 1
+
+  // Documentation of method 2
+  // other line 2
+  rpc get(Test) returns (Test); // Documentation of method 3
+}
+
+// A comment with backslashes \ and triple quotes """
+// Simple quotes are not escaped "
+message ComplexDocumentation {}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/double/double.proto

@@ -3,5 +3,5 @@ syntax = "proto3";
 package double;
 
 message Test {
-    double count = 1;
+  double count = 1;
 }

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/empty_service/empty_service.proto

@@ -3,5 +3,4 @@ syntax = "proto3";
 
 package empty_service;
 
-service Test {
-}
+service Test {}

betterproto2_compiler-0.9.0/tests/inputs/encoding_decoding/encoding_decoding.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package encoding_decoding;
+
+message Overflow32 {
+  uint32 uint = 1;
+  int32 int = 2;
+  sint32 sint = 3;
+}
+
+message Overflow64 {
+  uint64 uint = 1;
+  int64 int = 2;
+  sint64 sint = 3;
+}

{betterproto2_compiler-0.8.0 → betterproto2_compiler-0.9.0}/tests/inputs/entry/entry.proto

@@ -12,9 +12,9 @@ package entry;
 // error because the parent type does not have a "nested_type" attribute.
 
 message Test {
-    repeated ExportEntry export = 1;
+  repeated ExportEntry export = 1;
 }
 
 message ExportEntry {
-    string name = 1;
+  string name = 1;
 }

betterproto2_compiler-0.9.0/tests/inputs/enum/enum.proto

@@ -0,0 +1,67 @@
+syntax = "proto3";
+
+package enum;
+
+// Tests that enums are correctly serialized and that it correctly handles skipped and out-of-order enum values
+message Test {
+  Choice choice = 1;
+  repeated Choice choices = 2;
+}
+
+enum Choice {
+  ZERO = 0;
+  ONE = 1;
+  // TWO = 2;
+  FOUR = 4;
+  THREE = 3;
+  MINUS_ONE = -1;
+}
+
+// A "C" like enum with the enum name prefixed onto members, these should be stripped
+enum ArithmeticOperator {
+  ARITHMETIC_OPERATOR_NONE = 0;
+  ARITHMETIC_OPERATOR_PLUS = 1;
+  ARITHMETIC_OPERATOR_MINUS = 2;
+  ARITHMETIC_OPERATOR_0_PREFIXED = 3;
+}
+
+// If not all the fields are prefixed, the prefix should not be stripped at all
+enum NoStriping {
+  NO_STRIPING_NONE = 0;
+  NO_STRIPING_A = 1;
+  B = 2;
+}
+
+// Make sure that the prefix are removed even if it's difficult to infer the position
+// of underscores.
+enum HTTPCode {
+  HTTP_CODE_UNSPECIFIED = 0;
+  HTTP_CODE_OK = 200;
+  HTTP_CODE_NOT_FOUND = 404;
+}
+
+message EnumMessage {
+  ArithmeticOperator arithmetic_operator = 1;
+  NoStriping no_striping = 2;
+}
+
+enum OldVersion {
+  OLD_VERSION_UNSPECIFIED = 0;
+  OLD_VERSION_V1 = 1;
+  OLD_VERSION_V2 = 2;
+}
+
+message OldVersionMessage {
+  OldVersion old_version = 1;
+}
+
+enum NewVersion {
+  NEW_VERSION_UNSPECIFIED = 0;
+  NEW_VERSION_V1 = 1;
+  NEW_VERSION_V2 = 2;
+  NEW_VERSION_V3 = 3;
+}
+
+message NewVersionMessage {
+  NewVersion new_version = 1;
+}