Fix bug with mypy plugin and no_strict_optional = True (#8666)

dmontagu · sydney-runkle · commit 50259d7ce69b · 2024-02-05T07:32:01.000-06:00
diff --git a/pydantic/mypy.py b/pydantic/mypy.py
@@ -475,9 +475,9 @@ def transform(self) -> bool:
                 return False
 
         is_settings = any(base.fullname == BASESETTINGS_FULLNAME for base in info.mro[:-1])
-        self.add_initializer(fields, config, is_settings, is_root_model)
-        self.add_model_construct_method(fields, config, is_settings)
         try:
+            self.add_initializer(fields, config, is_settings, is_root_model)
+            self.add_model_construct_method(fields, config, is_settings)
             self.set_frozen(fields, frozen=config.frozen is True)
         except _DeferAnalysis:
             if not self._api.final_iteration:
diff --git a/tests/mypy/configs/pyproject-plugin-no-strict-optional.toml b/tests/mypy/configs/pyproject-plugin-no-strict-optional.toml
@@ -0,0 +1,36 @@
+[build-system]
+requires = ["poetry>=0.12"]
+build_backend = "poetry.masonry.api"
+
+[tool.poetry]
+name = "test"
+version = "0.0.1"
+readme = "README.md"
+authors = [
+    "author@example.com"
+]
+
+[tool.poetry.dependencies]
+python = "*"
+
+[tool.pytest.ini_options]
+addopts = "-v -p no:warnings"
+
+[tool.mypy]
+plugins = [
+    "pydantic.mypy"
+]
+follow_imports = "silent"
+no_strict_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+disallow_any_generics = true
+check_untyped_defs = true
+no_implicit_reexport = true
+disallow_untyped_defs = true
+
+[[tool.mypy.overrides]]
+module = [
+    'pydantic_core.*',
+]
+follow_imports = "skip"
diff --git a/tests/mypy/modules/no_strict_optional.py b/tests/mypy/modules/no_strict_optional.py
@@ -0,0 +1,7 @@
+from typing import Union
+
+from pydantic import BaseModel
+
+
+class MongoSettings(BaseModel):
+    MONGO_PASSWORD: Union[str, None]
diff --git a/tests/mypy/outputs/1.0.1/pyproject-plugin-no-strict-optional_toml/no_strict_optional.py b/tests/mypy/outputs/1.0.1/pyproject-plugin-no-strict-optional_toml/no_strict_optional.py
@@ -0,0 +1,7 @@
+from typing import Union
+
+from pydantic import BaseModel
+
+
+class MongoSettings(BaseModel):
+    MONGO_PASSWORD: Union[str, None]
diff --git a/tests/mypy/test_mypy.py b/tests/mypy/test_mypy.py
@@ -110,6 +110,7 @@ def build(self) -> List[Union[Tuple[str, str], Any]]:
         ('mypy-plugin-strict-no-any.ini', 'dataclass_no_any.py'),
         ('mypy-plugin-very-strict.ini', 'metaclass_args.py'),
         ('pyproject-default.toml', 'computed_fields.py'),
+        ('pyproject-plugin-no-strict-optional.toml', 'no_strict_optional.py'),
     ]
 )
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ def build(self) -> List[Union[Tuple[str, str], Any]]:`
`110`	`110`	`('mypy-plugin-strict-no-any.ini', 'dataclass_no_any.py'),`
`111`	`111`	`('mypy-plugin-very-strict.ini', 'metaclass_args.py'),`
`112`	`112`	`('pyproject-default.toml', 'computed_fields.py'),`
	`113`	`+ ('pyproject-plugin-no-strict-optional.toml', 'no_strict_optional.py'),`
`113`	`114`	`]`
`114`	`115`	`)`
`115`	`116`