Serialisation was not working for queries which embedded dictionaries

terminusdb_client/woqlquery/woql_core.py

@@ -1,7 +1,6 @@
 # helper functions for WOQLCore
 import re
 
-
 def _split_at(op, tokens):
     results = []
     stack = []
@@ -156,6 +155,8 @@ def _copy_dict(orig, rollup=None):
             query = _copy_dict(part, rollup)
             if query:
                 nuj[key] = query
+        elif hasattr(part, 'to_dict'):
+            nuj[key] = part.to_dict()
         else:
             nuj[key] = part
     return nuj

terminusdb_client/woqlquery/woql_query.py

@@ -49,6 +49,9 @@ def __init__(self, name):
     def __str__(self):
         return self.name
 
+    def to_dict(self):
+        return {"@type": "Value",
+                "variable": self.name}
 
 class Doc:
     def __init__(self, dictionary):
@@ -58,6 +61,9 @@ def __init__(self, dictionary):
     def __str__(self):
         return str(self.dictionary)
 
+    def to_dict(self):
+        return self.encoded
+
     def _convert(self, obj):
         if type(obj) is str:
             return {"@type": "Value", "data": {"@type": "xsd:string", "@value": obj}}
@@ -584,6 +590,7 @@ def _json(self, input_json=None):
             self.from_dict(json.loads(input_json))
             return self
         else:
+            print(self.to_dict())
             return json.dumps(self.to_dict(), sort_keys=True)
 
     def to_dict(self):