Fix tests (strawberry-graphql#3355)

* Fix tests

* Export plugin

* Fix typing

* Fix export

Author: patrick91

mypy.ini

@@ -25,6 +25,9 @@ ignore_errors = True
 [mypy-pydantic.*]
 ignore_errors = True
 
+[mypy-pydantic_core.*]
+ignore_errors = True
+
 [mypy-rich.*]
 ignore_errors = True
 

noxfile.py

@@ -126,7 +126,6 @@ def test_pydantic(session: Session, pydantic: str) -> None:
 @session(python=PYTHON_VERSIONS, name="Mypy tests")
 def tests_mypy(session: Session) -> None:
     session.run_always("poetry", "install", "--with", "integrations", external=True)
-    session._session.install("pydantic~=2.0.3")  # type: ignore
 
     session.run(
         "pytest",
@@ -156,7 +155,6 @@ def tests_pyright(session: Session) -> None:
 @session(name="Mypy", tags=["lint"])
 def mypy(session: Session) -> None:
     session.run_always("poetry", "install", "--with", "integrations", external=True)
-    session._session.install("pydantic~=2.0.3")  # type: ignore
 
     session.run("mypy", "--config-file", "mypy.ini")
 

poetry.lock

@@ -69,7 +69,7 @@ freezegun = "^1.2.1"
 libcst = {version = ">=0.4.7,<1.2.0", optional = false}
 MarkupSafe = "2.1.3"
 nox = "^2023.4.22"
-nox-poetry = "^1.0.2"
+nox-poetry = "^1.0.3"
 opentelemetry-api = "<2"
 opentelemetry-sdk = "<2"
 pygments = "^2.3"
@@ -85,7 +85,7 @@ pytest-xdist = {extras = ["psutil"], version = "^3.1.0"}
 python-multipart = ">=0.0.5,<0.0.7"
 rich = {version = ">=12.5.1,<14.0.0", optional = false}
 sanic-testing = ">=22.9,<24.0"
-sentry-sdk = "^1.14.0"
+sentry-sdk = "^1.39.2"
 typer = {version = ">=0.7.0", optional = false}
 types-aiofiles = ">=22.1,<24.0"
 types-certifi = "^2021.10.8"
@@ -95,11 +95,12 @@ types-python-dateutil = "^2.8.19"
 types-toml = "^0.10.8"
 types-typed-ast = "^1.5.8"
 types-ujson = "^5.6.0"
-# added this here manually because poetry doesn't seem to be able to handle it =(
-botocore = "1.34.13"
+types-protobuf = "^4.23.0.1"
 mypy = "1.8.0"
 pytest-mypy-plugins = ">=1.10,<4.0"
-types-protobuf = "^4.23.0.1"
+poetry-plugin-export = "^1.6.0"
+# another bug in poetry
+urllib3 = "<2"
 
 [tool.poetry.group.integrations]
 optional = true
@@ -112,7 +113,7 @@ Django = ">=3.2"
 fastapi = {version = ">=0.65.0", optional = false}
 flask = ">=1.1"
 quart = ">=0.19.3"
-pydantic = {version = ">1.6.1,<2.0", optional = false}
+pydantic = {version = ">=2.0", optional = false}
 pytest-aiohttp = "^1.0.3"
 pytest-django = {version = "^4.5"}
 sanic = ">=20.12.2"

pyproject.toml

@@ -26,5 +26,5 @@
 
 paths = ["/", "/graphql"]
 for path in paths:
-    app.add_route(path, graphql_app)
-    app.add_websocket_route(path, graphql_app)
+    app.add_route(path, graphql_app)  # type: ignore
+    app.add_websocket_route(path, graphql_app)  # type: ignore

strawberry/cli/debug_server.py

@@ -39,17 +39,17 @@ def new_type_supertype(type_: Any) -> Any:
         return type_.__supertype__
 
     def get_model_fields(model: Type[BaseModel]) -> Dict[str, CompatModelField]:
-        field_info: dict[str, FieldInfo] = model.model_fields  # type: ignore[attr-defined]
+        field_info: dict[str, FieldInfo] = model.model_fields
         new_fields = {}
         # Convert it into CompatModelField
         for name, field in field_info.items():
             new_fields[name] = CompatModelField(
                 name=name,
-                type_=field.annotation,  # type: ignore[attr-defined]
-                outer_type_=field.annotation,  # type: ignore[attr-defined]
+                type_=field.annotation,
+                outer_type_=field.annotation,
                 default=field.default,
                 default_factory=field.default_factory,
-                required=field.is_required(),  # type: ignore[attr-defined]
+                required=field.is_required(),
                 alias=field.alias,
                 # v2 doesn't have allow_none
                 allow_none=False,
@@ -65,24 +65,24 @@ def get_model_fields(model: Type[BaseModel]) -> Dict[str, CompatModelField]:
         is_new_type,
         new_type_supertype,
     )
-    from pydantic.utils import (
+    from pydantic.utils import (  # type: ignore[no-redef]
         lenient_issubclass,
         smart_deepcopy,
     )
 
-    PYDANTIC_MISSING_TYPE = dataclasses.MISSING
+    PYDANTIC_MISSING_TYPE = dataclasses.MISSING  # type: ignore[assignment]
 
     def get_model_fields(model: Type[BaseModel]) -> Dict[str, CompatModelField]:
         new_fields = {}
         # Convert it into CompatModelField
-        for name, field in model.__fields__.items():
+        for name, field in model.__fields__.items():  # type: ignore[attr-defined]
             new_fields[name] = CompatModelField(
                 name=name,
                 type_=field.type_,
                 outer_type_=field.outer_type_,
                 default=field.default,
                 default_factory=field.default_factory,
-                required=field.required,  # type: ignore[arg-type]
+                required=field.required,
                 alias=field.alias,
                 allow_none=field.allow_none,
                 has_alias=field.has_alias,

strawberry/experimental/pydantic/_compat.py

@@ -42,11 +42,17 @@ def pytest_collection_modifyitems(config: pytest.Config, items: List[pytest.Item
                 item.add_marker(getattr(pytest.mark, marker))
 
 
-if sys.version_info < (3, 12):
-
-    @pytest.hookimpl
-    def pytest_ignore_collect(
-        collection_path: pathlib.Path, path: Any, config: pytest.Config
-    ):
-        if "python_312" in collection_path.parts:
-            return True
+@pytest.hookimpl
+def pytest_ignore_collect(
+    collection_path: pathlib.Path, path: Any, config: pytest.Config
+):
+    if sys.version_info < (3, 12) and "python_312" in collection_path.parts:
+        return True
+
+    markers = config.getoption("-m")
+
+    # starlite has some issues with pydantic 2, which we
+    # use in our dev deps, so we skip starlite unless
+    # we're running the tests for it
+    if "starlite" not in markers and "starlite" in collection_path.parts:
+        return True

tests/conftest.py

@@ -81,13 +81,11 @@ def create_user(self, input: CreateUserInput) -> UserType:
     result = schema.execute_sync(query)
 
     if IS_PYDANTIC_V2:
-        assert result.errors[0].message == (
+        assert result.errors[0].message.startswith(
             "1 validation error for User\n"
             "name\n"
             "  String should have at least 2 characters [type=string_too_short, "
             "input_value='P', input_type=str]\n"
-            "    For further information visit "
-            "https://errors.pydantic.dev/2.0.3/v/string_too_short"
         )
     else:
         assert result.errors[0].message == (
@@ -143,13 +141,11 @@ def create_user(self, input: CreateUserInput) -> UserType:
     result = schema.execute_sync(query)
 
     if IS_PYDANTIC_V2:
-        assert result.errors[0].message == (
+        assert result.errors[0].message.startswith(
             "1 validation error for HobbyInputModel\n"
             "name\n"
             "  String should have at least 2 characters [type=string_too_short, "
             "input_value='P', input_type=str]\n"
-            "    For further information visit "
-            "https://errors.pydantic.dev/2.0.3/v/string_too_short"
         )
 
     else:

tests/experimental/pydantic/schema/test_mutation.py

@@ -33,6 +33,11 @@ def _get_http_client_classes() -> Generator[Any, None, None]:
             )
         except ImportError as e:
             client_class = None
+        except Exception as e:
+            # Starlite is not compatible with Pydantic 2 so we get an error
+            # when importing it, for now we skip it, in future we'll remove
+            # Starlite in favour of Litestar
+            client_class = None
 
         yield pytest.param(
             client_class,

tests/http/conftest.py

@@ -185,7 +185,7 @@
 
     MyModelStrawberry(email="").to_pydantic()
   out: |
-- case: test_to_pydantic_kwargs_with_optional_default
+- case: test_to_pydantic_kwargs_with_default_none
   main: |
     from pydantic import BaseModel
     from typing import Optional
@@ -194,7 +194,7 @@
 
     class MyModel(BaseModel):
         email: str
-        password: Optional[str] # pydantic makes this implicit = None default
+        password: Optional[str] = None
 
 
     @strawberry.experimental.pydantic.input(model=MyModel)

tests/mypy/test_pydantic.decorators.yml

@@ -34,7 +34,7 @@ def _read_file(text_file: Upload) -> str:
         if isinstance(text_file, UploadFile):
             text_file = text_file.file._file  # type: ignore
 
-    with contextlib.suppress(ModuleNotFoundError):
+    with contextlib.suppress(Exception):
         from starlite import UploadFile as StarliteUploadFile
 
         if isinstance(text_file, StarliteUploadFile):

tests/views/schema.py

@@ -20,6 +20,9 @@ def _get_http_client_classes() -> Generator[Any, None, None]:
             )
         except ImportError:
             client_class = None
+        except Exception:
+            # TODO: remove this when removing Starlite
+            client_class = None
 
         yield pytest.param(
             client_class,