Fix mypy errors in test subdirectories, check recursively

The mypy target only checked top-level test files via
`packages/*/tests/*.py`. Subdirectory tests (model_constraint/,
ref/, scoping/) were never type-checked.

Switch to per-directory find so mypy discovers all test files
while keeping each package's conftest.py visible (avoids duplicate
module conflicts across packages).

Fixes in test code:
- Mapping[str, object] in assert_subset (dict invariance)
- Missing return type annotations on test functions
- Duplicate TestModel names within same scope
- JsonDict annotations for ConfigDict json_schema_extra
- type: ignore for dynamically-created .When classes

Author: sethfitz

Makefile

@@ -43,7 +43,7 @@ mypy: uv-sync
 		| tr - . \
 		| sed 's|^packages/|-p |' \
 		| xargs uv run mypy --no-error-summary
-	@uv run mypy --no-error-summary packages/*/tests/*.py
+	@for d in packages/*/tests; do find "$$d" -name "*.py" | sort | xargs uv run mypy --no-error-summary || exit 1; done
 
 reset-baseline-schemas:
 	@find . -name \*_baseline_schema.json -delete

packages/overture-schema-core/tests/scoping/test_scoped.py

@@ -181,7 +181,7 @@ class SingleScoped(BaseModel):
         when_field_info = SingleScoped.model_fields["when"]
         assert when_field_info.is_required() == required
 
-        when_class = SingleScoped.When
+        when_class = SingleScoped.When  # type: ignore[attr-defined]
         assert issubclass(when_class, BaseModel)
         assert len(when_class.model_fields) == 1
 
@@ -200,7 +200,7 @@ class MultiScopedWhenAllFieldsOptional(BaseModel):
         when_field_info = MultiScopedWhenAllFieldsOptional.model_fields["when"]
         assert not when_field_info.is_required()
 
-        when_class = MultiScopedWhenAllFieldsOptional.When
+        when_class = MultiScopedWhenAllFieldsOptional.When  # type: ignore[attr-defined]
         assert issubclass(when_class, BaseModel)
         assert len(when_class.model_fields) == 2
 
@@ -229,7 +229,7 @@ class MultiScopedWhenSomeFieldsRequired(BaseModel):
         when_field_info = MultiScopedWhenSomeFieldsRequired.model_fields["when"]
         assert when_field_info.is_required()
 
-        when_class = MultiScopedWhenSomeFieldsRequired.When
+        when_class = MultiScopedWhenSomeFieldsRequired.When  # type: ignore[attr-defined]
         assert issubclass(when_class, BaseModel)
         assert len(when_class.model_fields) == 3
 
@@ -270,7 +270,7 @@ class Complex(BaseModel):
         when_field_info = Complex.model_fields["when"]
         assert when_field_info.is_required()
 
-        when_class = Complex.When
+        when_class = Complex.When  # type: ignore[attr-defined]
         assert issubclass(when_class, BaseModel)
         assert len(when_class.model_fields) == 3
 

packages/overture-schema-system/tests/model_constraint/test_forbid_if.py

@@ -16,7 +16,7 @@
 
 
 @pytest.mark.parametrize("field_names", [[], ()])
-def test_error_not_enough_field_names(field_names: list[str]):
+def test_error_not_enough_field_names(field_names: list[str]) -> None:
     with pytest.raises(ValueError, match="`field_names` cannot be empty, but it is"):
         forbid_if(field_names, FieldEqCondition("foo", 42))
 

packages/overture-schema-system/tests/model_constraint/test_min_fields_set.py

@@ -3,6 +3,7 @@
 
 import pytest
 from pydantic import BaseModel, ConfigDict
+from pydantic.json_schema import JsonDict
 from util import assert_subset
 
 from overture.schema.system import create_model
@@ -195,7 +196,7 @@ class TestModel(BaseModel):
 
 
 def test_model_json_schema_already_set_same() -> None:
-    expect = {"minProperties": 3, "hello": "world"}
+    expect: JsonDict = {"minProperties": 3, "hello": "world"}
 
     @min_fields_set(3)
     class TestModel(BaseModel):
@@ -211,7 +212,7 @@ class TestModel(BaseModel):
 
 
 def test_model_json_schema_error_already_set_different() -> None:
-    expect = {"minProperties": 1, "hello": "world"}
+    expect: JsonDict = {"minProperties": 1, "hello": "world"}
 
     with pytest.raises(
         RuntimeError,

packages/overture-schema-system/tests/model_constraint/test_multi_constraint.py

@@ -19,7 +19,7 @@
 )
 
 
