cleanup fork

Author: Ben Bonenfant

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "betterproto"
-version = "2.0.0b5"
+version = "2.0.0b5+pachv1.0.0"
 description = "A better Protobuf / gRPC generator & library"
 authors = ["Daniel G. Taylor <danielgtaylor@gmail.com>"]
 readme = "README.md"
@@ -44,7 +44,6 @@ protoc-gen-python_betterproto = "betterproto.plugin:main"
 
 [tool.poetry.extras]
 compiler = ["black", "isort", "jinja2"]
-grpcio = ["grpcio"]
 
 
 # Dev workflow tasks

src/betterproto/grpc/grpcio_server.py

@@ -31,4 +31,4 @@ def register_servicers(server: "grpc.aio.Server", *servicers: ServicerBase):
             )
             for servicer in servicers
         )
-    )
+    )

src/betterproto/plugin/models.py

@@ -211,18 +211,11 @@ def comment(self) -> str:
             proto_file=self.source_file, path=self.path, indent=self.comment_indent
         )
 
-@dataclass
-class Options:
-    grpc_kind: str = "grpclib"
-    include_google: bool = False
-
-
 
 @dataclass
 class PluginRequestCompiler:
 
     plugin_request_obj: CodeGeneratorRequest
-    options: Options
     output_packages: Dict[str, "OutputTemplate"] = field(default_factory=dict)
 
     @property
@@ -811,7 +804,7 @@ def py_input_message_type(self) -> str:
             package=self.output_file.package,
             imports=self.output_file.imports,
             source_type=self.proto_obj.input_type,
-            unwrap=False,  # TODO: was True
+            unwrap=False,
         ).strip('"')
 
     @property

src/betterproto/plugin/parser.py

@@ -27,7 +27,6 @@
     FieldCompiler,
     MapEntryCompiler,
     MessageCompiler,
-    Options,
     OneOfFieldCompiler,
     OutputTemplate,
     PluginRequestCompiler,
@@ -66,26 +65,13 @@ def _traverse(
     yield from _traverse([4], proto_file.message_type)
 
 
-def parse_options(plugin_options: List[str]) -> Options:
-    options = Options()
-    for option in plugin_options:
-        if option == "INCLUDE_GOOGLE":
-            options.include_google = True
-    return options
-
-
 def generate_code(request: CodeGeneratorRequest) -> CodeGeneratorResponse:
     response = CodeGeneratorResponse()
 
     plugin_options = request.parameter.split(",") if request.parameter else []
     response.supported_features = CodeGeneratorResponseFeature.FEATURE_PROTO3_OPTIONAL
 
-    options = parse_options(plugin_options)
-
-    request_data = PluginRequestCompiler(
-        plugin_request_obj=request, options=options
-    )
-
+    request_data = PluginRequestCompiler(plugin_request_obj=request)
     # Gather output packages
     for proto_file in request.proto_file:
         output_package_name = proto_file.package

src/betterproto/templates/template.py.j2

@@ -232,4 +232,4 @@ class {{ service.py_name }}Base(ServicerBase):
         {% endfor %}
         }
 
-{% endfor %}
+{% endfor %}