allow set & frozenset as input to tuple and list

Author: samuelcolvin

src/input/input_python.rs

@@ -375,6 +375,10 @@ impl<'a> Input<'a> for PyAny {
             Ok(list.into())
         } else if let Ok(tuple) = self.downcast::<PyTuple>() {
             Ok(tuple.into())
+        } else if let Ok(set) = self.downcast::<PySet>() {
+            Ok(set.into())
+        } else if let Ok(frozen_set) = self.downcast::<PyFrozenSet>() {
+            Ok(frozen_set.into())
         } else if let Some(collection) = extract_dict_iter!(self) {
             Ok(collection)
         } else if (allow_any_iter && self.iter().is_ok()) || self.downcast::<PyIterator>().is_ok() || is_deque(self) {
@@ -397,6 +401,10 @@ impl<'a> Input<'a> for PyAny {
             Ok(tuple.into())
         } else if let Ok(list) = self.downcast::<PyList>() {
             Ok(list.into())
+        } else if let Ok(set) = self.downcast::<PySet>() {
+            Ok(set.into())
+        } else if let Ok(frozen_set) = self.downcast::<PyFrozenSet>() {
+            Ok(frozen_set.into())
         } else if let Some(collection) = extract_dict_iter!(self) {
             Ok(collection)
         } else if self.downcast::<PyIterator>().is_ok() || is_deque(self) {

src/validators/tuple.rs

@@ -213,6 +213,14 @@ impl Validator for TuplePositionalValidator {
                 let mut iter = collection.iter();
                 iter!(iter)
             }
+            GenericCollection::Set(collection) => {
+                let mut iter = collection.iter();
+                iter!(iter)
+            }
+            GenericCollection::FrozenSet(collection) => {
+                let mut iter = collection.iter();
+                iter!(iter)
+            }
             GenericCollection::PyAny(collection) => {
                 let vec: Vec<&PyAny> = collection.iter()?.collect::<PyResult<_>>()?;
                 let mut iter = vec.into_iter();
@@ -222,7 +230,6 @@ impl Validator for TuplePositionalValidator {
                 let mut iter = collection.iter();
                 iter!(iter)
             }
-            _ => unreachable!(),
         }
         if errors.is_empty() {
             Ok(PyTuple::new(py, &output).into_py(py))

tests/validators/test_list.py

@@ -4,7 +4,7 @@
 from typing import Any, Dict
 
 import pytest
-from dirty_equals import HasRepr, IsInstance, IsStr
+from dirty_equals import HasRepr, IsInstance, IsList, IsStr
 
 from pydantic_core import SchemaValidator, ValidationError
 
@@ -52,9 +52,9 @@ def gen_ints():
         ([1, 2, '3'], [1, 2, 3]),
         ((1, 2, '3'), [1, 2, 3]),
         (deque((1, 2, '3')), [1, 2, 3]),
-        ({1, 2, '3'}, Err('Input should be a valid list [type=list_type,')),
+        ({1, 2, '3'}, IsList(1, 2, 3, check_order=False)),
         (gen_ints(), [1, 2, 3]),
-        (frozenset({1, 2, '3'}), Err('Input should be a valid list [type=list_type,')),
+        (frozenset({1, 2, '3'}), IsList(1, 2, 3, check_order=False)),
         ({1: 10, 2: 20, '3': '30'}.keys(), [1, 2, 3]),
         ({1: 10, 2: 20, '3': '30'}.values(), [10, 20, 30]),
         ({1: 10, 2: 20, '3': '30'}, Err('Input should be a valid list [type=list_type,')),
@@ -91,11 +91,11 @@ def test_list_json():
     [
         ([], []),
         ([1, '2', b'3'], [1, '2', b'3']),
-        (frozenset([1, '2', b'3']), Err('Input should be a valid list [type=list_type,')),
+        (frozenset([1, '2', b'3']), IsList(1, '2', b'3', check_order=False)),
         ((), []),
         ((1, '2', b'3'), [1, '2', b'3']),
         (deque([1, '2', b'3']), [1, '2', b'3']),
-        ({1, '2', b'3'}, Err('Input should be a valid list [type=list_type,')),
+        ({1, '2', b'3'}, IsList(1, '2', b'3', check_order=False)),
     ],
 )
 def test_list_any(input_value, expected):

tests/validators/test_tuple.py

@@ -3,7 +3,7 @@
 from typing import Any, Dict, Type
 
 import pytest
-from dirty_equals import IsNonNegative
+from dirty_equals import IsNonNegative, IsTuple
 
 from pydantic_core import SchemaValidator, ValidationError
 
@@ -144,8 +144,8 @@ def test_tuple_var_len_kwargs(kwargs: Dict[str, Any], input_value, expected):
         ({1: 10, 2: 20, '3': '30'}.keys(), (1, 2, 3)),
         ({1: 10, 2: 20, '3': '30'}.values(), (10, 20, 30)),
         ({1: 10, 2: 20, '3': '30'}, Err('Input should be a valid tuple [type=tuple_type,')),
-        ({1, 2, '3'}, Err('Input should be a valid tuple [type=tuple_type,')),
-        (frozenset([1, 2, '3']), Err('Input should be a valid tuple [type=tuple_type,')),
+        ({1, 2, '3'}, IsTuple(1, 2, 3, check_order=False)),
+        (frozenset([1, 2, '3']), IsTuple(1, 2, 3, check_order=False)),
     ],
     ids=repr,
 )