Merge branch 'dev'

Author: tariqdaouda

pyArango/collection.py

@@ -4,7 +4,7 @@
 from . import consts as CONST
 
 from .document import Document, Edge
-from .theExceptions import ValidationError, SchemaViolation, CreationError, UpdateError, DeletionError, InvalidDocument
+from .theExceptions import ValidationError, SchemaViolation, CreationError, UpdateError, DeletionError, InvalidDocument, ExportError
 from .query import SimpleQuery
 from .index import Index
 
@@ -306,7 +306,7 @@ def createDocument_(self, initDict = None) :
 
     def importBulk(self, data, **addParams):
         url = "%s/import" % (self.database.URL)
-        payload = json.dumps(data)
+        payload = json.dumps(data, default=str)
         params = {"collection": self.name, "type": "auto"}
         params.update(addParams)
         r = self.connection.session.post(url , params = params, data = payload)
@@ -315,6 +315,17 @@ def importBulk(self, data, **addParams):
             raise CreationError(data["errorMessage"], data)
         return data
 
+    def exportDocs( self, **data):
+        url = "%s/export" % (self.database.URL)
+        params = {"collection": self.name}
+        payload = json.dumps(data)
+        r = self.connection.session.post(url, params = params, data = payload)
+        data = r.json()
+        if not r.status_code == 201 or data["error"] :
+          raise ExportError( data["errorMessage"], data ) 
+        docs = data['result']
+        return docs
+
     def ensureHashIndex(self, fields, unique = False, sparse = True, deduplicate = False) :
         """Creates a hash index if it does not already exist, and returns it"""
         data = {
@@ -485,12 +496,12 @@ def bulkSave(self, docs, onDuplicate="error", **params) :
         payload = []
         for d in docs :
             if type(d) is dict :
-                payload.append(json.dumps(d))
+                payload.append(json.dumps(d, default=str))
             else :
                 try:
                     payload.append(d.toJson())
                 except Exception as e:
-                    payload.append(json.dumps(d.getStore()))
+                    payload.append(json.dumps(d.getStore(), default=str))
 
         payload = '\n'.join(payload)
 

pyArango/connection.py

@@ -27,13 +27,17 @@ class AikidoSession(object) :
     """
 
     class Holder(object) :
-        def __init__(self, fct, auth) :
+        def __init__(self, fct, auth, verify=True) :
             self.fct = fct
             self.auth = auth
+            if verify != None:
+              self.verify = verify 
 
         def __call__(self, *args, **kwargs) :
             if self.auth :
                 kwargs["auth"] = self.auth
+            if self.verify != True:
+                kwargs["verify"] = self.verify
 
             try :
                 ret = self.fct(*args, **kwargs)
@@ -49,12 +53,13 @@ def __call__(self, *args, **kwargs) :
             ret.json = JsonHook(ret)
             return ret
 
-    def __init__(self, username, password) :
+    def __init__(self, username, password, verify=True) :
         if username :
             self.auth = (username, password)
         else :
             self.auth = None
 
+        self.verify = verify 
         self.session = requests.Session()
         self.log = {}
         self.log["nb_request"] = 0
@@ -68,14 +73,15 @@ def __getattr__(self, k) :
 
         holdClass = object.__getattribute__(self, "Holder")
         auth = object.__getattribute__(self, "auth")
+        verify = object.__getattribute__(self, "verify")
         log = object.__getattribute__(self, "log")
         log["nb_request"] += 1
         try :
             log["requests"][reqFct.__name__] += 1
         except :
             log["requests"][reqFct.__name__] = 1
 
-        return holdClass(reqFct, auth)
+        return holdClass(reqFct, auth, verify)
 
     def disconnect(self) :
         try:
@@ -85,7 +91,7 @@ def disconnect(self) :
 
 class Connection(object) :
     """This is the entry point in pyArango and directly handles databases."""
-    def __init__(self, arangoURL = 'http://127.0.0.1:8529', username = None, password = None, verbose = False, statsdClient = None, reportFileName = None) :
+    def __init__(self, arangoURL = 'http://127.0.0.1:8529', username = None, password = None, verify = True, verbose = False, statsdClient = None, reportFileName = None) :
         self.databases = {}
         self.verbose = verbose
         if arangoURL[-1] == "/" :
@@ -98,7 +104,7 @@ def __init__(self, arangoURL = 'http://127.0.0.1:8529', username = None, passwor
         self.identifier = None
         self.startTime = None
         self.session = None
-        self.resetSession(username, password)
+        self.resetSession(username, password, verify)
 
         self.URL = '%s/_api' % self.arangoURL
         if not self.session.auth :
@@ -120,10 +126,10 @@ def disconnectSession(self) :
         if self.session: 
             self.session.disconnect()
 
-    def resetSession(self, username=None, password=None) :
+    def resetSession(self, username=None, password=None, verify=True) :
         """resets the session"""
         self.disconnectSession()
-        self.session = AikidoSession(username, password)
+        self.session = AikidoSession(username, password, verify)
 
     def reload(self) :
         """Reloads the database list.
@@ -145,7 +151,7 @@ def reload(self) :
     def createDatabase(self, name, **dbArgs) :
         "use dbArgs for arguments other than name. for a full list of arguments please have a look at arangoDB's doc"
         dbArgs['name'] = name
-        payload = json.dumps(dbArgs)
+        payload = json.dumps(dbArgs, default=str)
         url = self.URL + "/database"
         r = self.session.post(url, data = payload)
         data = r.json()

pyArango/database.py

@@ -110,7 +110,7 @@ def createCollection(self, className = 'Collection', **colProperties) :
         else :
             colProperties["type"] = CONST.COLLECTION_DOCUMENT_TYPE
 
-        payload = json.dumps(colProperties)
+        payload = json.dumps(colProperties, default=str)
         r = self.connection.session.post(self.collectionsURL, data = payload)
         data = r.json()
 
@@ -155,7 +155,7 @@ def _checkCollectionList(lst) :
                 "orphanCollections": graphClass._orphanedCollections
             }
 
