ellipsis 3.1.41__tar.gz → 3.1.43__tar.gz

{ellipsis-3.1.41 → ellipsis-3.1.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.41
+Version: 3.1.43
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas

{ellipsis-3.1.41 → ellipsis-3.1.43}/ellipsis/__init__.py

@@ -7,7 +7,7 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.41'
+__version__ = '3.1.43'
 
 
 

{ellipsis-3.1.41 → ellipsis-3.1.43}/ellipsis/apiManager.py

@@ -2,6 +2,7 @@ import requests
 import json
 import urllib
 import os
+import time
 from requests_toolbelt import MultipartEncoder
 
 baseUrl = 'https://api.ellipsis-drive.com/v3'
@@ -65,8 +66,36 @@ def delete(url, body, token = None):
     r = call( method = requests.delete, url = url, body = body, token = token )
     return r
 
-
+RETRIES = 10
+WAIT = 2
 def call(method, url, body = None, token = None, crash = True, parseJson = True):
+    tried = 0
+    while tried <RETRIES:
+        try:
+            r = actualCall(method, url, body, token)
+            break
+        except:
+            print('time out detected, retrying request')
+            time.sleep(WAIT)
+            tried = tried +1
+    if tried >= RETRIES:
+        raise ValueError('Could not reach server')
+    if crash:
+        if r.status_code != 200:
+            raise ValueError(r.text)
+
+        if parseJson:
+            try:
+                r = r.json()
+            except:
+                r = r.text
+
+        return r
+    else:
+        return r
+
+TIMEOUTTIME = 10
+def actualCall(method, url, body, token):
     body = filterNone(body)
     if type(body) != type(None) and type(body) != type({}):
         raise ValueError(
@@ -76,26 +105,13 @@ def call(method, url, body = None, token = None, crash = True, parseJson = True)
         raise ValueError('Token must be of type string or noneType')
 
     if token == None:
-        r = method(baseUrl + url, json=body)
+        r = method(baseUrl + url, json=body, timeout=TIMEOUTTIME)
     else:
         if not 'Bearer' in token:
             token = 'Bearer ' + token
-        r = method(baseUrl + url , json = body, headers = {"Authorization":token})
-
-    if crash:
-        if r.status_code != 200:
-            raise ValueError(r.text)
-            
-        if parseJson:
-            try:
-                r = r.json()
-            except:
-                r = r.text
-    
-        return r
-    else:
-        return r
+        r = method(baseUrl + url, json=body, headers={"Authorization": token}, timeout=TIMEOUTTIME)
 
+    return r
 
 def upload(url, filePath, body, token, key = 'data', memfile= None):
     body = filterNone(body, toString=True)

{ellipsis-3.1.41 → ellipsis-3.1.43}/ellipsis/path/vector/timestamp/order/root.py

@@ -12,7 +12,7 @@ def add(pathId, timestampId, token, extent = None, fileFormat = 'geojson'):
     pathId = sanitize.validUuid('pathId', pathId, True)
     timestampId = sanitize.validUuid('timestampId', timestampId, True)
     extent = sanitize.validBounds('extent', extent, False)
-    token = sanitize.validString('fileFormat', fileFormat, True)
+    fileFormat = sanitize.validString('fileFormat', fileFormat, True)
 
 
     body = { 'extent':extent, 'format' :fileFormat}

{ellipsis-3.1.41 → ellipsis-3.1.43}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.41
+Version: 3.1.43
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas

{ellipsis-3.1.41 → ellipsis-3.1.43}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="ellipsis",
-    version="3.1.41",
+    version="3.1.43",
     author="Daniel van der Maas",
     author_email="daniel@ellipsis-drive.com",
     description="Package to interact with the Ellipsis API",

{ellipsis-3.1.41 → ellipsis-3.1.43}/test/test.py

@@ -7,16 +7,11 @@ import pandas as pd
 
 
 
-import ellipsis as el
 import os
 
 token = el.account.logIn('admin', 'aEUZXm4jzXW6GnQHUyrl')
 
 
-extent =   {'xMin': -74.62400000000001, 'yMin': 38.95, 'xMax': -71.936, 'yMax': 41.050000000000004}
-
-el.path.vector.timestamp.getFeaturesByExtent(pathId='69b3ede5-94e7-4f53-987e-e67711c354f4', timestampId='f83c08ac-8cfd-48da-9c84-6f978b36c508', extent=extent, token = token)
-
 
 
 
@@ -36,7 +31,7 @@ folderId = '46e1e919-8b73-42a3-a575-25c6d45fd93b'
 
 
 ##account
-demo_token = el.account.logIn("demo_user", "")
+demo_token = el.account.logIn("demo_user", "demo_user")
 admin_token = el.account.logIn(username = 'admin', password='')
 daan_token = el.account.logIn('daan', "")