Fix 'typing' import collisions.

src/betterproto/compile/importing.py

@@ -57,7 +57,7 @@ def get_type_reference(
     if unwrap:
         if source_type in WRAPPER_TYPES:
             wrapped_type = type(WRAPPER_TYPES[source_type]().value)
-            return f"Optional[{wrapped_type.__name__}]"
+            return f"typing.Optional[{wrapped_type.__name__}]"
 
         if source_type == ".google.protobuf.Duration":
             return "timedelta"

src/betterproto/plugin/models.py

@@ -29,7 +29,6 @@
 reference to `A` to `B`'s `fields` attribute.
 """
 
-
 import builtins
 import re
 import textwrap
@@ -319,7 +318,7 @@ def py_name(self) -> str:
     @property
     def annotation(self) -> str:
         if self.repeated:
-            return f"List[{self.py_name}]"
+            return f"typing.List[{self.py_name}]"
         return self.py_name
 
     @property
@@ -438,11 +437,11 @@ def datetime_imports(self) -> Set[str]:
     def typing_imports(self) -> Set[str]:
         imports = set()
         annotation = self.annotation
-        if "Optional[" in annotation:
+        if "typing.Optional[" in annotation:
             imports.add("Optional")
-        if "List[" in annotation:
+        if "typing.List[" in annotation:
             imports.add("List")
-        if "Dict[" in annotation:
+        if "typing.Dict[" in annotation:
             imports.add("Dict")
         return imports
 
@@ -488,7 +487,7 @@ def optional(self) -> bool:
     @property
     def mutable(self) -> bool:
         """True if the field is a mutable type, otherwise False."""
-        return self.annotation.startswith(("List[", "Dict["))
+        return self.annotation.startswith(("typing.List[", "typing.Dict["))
 
     @property
     def field_type(self) -> str:
@@ -573,9 +572,9 @@ def annotation(self) -> str:
         if self.use_builtins:
             py_type = f"builtins.{py_type}"
         if self.repeated:
-            return f"List[{py_type}]"
+            return f"typing.List[{py_type}]"
         if self.optional:
-            return f"Optional[{py_type}]"
+            return f"typing.Optional[{py_type}]"
         return py_type
 
 
@@ -645,7 +644,7 @@ def field_type(self) -> str:
 
     @property
     def annotation(self) -> str:
-        return f"Dict[{self.py_k_type}, {self.py_v_type}]"
+        return f"typing.Dict[{self.py_k_type}, {self.py_v_type}]"
 
     @property
     def repeated(self) -> bool:

src/betterproto/templates/template.py.j2

@@ -21,8 +21,7 @@ from datetime import {% for i in output_file.datetime_imports|sort %}{{ i }}{% i
 
 {% endif%}
 {% if output_file.typing_imports %}
-from typing import {% for i in output_file.typing_imports|sort %}{{ i }}{% if not loop.last %}, {% endif %}{% endfor %}
-
+import typing
 {% endif %}
 
 {% if output_file.pydantic_imports %}
@@ -116,14 +115,14 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub):
             {%- if method.py_input_message -%}, {{ method.py_input_message_param }}: "{{ method.py_input_message_type }}"{%- endif -%}
         {%- else -%}
             {# Client streaming: need a request iterator instead #}
-            , {{ method.py_input_message_param }}_iterator: Union[AsyncIterable["{{ method.py_input_message_type }}"], Iterable["{{ method.py_input_message_type }}"]]
+            , {{ method.py_input_message_param }}_iterator: typing.Union[typing.AsyncIterable["{{ method.py_input_message_type }}"], typing.Iterable["{{ method.py_input_message_type }}"]]
         {%- endif -%}
             ,
             *
-            , timeout: Optional[float] = None
-            , deadline: Optional["Deadline"] = None
-            , metadata: Optional["MetadataLike"] = None
-            ) -> {% if method.server_streaming %}AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
+            , timeout: typing.Optional[float] = None
+            , deadline: typing.Optional["Deadline"] = None
+            , metadata: typing.Optional["MetadataLike"] = None
+            ) -> {% if method.server_streaming %}typing.AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
         {% if method.comment %}
 {{ method.comment }}
 
@@ -191,9 +190,9 @@ class {{ service.py_name }}Base(ServiceBase):
             {%- if method.py_input_message -%}, {{ method.py_input_message_param }}: "{{ method.py_input_message_type }}"{%- endif -%}
         {%- else -%}
             {# Client streaming: need a request iterator instead #}
-            , {{ method.py_input_message_param }}_iterator: AsyncIterator["{{ method.py_input_message_type }}"]
+            , {{ method.py_input_message_param }}_iterator: typing.AsyncIterator["{{ method.py_input_message_type }}"]
         {%- endif -%}
-            ) -> {% if method.server_streaming %}AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
+            ) -> {% if method.server_streaming %}typing.AsyncIterator["{{ method.py_output_message_type }}"]{% else %}"{{ method.py_output_message_type }}"{% endif %}:
         {% if method.comment %}
 {{ method.comment }}
 
@@ -225,7 +224,7 @@ class {{ service.py_name }}Base(ServiceBase):
 
     {% endfor %}
 
-    def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
+    def __mapping__(self) -> typing.Dict[str, grpclib.const.Handler]:
         return {
         {% for method in service.methods %}
         "{{ method.route }}": grpclib.const.Handler(

tests/test_get_ref_type.py

@@ -87,15 +87,15 @@ def test_reference_google_wellknown_types_non_wrappers_pydantic(
 @pytest.mark.parametrize(
     ["google_type", "expected_name"],
     [
-        (".google.protobuf.DoubleValue", "Optional[float]"),
-        (".google.protobuf.FloatValue", "Optional[float]"),
-        (".google.protobuf.Int32Value", "Optional[int]"),
-        (".google.protobuf.Int64Value", "Optional[int]"),
-        (".google.protobuf.UInt32Value", "Optional[int]"),
-        (".google.protobuf.UInt64Value", "Optional[int]"),
-        (".google.protobuf.BoolValue", "Optional[bool]"),
-        (".google.protobuf.StringValue", "Optional[str]"),
-        (".google.protobuf.BytesValue", "Optional[bytes]"),
+        (".google.protobuf.DoubleValue", "typing.Optional[float]"),
+        (".google.protobuf.FloatValue", "typing.Optional[float]"),
+        (".google.protobuf.Int32Value", "typing.Optional[int]"),
+        (".google.protobuf.Int64Value", "typing.Optional[int]"),
+        (".google.protobuf.UInt32Value", "typing.Optional[int]"),
+        (".google.protobuf.UInt64Value", "typing.Optional[int]"),
+        (".google.protobuf.BoolValue", "typing.Optional[bool]"),
+        (".google.protobuf.StringValue", "typing.Optional[str]"),
+        (".google.protobuf.BytesValue", "typing.Optional[bytes]"),
     ],
 )
 def test_referenceing_google_wrappers_unwraps_them(