From 1719ba3ef5491ac1e1074c074f4bb3091bcf9fc6 Mon Sep 17 00:00:00 2001
From: Daniil Konovalenko <danielkono@yandex-team.ru>
Date: Wed, 6 Jan 2021 18:58:43 +0300
Subject: [PATCH] implement Serialize, Deserialize for Py<T>

---
 Cargo.toml          |  4 ++-
 src/lib.rs          |  3 ++
 src/serde.rs        | 36 ++++++++++++++++++++
 tests/test_serde.rs | 80 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 src/serde.rs
 create mode 100644 tests/test_serde.rs

diff --git a/Cargo.toml b/Cargo.toml
index cbdc2b2a541..1c0cfc85391 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ paste = { version = "1.0.3", optional = true }
 pyo3-macros = { path = "pyo3-macros", version = "=0.13.0", optional = true }
 unindent = { version = "0.1.4", optional = true }
 hashbrown = { version = "0.9", optional = true }
+serde = {version = "1.0", optional = true}
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"
@@ -34,7 +35,8 @@ trybuild = "1.0.23"
 rustversion = "1.0"
 proptest = { version = "0.10.1", default-features = false, features = ["std"] }
 # features needed to run the PyO3 test suite
-pyo3 = { path = ".", default-features = false, features = ["macros", "auto-initialize"] }
+pyo3 = { path = ".", default-features = false, features = ["macros", "auto-initialize", "serde"] }
+serde_json = "1.0.61"
 
 [features]
 default = ["macros", "auto-initialize"]
diff --git a/src/lib.rs b/src/lib.rs
index 55ea1c981d9..e11af53feb3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -211,6 +211,9 @@ mod python;
 pub mod type_object;
 pub mod types;
 
+#[cfg(feature = "serde")]
+pub mod serde;
+
 /// The proc macros, which are also part of the prelude.
 #[cfg(feature = "macros")]
 pub mod proc_macro {
diff --git a/src/serde.rs b/src/serde.rs
new file mode 100644
index 00000000000..e036e37410b
--- /dev/null
+++ b/src/serde.rs
@@ -0,0 +1,36 @@
+use crate::type_object::PyBorrowFlagLayout;
+use crate::{Py, PyClass, PyClassInitializer, PyTypeInfo, Python};
+use serde::{de, ser, Deserialize, Deserializer, Serialize, Serializer};
+
+impl<T> Serialize for Py<T>
+where
+    T: Serialize + PyClass,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+    where
+        S: Serializer,
+    {
+        Python::with_gil(|py| {
+            self.try_borrow(py)
+                .map_err(|e| ser::Error::custom(e.to_string()))?
+                .serialize(serializer)
+        })
+    }
+}
+
+impl<'de, T> Deserialize<'de> for Py<T>
+where
+    T: Into<PyClassInitializer<T>> + PyClass + Deserialize<'de>,
+    <T as PyTypeInfo>::BaseLayout: PyBorrowFlagLayout<<T as PyTypeInfo>::BaseType>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Py<T>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let deserialized = T::deserialize(deserializer)?;
+
+        Python::with_gil(|py| {
+            Py::new(py, deserialized).map_err(|e| de::Error::custom(e.to_string()))
+        })
+    }
+}
diff --git a/tests/test_serde.rs b/tests/test_serde.rs
new file mode 100644
index 00000000000..89ab4122aa1
--- /dev/null
+++ b/tests/test_serde.rs
@@ -0,0 +1,80 @@
+#[cfg(feature = "serde")]
+mod test_serde {
+    use pyo3::prelude::*;
+
+    use serde::{Deserialize, Serialize};
+    use serde_json;
+
+    #[pyclass]
+    #[derive(Debug, Serialize, Deserialize)]
+    struct Group {
+        name: String,
+    }
+
+    #[pyclass]
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    struct User {
+        username: String,
+        group: Option<Py<Group>>,
+        friends: Vec<Py<User>>,
+    }
+
+    #[test]
+    fn test_serialize() {
+        let friend1 = User {
+            username: "friend 1".into(),
+            group: None,
+            friends: vec![],
+        };
+        let friend2 = User {
+            username: "friend 2".into(),
+            ..friend1.clone()
+        };
+
+        let user = Python::with_gil(|py| {
+            let py_friend1 = Py::new(py, friend1).expect("failed to create friend 1");
+            let py_friend2 = Py::new(py, friend2).expect("failed to create friend 2");
+
+            let friends = vec![py_friend1, py_friend2];
+            let py_group = Py::new(
+                py,
+                Group {
+                    name: "group name".into(),
+                },
+            )
+            .unwrap();
+
+            User {
+                username: "danya".into(),
+                group: Some(py_group),
+                friends,
+            }
+        });
+
+        let serialized = serde_json::to_string(&user).expect("failed to serialize");
+        assert_eq!(
+            serialized,
+            r#"{"username":"danya","group":{"name":"group name"},"friends":[{"username":"friend 1","group":null,"friends":[]},{"username":"friend 2","group":null,"friends":[]}]}"#
+        );
+    }
+
+    #[test]
+    fn test_deserialize() {
+        let serialized = r#"{"username": "danya", "friends": 
+        [{"username": "friend", "group": {"name": "danya's friends"}, "friends": []}]}"#;
+        let user: User = serde_json::from_str(serialized).expect("failed to deserialize");
+
+        assert_eq!(user.username, "danya");
+        assert_eq!(user.group, None);
+        assert_eq!(user.friends.len(), 1usize);
+        let friend = user.friends.get(0).unwrap();
+
+        Python::with_gil(|py| {
+            assert_eq!(friend.borrow(py).username, "friend");
+            assert_eq!(
+                friend.borrow(py).group.as_ref().unwrap().borrow(py).name,
+                "danya's friends"
+            )
+        });
+    }
+}