ellipsis 3.1.41__py3-none-any.whl → 3.1.43__py3-none-any.whl

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/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/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.dist-info → ellipsis-3.1.43.dist-info}/METADATA

@@ -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.dist-info → ellipsis-3.1.43.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ellipsis/__init__.py,sha256=LHAlCLDYAL0nyapVVzZ7AuToFdbhZWqN__DgFxfYkhg,236
-ellipsis/apiManager.py,sha256=W1xTId1ZIDOaFN4NVcyGoxGC4HeI5CIabY4FyGz__7M,5027
+ellipsis/__init__.py,sha256=hwn8DtT6nLrwlH8pbEUxoG8aWix5UfD8tLpnwPH_hho,236
+ellipsis/apiManager.py,sha256=hfe-pESfrljoY9Q_86G1kDYbBW9i3_xMNmh5zN0jRd0,5485
 ellipsis/sanitize.py,sha256=T5FawJRZ2eqGv0itiMkZ1fuJpahsSyhBMFty9cG-wwA,10194
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=tgGAT2BzP3zgAqsevvkeognn5S67T-MrIP52BLN9rbE,1791
@@ -56,15 +56,15 @@ ellipsis/path/vector/timestamp/feature/series/root.py,sha256=KCm28pQ8E6WREftuSi4
 ellipsis/path/vector/timestamp/file/__init__.py,sha256=qJtOXI9MEv4KifDjMW3zUDKnef8PD69SQmgRc3wDShQ,73
 ellipsis/path/vector/timestamp/file/root.py,sha256=UPmcyJ4oWsOpDrsiM-sM5wtXGwkijKSIXLqpnQd4icA,4132
 ellipsis/path/vector/timestamp/order/__init__.py,sha256=w11nMYDQJzZJU_q8o7ApadV2EOdCX93gNkHZ7PO1gUo,74
-ellipsis/path/vector/timestamp/order/root.py,sha256=Mke16gxwK4qJDtSMqt5DRkOtLFqZyZGU8bjN_8uBjoA,1169
+ellipsis/path/vector/timestamp/order/root.py,sha256=F0j2niJ73jRUposYNuviKFDOutlS-TECfk6O1slLW4c,1174
 ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
 ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
 ellipsis/util/__init__.py,sha256=G0LaqqipkJXqZZnW78pqOw-gDQWZYLMa2ioLoCac-NI,714
 ellipsis/util/root.py,sha256=keGn515Dnxyja8kNG9p-xdsX6gRa8pHCh6AJaQXLoig,23445
 ellipsis/view/__init__.py,sha256=91KyJzbSvwSP9hvJQyo1LLM48b5NixLz6G40I9h6sdY,67
 ellipsis/view/root.py,sha256=6actiBwIsM0f7sJhQl_U4j-C6Dhe0z5XGGtxIOIKdY8,1726
-ellipsis-3.1.41.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.41.dist-info/METADATA,sha256=Jc7Y4pM9kyaMjMDaxzmhfVDeubwi3xzxrHCYJT8GhvU,1823
-ellipsis-3.1.41.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.41.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.41.dist-info/RECORD,,
+ellipsis-3.1.43.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.43.dist-info/METADATA,sha256=YvBY9loQarcjjz1Gt4eeTRGhO8RkDKMIGN7UNu7LI5Q,1823
+ellipsis-3.1.43.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ellipsis-3.1.43.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.43.dist-info/RECORD,,