-def test_many_constraints():
+def test_many_constraints() -> None:
     @forbid_if(["corge", "garply"], FieldEqCondition("qux", "hello"))
     @min_fields_set(3)
     @no_extra_fields

packages/overture-schema-system/tests/model_constraint/test_no_extra_fields.py

@@ -9,7 +9,7 @@
 
 
 def test_error_invalid_model_class() -> None:
-    expect_pattern = r"can't apply `@?\w+` to model class `TestModel`: existing `model_config\['extra'\]` is already set to '\w+'"
+    expect_pattern = r"can't apply `@?\w+` to model class `\w+`: existing `model_config\['extra'\]` is already set to '\w+'"
 
     with pytest.raises(TypeError, match=expect_pattern):
 
@@ -19,10 +19,10 @@ class TestModel(BaseModel):
 
     with pytest.raises(TypeError, match=expect_pattern):
 
-        class TestModel(BaseModel):
+        class TestModelAllow(BaseModel):
             model_config = ConfigDict(extra="allow")
 
-        NoExtraFieldsConstraint().validate_class(TestModel)
+        NoExtraFieldsConstraint().validate_class(TestModelAllow)
 
 
 @pytest.mark.parametrize(

packages/overture-schema-system/tests/model_constraint/test_radio_group.py

@@ -14,7 +14,7 @@
 
 
 @pytest.mark.parametrize("field_names", [[], (), ["foo"], ("bar",)])
-def test_error_not_enough_field_names(field_names: list[str]):
+def test_error_not_enough_field_names(field_names: list[str]) -> None:
     with pytest.raises(
         ValueError, match="`field_names` must contain at least two items"
     ):
@@ -108,7 +108,7 @@ class TestModel(BaseModel):
 def test_model_json_schema_no_model_config() -> None:
     @radio_group("foo", "baz", "qux")
     class TestModel(BaseModel):
-        foo: bool = Field(default=None, alias="bar")
+        foo: bool | None = Field(default=None, alias="bar")
         baz: bool
         qux: bool = Field(alias="corge")
 

packages/overture-schema-system/tests/model_constraint/test_require_any_of.py

@@ -25,7 +25,9 @@ def test_error_duplicate_field_names(field_names: list[str]) -> None:
 
 
 def test_error_invalid_model_class() -> None:
-    expect = "specifies one or more fields that are not in the model class `TestModel`: foo, bar"
+    expect = (
+        r"specifies one or more fields that are not in the model class `\w+`: foo, bar"
+    )
 
     with pytest.raises(TypeError, match=expect):
 
@@ -35,10 +37,10 @@ class TestModel(BaseModel):
 
     with pytest.raises(TypeError, match=expect):
 
-        class TestModel(BaseModel):
+        class TestModel2(BaseModel):
             baz: int
 
-        RequireAnyOfConstraint("foo", "bar").validate_class(TestModel)
+        RequireAnyOfConstraint("foo", "bar").validate_class(TestModel2)
 
 
 def test_error_invalid_model_instance() -> None:

packages/overture-schema-system/tests/model_constraint/test_require_if.py

@@ -16,7 +16,7 @@
 
 
 @pytest.mark.parametrize("field_names", [[], ()])
-def test_error_not_enough_field_names(field_names: list[str]):
+def test_error_not_enough_field_names(field_names: list[str]) -> None:
     with pytest.raises(ValueError, match="`field_names` cannot be empty, but it is"):
         require_if(field_names, FieldEqCondition("foo", 42))
 
@@ -107,7 +107,7 @@ class TestModel(BaseModel):
 
 
 @pytest.mark.parametrize("field_names", [["foo"], ["bar"], ["foo", "bar"]])
-def test_valid_model_instance_condition_false(field_names) -> None:
+def test_valid_model_instance_condition_false(field_names: list[str]) -> None:
     class TestModel(BaseModel):
         foo: int | None = None
         bar: int | None = None

packages/overture-schema-system/tests/ref/test_id.py

@@ -10,12 +10,12 @@ class TestIdentifiedFeature:
     class IdentifiedFeature(Identified, Feature):
         pass
 
-    def test_id_required_in_model_fields(self):
+    def test_id_required_in_model_fields(self) -> None:
         id_field = TestIdentifiedFeature.IdentifiedFeature.model_fields["id"]
 
         assert id_field.is_required()
 
-    def test_description_same_in_model_fields(self):
+    def test_description_same_in_model_fields(self) -> None:
         base_id_field = Identified.model_fields["id"]
         derived_id_field = TestIdentifiedFeature.IdentifiedFeature.model_fields["id"]