make most of mypy happy

strawberry-graphql · Jul 22, 2023 · 43dcf1d · 43dcf1d
1 parent 1171abc
commit 43dcf1d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/strawberry/experimental/pydantic/conversion.py b/strawberry/experimental/pydantic/conversion.py
@@ -14,6 +14,7 @@
 
 if TYPE_CHECKING:
     from strawberry.type import StrawberryType
+    from strawberry.field import StrawberryField
 
 
 def _convert_from_pydantic_to_strawberry_type(

diff --git a/strawberry/experimental/pydantic/error_type.py b/strawberry/experimental/pydantic/error_type.py
@@ -23,7 +23,7 @@
     get_strawberry_type_from_model,
     normalize_type,
 )
-from strawberry.experimental.pydantic.v2_compat import lenient_issubclass, get_model_fields
+from strawberry.experimental.pydantic.v2_compat import lenient_issubclass, get_model_fields, CompatModelField
 from strawberry.object_type import _process_type, _wrap_dataclass
 from strawberry.types.type_resolver import _get_fields
 from strawberry.utils.typing import get_list_annotation, is_list
@@ -32,11 +32,8 @@
 
 from .exceptions import MissingFieldsListError
 
-if TYPE_CHECKING:
-    from pydantic.fields import ModelField
 
-
-def get_type_for_field(field: ModelField) -> Union[Any, Type[None], Type[List]]:
+def get_type_for_field(field: CompatModelField) -> Union[Any, Type[None], Type[List]]:
     type_ = field.outer_type_
     type_ = normalize_type(type_)
     return field_type_to_type(type_)

diff --git a/strawberry/experimental/pydantic/fields.py b/strawberry/experimental/pydantic/fields.py
@@ -22,7 +22,7 @@
 
 try:
     from typing import GenericAlias as TypingGenericAlias  # type: ignore
-    from types import UnionType as TypingUnionType  # type: ignore
+    from types import UnionType as TypingUnionType
 except ImportError:
     import sys
 

diff --git a/strawberry/experimental/pydantic/utils.py b/strawberry/experimental/pydantic/utils.py
@@ -33,7 +33,6 @@
 
 if TYPE_CHECKING:
     from pydantic import BaseModel
-    from pydantic.fields import ModelField
     from pydantic.typing import NoArgAnyCallable
 
 
@@ -72,7 +71,7 @@ def to_tuple(self) -> Tuple[str, Type, dataclasses.Field]:
 
 def get_default_factory_for_field(
     field: CompatModelField,
-) -> Union[NoArgAnyCallable, PYDANTIC_MISSING_TYPE]:
+) -> Union[NoArgAnyCallable, dataclasses._MISSING_TYPE]:
     """
     Gets the default factory for a pydantic field.
 

diff --git a/strawberry/experimental/pydantic/v2_compat.py b/strawberry/experimental/pydantic/v2_compat.py
@@ -4,7 +4,6 @@
 
 import pydantic
 from pydantic import BaseModel
-from pydantic.v1.typing import NoArgAnyCallable
 from pydantic.version import VERSION as PYDANTIC_VERSION
 from pydantic_core import PydanticUndefined
 
@@ -19,10 +18,10 @@ class CompatModelField:
     default: Any
     default_factory: Optional[Callable[[], Any]]
     required: bool
-    alias: str
+    alias: Optional[str]
     allow_none: bool
     has_alias: bool
-    description: str
+    description: Optional[str]
 
 
 if pydantic.VERSION[0] == "2":
@@ -33,7 +32,7 @@ class CompatModelField:
     from pydantic.v1.fields import ModelField
     from pydantic.fields import FieldInfo
 
-    PYDANTIC_MISSING_TYPE = PydanticUndefined
+    PYDANTIC_MISSING_TYPE: Type = PydanticUndefined
 
     def new_type_supertype(type_):
         return type_.__supertype__
@@ -58,7 +57,7 @@ def get_model_fields(model: Type[BaseModel]) -> Dict[str, CompatModelField]:
         return new_fields
 
 else:
-    from pydantic.utils import smart_deepcopy
+    from pydantic.utils import smart_deepcopy  # type: ignore
     from pydantic.utils import lenient_issubclass
     from pydantic.typing import get_args, get_origin, is_new_type, new_type_supertype
     from pydantic import ModelField
@@ -83,4 +82,13 @@ def get_model_fields(model: Type[BaseModel]) -> Dict[str, CompatModelField]:
         return new_fields
 
 
-__all__ = ["smart_deepcopy", "lenient_issubclass"]
+__all__ = [
+    "smart_deepcopy",
+    "lenient_issubclass",
+    "get_args",
+    "get_origin",
+    "is_new_type",
+    "new_type_supertype",
+    "get_model_fields",
+    "PYDANTIC_MISSING_TYPE",
+]