diff --git a/src/betterproto/__init__.py b/src/betterproto/__init__.py index b26ec4bca..93d61ca41 100644 --- a/src/betterproto/__init__.py +++ b/src/betterproto/__init__.py @@ -24,7 +24,7 @@ from ._types import T from .casing import camel_case, safe_snake_case, snake_case -from .grpc.grpclib_client import ServiceStub +from .grpc import ServiceBase, ServiceStub if sys.version_info[:2] < (3, 7): # Apply backport of datetime.fromisoformat from 3.7 diff --git a/src/betterproto/grpc/__init__.py b/src/betterproto/grpc/__init__.py index e69de29bb..f495c5196 100644 --- a/src/betterproto/grpc/__init__.py +++ b/src/betterproto/grpc/__init__.py @@ -0,0 +1,2 @@ +from .grpclib_client import ServiceStub +from .grpclib_server import ServiceBase diff --git a/src/betterproto/templates/template.py.j2 b/src/betterproto/templates/template.py.j2 index de53963ed..180a9d091 100644 --- a/src/betterproto/templates/template.py.j2 +++ b/src/betterproto/templates/template.py.j2 @@ -15,7 +15,6 @@ from typing import {% for i in output_file.typing_imports|sort %}{{ i }}{% if no {% endif %} import betterproto -from betterproto.grpc.grpclib_server import ServiceBase {% if output_file.services %} import grpclib {% endif %} @@ -156,7 +155,7 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub): {% endfor %} {% for service in output_file.services %} -class {{ service.py_name }}Base(ServiceBase): +class {{ service.py_name }}Base(betterproto.ServiceBase): {% if service.comment %} {{ service.comment }}