ellipsis 3.1.47__tar.gz → 3.1.48__tar.gz

{ellipsis-3.1.47 → ellipsis-3.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.47
+Version: 3.1.48
 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.47 → ellipsis-3.1.48}/ellipsis/__init__.py

@@ -6,7 +6,7 @@ from ellipsis import user
 from ellipsis import path
 from ellipsis import util
 
-__version__ = '3.1.47'
+__version__ = '3.1.48'
 
 
 

{ellipsis-3.1.47 → ellipsis-3.1.48}/ellipsis/apiManager.py

@@ -74,8 +74,10 @@ def call(method, url, body = None, token = None, crash = True, parseJson = True)
         try:
             r = actualCall(method, url, body, token)
             break
-        except:
+        except Exception as ex:
             print('time out detected, retrying request')
+            print('url', url)
+            print('error',ex)
             time.sleep(WAIT)
             tried = tried +1
     if tried >= RETRIES:
@@ -125,7 +127,8 @@ def upload(url, filePath, body, token, key = 'data', memfile= None):
         conn_file = memfile
 
     payload = MultipartEncoder(fields = {**body, key: (fileName, conn_file, 'application/octet-stream')})
-    token = 'Bearer ' + token
+    if not 'Bearer' in token:
+        token = 'Bearer ' + token
 
     r = requests.post(baseUrl + url, headers = {"Authorization":token, "Content-Type": payload.content_type}, data=payload, verify=False)
 

{ellipsis-3.1.47 → ellipsis-3.1.48}/ellipsis/path/raster/timestamp/root.py

@@ -179,7 +179,7 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
     as_jpg = info['raster']['asJpg']
     num_bands = len(bands)
     dtype = info['raster']['format']
-
+    accessLevel = info['yourAccess']['accessLevel']
     timestamps =  info['raster']['timestamps']
     all_timestamps = [item['id'] for item in timestamps]
     if not timestampId in all_timestamps:
@@ -212,7 +212,7 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
     
     N=0
     w = 256
-    if not skipTar and ((x2_osm - x1_osm) * (y2_osm - y1_osm) > 50 or forceTar):
+    if not skipTar and ((x2_osm - x1_osm) * (y2_osm - y1_osm) > 50 and accessLevel > 100 or forceTar):
         tarZoom = next(item for item in timestamps if item["id"] == timestampId)['tarZoom']
             
         if type(tarZoom) != type(None):

{ellipsis-3.1.47 → ellipsis-3.1.48}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.47
+Version: 3.1.48
 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.47 → ellipsis-3.1.48}/setup.py

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

{ellipsis-3.1.47 → ellipsis-3.1.48}/test/test.py

@@ -577,3 +577,4 @@ seriesData = pd.DataFrame({'date':date, 'featureId': featureId, 'x':x })
 seriesData['x'].values[4] = np.nan
 el.path.vector.timestamp.feature.series.add(pathId = layerId, timestampId = timestampId, uploadAsFile = True, seriesData=seriesData, token=token)
 
+t = pd.read_csv('/home/daniel/Downloads/test.csv')