Merge pull request #264 from ArangoDB-Community/fix-serialization

Fix python-arango Client (de)serialization

Author: geenen124

arango/client.py

@@ -22,6 +22,30 @@
 )
 
 
+def default_serializer(x: Any) -> str:
+    """
+    Default JSON serializer
+
+    :param x: A JSON data type object to serialize
+    :type x: Any
+    :return: The object serialized as a JSON string
+    :rtype: str
+    """
+    return dumps(x)
+
+
+def default_deserializer(x: str) -> Any:
+    """
+    Default JSON de-serializer
+
+    :param x: A JSON string to deserialize
+    :type x: str
+    :return: The de-serialized JSON object
+    :rtype: Any
+    """
+    return loads(x)
+
+
 class ArangoClient:
     """ArangoDB client.
 
@@ -67,8 +91,8 @@ def __init__(
         host_resolver: str = "roundrobin",
         resolver_max_tries: Optional[int] = None,
         http_client: Optional[HTTPClient] = None,
-        serializer: Callable[..., str] = lambda x: dumps(x),
-        deserializer: Callable[[str], Any] = lambda x: loads(x),
+        serializer: Callable[..., str] = default_serializer,
+        deserializer: Callable[[str], Any] = default_deserializer,
         verify_override: Union[bool, str, None] = None,
         request_timeout: Union[int, float] = DEFAULT_REQUEST_TIMEOUT,
     ) -> None:

arango/http.py

@@ -84,6 +84,16 @@ class DefaultHTTPAdapter(HTTPAdapter):
     :type kwargs: Any
     """
 
+    __attrs__ = [
+        "max_retries",
+        "config",
+        "_connection_timeout",
+        "_pool_connections",
+        "_pool_maxsize",
+        "_pool_timeout",
+        "_pool_block",
+    ]
+
     def __init__(
         self,
         connection_timeout: Union[int, float] = DEFAULT_REQUEST_TIMEOUT,

tests/test_client.py

@@ -1,4 +1,5 @@
 import json
+import pickle
 from typing import Union
 
 import importlib_metadata
@@ -180,3 +181,10 @@ def assert_verify(
     assert_verify("test", False, False)
     assert_verify("test", False, False)
     assert_verify("test", "foo", "foo")
+
+
+def test_can_serialize_deserialize_client() -> None:
+    client = ArangoClient(hosts="http://127.0.0.1:8529")
+    client_pstr = pickle.dumps(client)
+    client2 = pickle.loads(client_pstr)
+    assert len(client2._sessions) > 0