Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plugin generated path error #97

Merged
merged 1 commit into from
Dec 5, 2019
Merged

Fix plugin generated path error #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions grpclib/plugin/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
from .. import server


SUFFIX = '_grpc.py'

_CARDINALITY = {
(False, False): const.Cardinality.UNARY_UNARY,
(True, False): const.Cardinality.STREAM_UNARY,
Expand Down Expand Up @@ -165,8 +163,25 @@ def _get_proto(request: CodeGeneratorRequest, name: str) -> FileDescriptorProto:
return next(f for f in request.proto_file if f.name == name)


def _proto2py(proto_name: str) -> str:
return proto_name.replace('/', '.')[:-len('.proto')] + '_pb2'
def _strip_proto(proto_file_path: str) -> str:
for suffix in [".protodevel", ".proto"]:
if proto_file_path.endswith(suffix):
return proto_file_path[: -len(suffix)]

return proto_file_path


def _base_module_name(proto_file_path: str) -> str:
basename = _strip_proto(proto_file_path)
return basename.replace("-", "_").replace("/", ".")


def _proto2pb2_module_name(proto_file_path: str) -> str:
return _base_module_name(proto_file_path) + "_pb2"


def _proto2grpc_module_name(proto_file_path: str) -> str:
return _base_module_name(proto_file_path) + "_grpc"


def _type_names(
Expand All @@ -183,7 +198,7 @@ def _type_names(
proto_name_parts.extend(parents)
proto_name_parts.append(message_type.name)

py_name_parts = [_proto2py(proto_file.name)]
py_name_parts = [_proto2pb2_module_name(proto_file.name)]
py_name_parts.extend(parents)
py_name_parts.append(message_type.name)

Expand All @@ -208,7 +223,7 @@ def main() -> None:
for file_to_generate in request.file_to_generate:
proto_file = _get_proto(request, file_to_generate)

imports = [_proto2py(dep)
imports = [_proto2pb2_module_name(dep)
for dep in list(proto_file.dependency) + [file_to_generate]]

services = []
Expand All @@ -227,7 +242,8 @@ def main() -> None:
methods=methods))

file = response.file.add()
file.name = file_to_generate.replace('.proto', SUFFIX)
module_name = _proto2grpc_module_name(file_to_generate)
file.name = module_name.replace(".", "/") + ".py"
file.content = render(
proto_file=proto_file.name,
package=proto_file.package,
Expand Down