refactor: create py uid and add tests

Author: JeanArhancet

src/validators/uuid.rs

@@ -100,10 +100,8 @@ impl Validator for UuidValidator {
                 input,
             ))
         } else {
-            let dc = create_class(class)?;
             let uuid = self.get_uuid(py, input)?;
-            self.create_py_uuid(py, dc.as_ref(py), &uuid)?;
-            Ok(dc)
+            self.create_py_uuid(py, class, &uuid)
         }
     }
 
@@ -157,20 +155,23 @@ impl UuidValidator {
         Ok(uuid)
     }
 
-    /// Sets the attributes in a Python dictionary object (`dc`) to represent a UUID.
-    /// The function converts the UUID to a u128 integer and sets the corresponding attributes
-    /// in the dictionary object to the converted value and a 'safe' flag.
+    /// Sets the attributes in a Python type object (`py_type`) to represent a UUID class.
+    /// The function creates the python class and converts the UUID to a u128 integer and
+    /// sets the corresponding attributes in the dictionary object to the converted value
+    /// and a 'safe' flag.
     ///
     /// This implementation does not use the Python `__init__` function to speed up the process,
     /// as the `__init__` function in the Python `uuid` module performs extensive checks.
-    fn create_py_uuid<'data>(&self, py: Python<'data>, dc: &PyAny, uuid: &Uuid) -> ValResult<'data, ()> {
+    fn create_py_uuid<'py>(&self, py: Python<'py>, py_type: &PyType, uuid: &Uuid) -> ValResult<'py, Py<PyAny>> {
+        let class = create_class(py_type)?;
+        let dc = class.as_ref(py);
         let int = uuid.as_u128();
         let safe = py
             .import(intern!(py, "uuid"))?
             .getattr(intern!(py, "SafeUUID"))?
             .get_item("safe")?;
         force_setattr(py, dc, intern!(py, UUID_INT), int)?;
         force_setattr(py, dc, intern!(py, UUID_IS_SAFE), safe)?;
-        Ok(())
+        Ok(dc.to_object(py))
     }
 }

tests/validators/test_uuid.py

@@ -25,6 +25,8 @@
         ('c0a8f9a8-aa5e-482b-a067-9cb3a51f5c11', UUID('c0a8f9a8-aa5e-482b-a067-9cb3a51f5c11')),
         (b'\x12\x34\x56\x78' * 4, UUID('12345678-1234-5678-1234-567812345678')),
         (b'\x00\x00\x00\x00' * 4, UUID('00000000-0000-0000-0000-000000000000')),
+        (UUID('12345678-1234-5678-1234-567812345678'), UUID('12345678-1234-5678-1234-567812345678')),
+        (UUID('550e8400-e29b-41d4-a716-446655440000'), UUID('550e8400-e29b-41d4-a716-446655440000')),
         # Invalid UUIDs
         (
             'not-a-valid-uuid',
@@ -67,6 +69,8 @@
             'c0a8f9a8-aa5e-482b-a067-9cb3a51f5c1',
             Err('Input should be a valid UUID, invalid group length in group 4: expected 12, found 11'),
         ),
+        (0xA1A2A3A4B1B2C1C2D1D2D3D4D5D6D7D8, Err('UUID input should be a string, bytes or UUID object')),
+        (00000000000000000000000000, Err('UUID input should be a string, bytes or UUID object')),
     ],
 )
 def test_uuid(input_value, expected):
@@ -78,6 +82,7 @@ def test_uuid(input_value, expected):
     else:
         output = v.validate_python(input_value)
         assert output == expected
+        assert isinstance(output, UUID)
 
 
 @pytest.mark.parametrize(
@@ -97,6 +102,7 @@ def test_uuid_strict(input_value, expected):
     else:
         output = v.validate_python(input_value)
         assert output == expected
+        assert isinstance(output, UUID)
 
 
 @pytest.mark.parametrize(
@@ -122,6 +128,7 @@ def test_uuid_version(input_value, version, expected):
     else:
         output = v.validate_python(input_value)
         assert output == expected
+        assert isinstance(output, UUID)
 
 
 @pytest.mark.parametrize(
@@ -148,17 +155,20 @@ def test_uuid_json(py_and_json: PyAndJson, input_value, expected):
     else:
         output = v.validate_test(input_value)
         assert output == expected
+        assert isinstance(output, UUID)
 
 
 def test_uuid_deepcopy():
     output = SchemaValidator({'type': 'uuid'}).validate_python('a6cc5730-2261-11ee-9c43-2eb5a363657c')
     c = copy.deepcopy(output)
     assert repr(output) == "UUID('a6cc5730-2261-11ee-9c43-2eb5a363657c')"
     assert c == output
+    assert isinstance(output, UUID)
 
 
 def test_uuid_copy():
     output = SchemaValidator({'type': 'uuid'}).validate_python('a6cc5730-2261-11ee-9c43-2eb5a363657c')
     c = copy.copy(output)
     assert repr(output) == "UUID('a6cc5730-2261-11ee-9c43-2eb5a363657c')"
     assert c == output
+    assert isinstance(output, UUID)