fix: apply feedback

Author: JeanArhancet

src/serializers/type_serializers/uuid.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
+use pyo3::prelude::*;
 use pyo3::types::PyDict;
-use pyo3::{intern, prelude::*};
 
 use crate::definitions::DefinitionsBuilder;
 
@@ -11,17 +11,7 @@ use super::{
 };
 
 pub(crate) fn uuid_to_string(py_uuid: &PyAny) -> PyResult<String> {
-    let py = py_uuid.py();
-    let int: i128 = py_uuid.getattr(intern!(py, "int"))?.extract()?;
-    let hex = format!("{int:032x}");
-    Ok(format!(
-        "{}-{}-{}-{}-{}",
-        &hex[0..8],
-        &hex[8..12],
-        &hex[12..16],
-        &hex[16..20],
-        &hex[20..]
-    ))
+    Ok(py_uuid.str()?.to_string())
 }
 
 #[derive(Debug, Clone)]

src/validators/uuid.rs

@@ -148,28 +148,30 @@ impl UuidValidator {
                 Err(_) => return Err(ValError::new(ErrorType::UuidType, input)),
             },
         };
-        let v1 = uuid.get_version_num();
-        match self.version {
-            Some(v2) => {
-                let v2 = usize::from(v2);
-                if v1 == v2 {
-                    Ok(uuid)
-                } else {
-                    Err(ValError::new(
-                        ErrorType::UuidVersionMismatch {
-                            version: v1,
-                            schema_version: v2,
-                        },
-                        input,
-                    ))
-                }
+        if let Some(expected_version) = self.version {
+            let v1 = uuid.get_version_num();
+            let expected_version = usize::from(expected_version);
+            if v1 != expected_version {
+                return Err(ValError::new(
+                    ErrorType::UuidVersionMismatch {
+                        version: v1,
+                        schema_version: expected_version,
+                    },
+                    input,
+                ));
             }
-            None => Ok(uuid),
         }
+
+        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.
+    ///
+    /// 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 set_dict_call<'data>(&self, py: Python<'data>, dc: &PyAny, uuid: &Uuid) -> ValResult<'data, ()> {
-        // python uuid use integer
         let int = uuid.as_u128();
         let safe = py
             .import(intern!(py, "uuid"))?

tests/serializers/test_uuid.py

@@ -50,7 +50,7 @@ def test_uuid_json(value, expected):
     assert v.to_json(value).decode() == f'"{expected}"'
 
 
-def test_any_datetime_key():
+def test_any_uuid_key():
     v = SchemaSerializer(core_schema.dict_schema())
     input_value = {UUID('12345678-1234-1234-1234-567812345678'): 1}