-        payload = json.dumps(payload)
+        payload = json.dumps(payload, default=str)
         r = self.connection.session.post(self.graphsURL, data = payload)
         data = r.json()
 
@@ -193,13 +193,13 @@ def AQLQuery(self, query, batchSize = 100, rawResults = False, bindVars = {}, op
     def explainAQLQuery(self, query, bindVars={}, allPlans = False) :
         """Returns an explanation of the query. Setting allPlans to True will result in ArangoDB returning all possible plans. False returns only the optimal plan"""
         payload = {'query' : query, 'bindVars' : bindVars, 'allPlans' : allPlans}
-        request = self.connection.session.post(self.explainURL, data = json.dumps(payload))
+        request = self.connection.session.post(self.explainURL, data = json.dumps(payload, default=str))
         return request.json()
 
     def validateAQLQuery(self, query, bindVars = {}, options = {}) :
         "returns the server answer is the query is valid. Raises an AQLQueryError if not"
         payload = {'query' : query, 'bindVars' : bindVars, 'options' : options}
-        r = self.connection.session.post(self.cursorsURL, data = json.dumps(payload))
+        r = self.connection.session.post(self.cursorsURL, data = json.dumps(payload, default=str))
         data = r.json()
         if r.status_code == 201 and not data["error"] :
             return data
@@ -219,7 +219,7 @@ def transaction(self, collections, action, waitForSync = False, lockTimeout = No
 
         self.connection.reportStart(action)
 
-        r = self.connection.session.post(self.transactionURL, data = json.dumps(payload))
+        r = self.connection.session.post(self.transactionURL, data = json.dumps(payload, default=str))
 
         self.connection.reportItem()
 

pyArango/document.py

@@ -243,13 +243,13 @@ def _save(self, payload, waitForSync = False, **docArgs) :
             if self.URL is None :
                 if self._key is not None :
                     payload["_key"] = self._key
-                payload = json.dumps(payload)
+                payload = json.dumps(payload, default=str)
                 r = self.connection.session.post(self.documentsURL, params = params, data = payload)
                 update = False
                 data = r.json()
                 self.setPrivates(data)
             else :
-                payload = json.dumps(payload)
+                payload = json.dumps(payload, default=str)
                 r = self.connection.session.put(self.URL, params = params, data = payload)
                 update = True
                 data = r.json()
@@ -298,7 +298,7 @@ def patch(self, keepNull = True, **docArgs) :
         if len(payload) > 0 :
             params = dict(docArgs)
             params.update({'collection': self.collection.name, 'keepNull' : keepNull})
-            payload = json.dumps(payload)
+            payload = json.dumps(payload, default=str)
 
             r = self.connection.session.patch(self.URL, params = params, data = payload)
             data = r.json()
@@ -342,7 +342,12 @@ def getEdges(self, edges, inEdges = True, outEdges = True, rawResults = False) :
 
     def getStore(self) :
         """return the store in a dict format"""
-        return self._store.getStore()
+        store = self._store.getStore()
+        for priv in self.privates :
+            v = getattr(self, priv)
+            if v :
+                store[priv] = v
+        return store
 
     def getPatches(self) :
         """return the patches in a dict format"""

pyArango/graph.py

@@ -120,7 +120,7 @@ def createVertex(self, collectionName, docAttributes, waitForSync = False) :
         # self.database[collectionName].validateDct(docAttributes)
         store.validate()
 
-        r = self.connection.session.post(url, data = json.dumps(docAttributes), params = {'waitForSync' : waitForSync})
+        r = self.connection.session.post(url, data = json.dumps(docAttributes, default=str), params = {'waitForSync' : waitForSync})
 
         data = r.json()
         if r.status_code == 201 or r.status_code == 202 :
@@ -162,7 +162,7 @@ def createEdge(self, collectionName, _fromId, _toId, edgeAttributes, waitForSync
         payload = ed.getStore()
         payload.update({'_from' : _fromId, '_to' : _toId})
 
-        r = self.connection.session.post(url, data = json.dumps(payload), params = {'waitForSync' : waitForSync})
+        r = self.connection.session.post(url, data = json.dumps(payload, default=str), params = {'waitForSync' : waitForSync})
         data = r.json()
         if r.status_code == 201 or r.status_code == 202 :
             return self.database[collectionName][data["edge"]["_key"]]
@@ -229,7 +229,7 @@ def traverse(self, startVertex, **kwargs) :
 
         payload.update(kwargs)
 
-        r = self.connection.session.post(url, data = json.dumps(payload))
+        r = self.connection.session.post(url, data = json.dumps(payload, default=str))
         data = r.json()
         if r.status_code < 200 or r.status_code > 202 or data["error"] :
             raise TraversalError(data["errorMessage"], data)

pyArango/index.py

@@ -22,7 +22,7 @@ def __init__(self, collection, infos = None, creationData = None) :
     def _create(self, postData) :
         """Creates an index of any type according to postData"""
         if self.infos is None :
-            r = self.connection.session.post(self.indexesURL, params = {"collection" : self.collection.name}, data = json.dumps(postData))
+            r = self.connection.session.post(self.indexesURL, params = {"collection" : self.collection.name}, data = json.dumps(postData, default=str))
             data = r.json()
             if (r.status_code >= 400) or data['error'] :
                 raise CreationError(data['errorMessage'], data)

pyArango/query.py

@@ -142,7 +142,7 @@ def __init__(self, database, query, batchSize, bindVars, options, count, fullCou
         self.database = database
         self.connection = self.database.connection
         self.connection.reportStart(query)
-        request = self.connection.session.post(database.cursorsURL, data = json.dumps(payload, cls=json_encoder))
+        request = self.connection.session.post(database.cursorsURL, data = json.dumps(payload, cls=json_encoder, default=str))
         self.connection.reportItem()
 
         try :
@@ -182,7 +182,7 @@ def __init__(self, collection, queryType, rawResults, json_encoder = None,
 
         payload = {'collection' : collection.name}
         payload.update(queryArgs)
-        payload = json.dumps(payload, cls=json_encoder)
+        payload = json.dumps(payload, cls=json_encoder, default=str)
         URL = "%s/simple/%s" % (collection.database.URL, queryType)
         request = self.connection.session.put(URL, data = payload)
 

pyArango/theExceptions.py

@@ -105,3 +105,8 @@ def __init__(self, cls) :
 
     def __str__(self) :
         return self.message
+
+class ExportError(pyArangoException) :
+    """ Something went wrong using the export cursor """
+    def __init__(self, message, errors = {} ):
+        pyArangoException.__init__(self, message, errors)

pyArango/users.py

@@ -50,7 +50,7 @@ def save(self):
         del(payload["username"])
         del(payload["password"])
 
-        payload = json.dumps(payload)
+        payload = json.dumps(payload, default=str)
         if not self.URL :
             if "username" not in self._store or "password" not in self._store :
                 raise KeyError("You must define self['name'] and self['password'] to be able to create a new user")    
@@ -86,7 +86,7 @@ def setPermissions(self, dbName, access) :
             raise KeyError("Unknown database: %s" % dbName)
 
         url = "%s/database/%s" % (self.URL, dbName)
-        r = self.connection.session.put(url, data = json.dumps({"grant": rights}))
+        r = self.connection.session.put(url, data = json.dumps({"grant": rights}, default=str))
         if r.status_code < 200 or r.status_code > 202 :
             raise CreationError("Unable to grant rights", r.content)