refactor: uuid to string

Author: JeanArhancet

src/serializers/infer.rs

@@ -13,7 +13,6 @@ use serde::ser::{Error, Serialize, SerializeMap, SerializeSeq, Serializer};
 use crate::input::Int;
 use crate::serializers::errors::SERIALIZATION_ERR_MARKER;
 use crate::serializers::filter::SchemaFilter;
-use crate::serializers::shared::uuid_to_dict;
 use crate::serializers::shared::{PydanticSerializer, TypeSerializer};
 use crate::serializers::SchemaSerializer;
 use crate::tools::{extract_i64, py_err, safe_repr};
@@ -188,7 +187,11 @@ pub(crate) fn infer_to_python_known(
                 let py_url: PyMultiHostUrl = value.extract()?;
                 py_url.__str__().into_py(py)
             }
-            ObType::Uuid => serialize_dict(uuid_to_dict(value)?)?,
+            ObType::Uuid => {
+                let py_uuid: &PyAny = value.downcast()?;
+                let uuid = super::type_serializers::uuid::uuid_to_string(py_uuid)?;
+                uuid.into_py(py)
+            }
             ObType::PydanticSerializable => serialize_with_serializer()?,
             ObType::Dataclass => serialize_dict(dataclass_to_dict(value)?)?,
             ObType::Enum => {
@@ -485,7 +488,11 @@ pub(crate) fn infer_serialize_known<S: Serializer>(
             pydantic_serializer.serialize(serializer)
         }
         ObType::Dataclass => serialize_dict!(dataclass_to_dict(value).map_err(py_err_se_err)?),
-        ObType::Uuid => serialize_dict!(uuid_to_dict(value).map_err(py_err_se_err)?),
+        ObType::Uuid => {
+            let py_uuid: &PyAny = value.downcast().map_err(py_err_se_err)?;
+            let uuid = super::type_serializers::uuid::uuid_to_string(py_uuid).map_err(py_err_se_err)?;
+            serializer.serialize_str(&uuid)
+        }
         ObType::Enum => {
             let v = value.getattr(intern!(value.py(), "value")).map_err(py_err_se_err)?;
             infer_serialize(v, serializer, include, exclude, extra)

src/serializers/shared.rs

@@ -397,15 +397,3 @@ pub(super) fn dataclass_to_dict(dc: &PyAny) -> PyResult<&PyDict> {
     }
     Ok(dict)
 }
-
-pub(super) fn uuid_to_dict(dc: &PyAny) -> PyResult<&PyDict> {
-    let py = dc.py();
-    let dc_slots: &PyDict = dc.getattr(intern!(py, "__slots__"))?.downcast()?;
-    let dict = PyDict::new(py);
-
-    for (field_name, _) in dc_slots.iter() {
-        let field_name: &PyString = field_name.downcast()?;
-        dict.set_item(field_name, dc.getattr(field_name)?)?;
-    }
-    Ok(dict)
-}