fixed write conflicts and defaultdoc

Author: tariqdaouda

CHANGELOG.rst

@@ -1,3 +1,8 @@
+2.0.1
+=====
+
+* Fixed max retries for write conflicts
+
 2.0
 =====
 

pyArango/collection.py

@@ -257,7 +257,7 @@ def __init__(self, database, jsonData):
             "fulltext" : {},
         }
         self.indexes_by_name = {}
-        self.defaultDocument = None #getDefaultDoc(self._fields, {})
+        # self.defaultDocument = None #getDefaultDoc(self._fields, {})
         self._isBulkInProgress = False
         self._bulkSize = 0
         self._bulkCache = []
@@ -325,6 +325,7 @@ def createDocument(self, initDict = None):
         """create and returns a completely empty document or one populated with initDict"""
         # res = dict(self.defaultDocument)
         res = self.getDefaultDocument()
+        
         if initDict is not None:
             res.update(initDict)
 

pyArango/connection.py

@@ -14,6 +14,8 @@
 
 from .ca_certificate import CA_Certificate
 
+from json.decoder import JSONDecodeError
+
 class JsonHook(object):
     """This one replaces requests' original json() function. If a call to json() fails, it will print a message with the request content"""
     def __init__(self, ret):
@@ -50,11 +52,17 @@ def __call__(self, *args, **kwargs):
                 kwargs["verify"] = self.verify
 
             try:
-                status_code = 1200
+                do_retry = True
                 retry = 0
-                while status_code == 1200 and retry < self.max_conflict_retries :
+                while do_retry and retry < self.max_conflict_retries :
                     ret = self.fct(*args, **kwargs)
-                    status_code = ret.status_code
+                    do_retry = ret.status_code == 1200
+                    try :
+                        data = ret.json()
+                        do_retry = do_retry or ("errorNum" in data and data["errorNum"] == 1200) 
+                    except JSONDecodeError:
+                        pass
+                    
                     retry += 1
             except:
                 print ("===\nUnable to establish connection, perhaps arango is not running.\n===")

pyArango/document.py

@@ -227,7 +227,7 @@ def reset(self, collection, jsonFieldInit = None, on_load_validation=False) :
 
     def to_default(self):
         """reset the document to the default values"""
-        self.reset(self.collection, self.collection.defaultDocument)
+        self.reset(self.collection, self.collection.getDefaultDocument())
 
     def validate(self):
         """validate the document"""

setup.py

@@ -11,7 +11,7 @@
 setup(
     name='pyArango',
 
-    version='2.0',
+    version='2.0.1',
 
     description='An easy to use python driver for ArangoDB with built-in validation',
     long_description=long_description,