Fix min_items in choice list (#17)

* Fix min_items in choice list * Fix unit test * Fix mypy * Fix mypy * Bump version --------- Co-authored-by: Maurits Rijk <[email protected]>
workfloworchestrator · Dec 19, 2023 · 813da48 · 813da48
1 parent fa9630d
commit 813da48
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0rc1
+current_version = 1.0.0rc2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((\-rc)(?P<build>\d+))?

diff --git a/pydantic_forms/__init__.py b/pydantic_forms/__init__.py
@@ -13,4 +13,4 @@
 
 """This is the pydantic-forms engine."""
 
-__version__ = "1.0.0rc1"
+__version__ = "1.0.0rc2"
diff --git a/pydantic_forms/validators/components/choice_list.py b/pydantic_forms/validators/components/choice_list.py
@@ -12,7 +12,7 @@
 # limitations under the License.
 from typing import Annotated, Optional, TypeVar
 
-from annotated_types import Len
+from annotated_types import MaxLen, MinLen
 
 from pydantic_forms.validators.components.choice import Choice
 
@@ -31,7 +31,15 @@ def choice_list(
 
         return unique_conlist(item_type, min_items=min_items, max_items=max_items)
 
+    # Note: min_items always need to be there to remain backward compatible with frontend components
+    if max_items:
+        return Annotated[  # type: ignore[return-value]
+            list[item_type],  # type:ignore[valid-type]
+            MinLen(min_items or 0),
+            MaxLen(max_items),
+        ]
+
     return Annotated[  # type: ignore[return-value]
         list[item_type],  # type:ignore[valid-type]
-        Len(min_items or 0, max_items),
+        MinLen(min_items or 0),
     ]
diff --git a/tests/unit_tests/test_choice_list.py b/tests/unit_tests/test_choice_list.py
@@ -88,11 +88,13 @@ class Form(FormPage):
         "properties": {
             "choices": {
                 "items": {"$ref": "#/$defs/LegChoice"},
+                "minItems": 0,
                 "type": "array",
                 "title": "Choices",
             },
             "choices_with_labels": {
                 "items": {"$ref": "#/$defs/LegChoiceLabel"},
+                "minItems": 0,
                 "type": "array",
                 "title": "Choices With Labels",
             },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@

		"""This is the pydantic-forms engine."""

		__version__ = "1.0.0rc1"
		__version__ = "1.0.0rc2"