Make mypy happy; change default arg list; udpate tests

Author: Sparrow1029

pydantic_forms/utils/schema.py

@@ -21,5 +21,5 @@ def merge_json_schema(source_type: Any, target_type: Any) -> Any:
     source_schema = source_field_info.json_schema_extra
     target_schema = target_field_info.json_schema_extra
 
-    source_schema.update(target_schema)
+    source_schema.update(target_schema)  # type: ignore[union-attr,arg-type]
     return source_type

pydantic_forms/validators/components/read_only.py

@@ -46,18 +46,23 @@ def _get_read_only_schema(default: Any) -> dict:
     return {"uniforms": {"disabled": True, "value": default}, "type": _get_json_type(default)}
 
 
-def read_only_list(default: list[Any]) -> Any:
+def read_only_list(default: list[Any] | None = None) -> Any:
     """Create type with json schema of type array that is 'read only'."""
+    if not isinstance(default, list):
+        raise ValueError("Default argument must be a list")
+
+    # Empty list is valid, but needs a type
     if len(default) == 0:
-        raise ValueError("Default list object must not be empty")
+        default_item_type: Any = type(str)
 
-    item_types = {type(item) for item in default}
-    if len(item_types) != 1:
-        raise TypeError("All items in read_only_list must be of same type")
+    else:
+        item_types = {type(item) for item in default}
+        if len(item_types) != 1:
+            raise TypeError("All items in read_only_list must be of same type")
 
-    default_item_type: Any = list(item_types)[0]
-    if default_item_type is type(None):
-        raise TypeError("read_only_list item type cannot be 'NoneType'")
+        default_item_type = list(item_types)[0]
+        if default_item_type is type(None):
+            raise TypeError("read_only_list item type cannot be 'NoneType'")
 
     json_schema = _get_read_only_schema(default)
 

tests/unit_tests/test_read_only_field.py

@@ -1,15 +1,14 @@
 import json
 from uuid import UUID
 
-from more_itertools import first
 from pydantic.config import JsonDict
 import pytest
 from pydantic import BaseModel, ValidationError
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.types import strEnum
 from pydantic_forms.validators import read_only_field, read_only_list, LongText, OrganisationId
-from pydantic_forms.utils.schema import merge_json_schema, _get_field_info_with_schema
+from pydantic_forms.utils.schema import merge_json_schema
 
 
 class TestEnum(strEnum):
@@ -108,10 +107,20 @@ class Form(FormPage):
 
 
 def test_read_only_field_list_with_empty_default_raises_error():
-    with pytest.raises(ValueError, match="Default list object must not be empty"):
+    with pytest.raises(ValueError, match="Default argument must be a list"):
 
         class Form(FormPage):
-            read_only: read_only_list([])
+            read_only: read_only_list()
+
+
+def test_read_only_list_empty_sets_default_to_array_string():
+    class Form(FormPage):
+        read_only_list: read_only_list([])
+
+    validated = Form(read_only_list=[])
+    read_only_schema = validated.model_json_schema()["properties"]["read_only_list"]
+    assert read_only_schema["items"]["type"] == "string"
+    assert read_only_schema["default"] == []
 
 
 def test_read_only_field_list_with_mixed_types_raises_error():
@@ -227,3 +236,15 @@ def test_merge_json_schema():
 
     with pytest.raises(TypeError, match="Target type has no json_schema_extra"):
         merge_json_schema(OrganisationId, test_uuid1)
+
+
+def test_stringy_types_import_works():
+    import importlib
+
+    with pytest.MonkeyPatch.context() as mock:
+        from pydantic_forms.validators.components import read_only
+
+        mock.setattr(read_only.sys, "version_info", (3, 9))
+        importlib.reload(read_only)
+
+        assert read_only.STRINGY_TYPES == (strEnum, UUID)