confirm json serializable

Author: JohnLZeller

synapsepy/client.py

@@ -1,4 +1,5 @@
 
+from .helpers import json_serialize
 from .http_client import HttpClient
 
 from .user import User, Users
@@ -289,7 +290,9 @@ def get_all_trans(self, page=None, per_page=None, filter=None):
 			(Transactions): object containing pagination info and list of Transaction objects
 		'''
 		self.logger.debug("getting all transactions")
-		
+
+		filter = json_serialize(filter)
+
 		path = paths['trans']
 		response = self.http.get(
 			path, page=page, per_page=per_page, filter=filter,

synapsepy/helpers.py

@@ -0,0 +1,15 @@
+import json
+
+def json_serialize(obj):
+    if obj is None:
+        pass  # No obj, don’t serialize.
+    elif isinstance(obj, str):
+        try:
+            _ = json.loads(obj)  # All good, a valid JSON string.
+        except json.decoder.JSONDecodeError as e:
+            raise ValueError("obj is not a valid JSON string") from e
+    else:
+        try:
+            obj = json.dumps(obj)  # All good, a JSON serializable object.
+        except TypeError as e:
+            raise ValueError("obj is not JSON serializable") from e

synapsepy/user.py

@@ -1,4 +1,5 @@
 
+from .helpers import json_serialize
 from .endpoints import paths
 
 from .node import Node, Nodes
@@ -714,6 +715,9 @@ def get_all_node_trans(self, node_id, page=None, per_page=None, filter=filter):
 			Transactions: Transactions object containing paginated info and Trans records
 		'''
 		self.logger.debug("Retrieving all Transactions for Node")
+
+		filter = json_serialize(filter)
+
 		path = (
 			paths['users']
 			+ '/'
@@ -737,6 +741,9 @@ def get_all_trans(self, page=None, per_page=None, filter=filter):
 			Transactions: Transactions object containing paginated info and Trans records
 		'''
 		self.logger.debug("Retrieving all Transactions for User")
+
+		filter = json_serialize(filter)
+
 		path = paths['users'] + '/' + self.id + paths['trans']
 		response = self._do_request(
 			self.http.get, path, page=page, per_page=per_page, filter=filter