ellipsis 3.1.47__py3-none-any.whl → 3.1.49__py3-none-any.whl

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.49'
 
 
 

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:
@@ -114,6 +116,7 @@ def actualCall(method, url, body, token):
     return r
 
 def upload(url, filePath, body, token, key = 'data', memfile= None):
+    body['debug'] = True
     body = filterNone(body, toString=True)
 
     seperator = os.path.sep
@@ -125,7 +128,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/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/path/vector/timestamp/root.py

@@ -13,6 +13,9 @@ from ellipsis.path import get as getInfo
 
 import datetime
 
+
+
+
 def add(pathId,  token, properties = None, description = None, date ={'from': datetime.datetime.now(), 'to': datetime.datetime.now()}):
 
     pathId = sanitize.validUuid('pathId', pathId, True) 
@@ -150,7 +153,8 @@ def getFeaturesByIds(pathId, timestampId, featureIds, token = None, showProgress
     sh = sh.to_crs('EPSG:' + str(epsg))
     r['result'] = sh
     return r
-    
+
+
 
 def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, token = None, listAll = True, pageStart = None, epsg = 4326, coordinateBuffer = None, onlyIfCenterPointInExtent = False):
     pathId = sanitize.validUuid('pathId', pathId, True) 

{ellipsis-3.1.47.dist-info → ellipsis-3.1.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.47
+Version: 3.1.49
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -11,22 +11,22 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
+Requires-Dist: Fiona
 Requires-Dist: Pillow
-Requires-Dist: matplotlib
+Requires-Dist: Shapely
 Requires-Dist: geopandas
-Requires-Dist: pyproj
+Requires-Dist: geopy
+Requires-Dist: imagecodecs
 Requires-Dist: imageio
+Requires-Dist: matplotlib
 Requires-Dist: numpy
-Requires-Dist: imagecodecs
+Requires-Dist: pandas
+Requires-Dist: pygltflib
+Requires-Dist: pyproj
+Requires-Dist: rasterio
 Requires-Dist: requests
 Requires-Dist: requests-toolbelt
-Requires-Dist: rasterio
-Requires-Dist: Shapely
-Requires-Dist: geopy
 Requires-Dist: scikit-image
-Requires-Dist: Fiona
-Requires-Dist: pygltflib
 Requires-Dist: tifffile
 
 # Ellipsis Drive Python Package

{ellipsis-3.1.47.dist-info → ellipsis-3.1.49.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ellipsis/__init__.py,sha256=vkB0vbq2jydnn3Y_bh4qUAoUaF9Mb5yCuGVXdR6vsq4,210
-ellipsis/apiManager.py,sha256=JJ-1nT29BIcVSzMvEdkm1Wq6PsXT7Jq5OmJrRdg7C2o,5463
+ellipsis/__init__.py,sha256=o3wQ1o9b6Wzcfd94pUTq5aXW3XzGSXb1Em1IWmlL37c,210
+ellipsis/apiManager.py,sha256=T0YYV26r02yDMFO5ePmBbM4_gfy55KleECAyM1OSrCk,5598
 ellipsis/sanitize.py,sha256=T5FawJRZ2eqGv0itiMkZ1fuJpahsSyhBMFty9cG-wwA,10194
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=tgGAT2BzP3zgAqsevvkeognn5S67T-MrIP52BLN9rbE,1791
@@ -33,7 +33,7 @@ ellipsis/path/raster/root.py,sha256=-y0SEukHEYUDvyJyDI1x7gtcDm-Wum_Ze7ekSYJr6O4,
 ellipsis/path/raster/style/__init__.py,sha256=mxlqVtSd2dsKai3DAVQjtNsh2KnTrZVyF8loRwUNT7E,61
 ellipsis/path/raster/style/root.py,sha256=YFQlGTdgjpwXn4h0ug7LrQZFLmRp2bdJN71A0iqZRFo,1627
 ellipsis/path/raster/timestamp/__init__.py,sha256=brmFXg69CKRcWaAfPbxWfsvHvnn5q8GBQhVzUTVb4_w,842
-ellipsis/path/raster/timestamp/root.py,sha256=qhJALjYVCdNmH3atGNmIe89Zm5xj_EAd8fczHWW4CQg,17257
+ellipsis/path/raster/timestamp/root.py,sha256=AVwrLIcyyK_1G90C3jLCWFSFxisv5bzIobdt5IHk5R0,17330
 ellipsis/path/raster/timestamp/util.py,sha256=eupFFSBp5CaTDIRg6DYnZnfWY61h81JZ7c15NdJ-j5E,2580
 ellipsis/path/raster/timestamp/file/__init__.py,sha256=Ln9_dQ4-PMwb5VP--Qh09IV5zmr-47RShpe0-f_NVh4,97
 ellipsis/path/raster/timestamp/file/root.py,sha256=KD8E64eZtS62C-WCl3BTeVjsc08BaLXpuLwxfbmnTLI,4545
@@ -50,7 +50,7 @@ ellipsis/path/vector/featureProperty/root.py,sha256=eb2bw4UGO3eYGaYgjwu43pZyA4iA
 ellipsis/path/vector/style/__init__.py,sha256=riiDnL4FDq4EFhSYAYHBSe_o5oltRTSrj4sc72F6IVQ,63
 ellipsis/path/vector/style/root.py,sha256=09PsRbCJ35YV8bl8xoWFoeGRpdmf5IBmmqwhRj30OTM,1641
 ellipsis/path/vector/timestamp/__init__.py,sha256=n0ncRxXoQIDX1WeV0lbpJH1BND793CdZ5swGgeu1Kfk,330
-ellipsis/path/vector/timestamp/root.py,sha256=kcLdfBWpoqRXWswz-nqrEM0mxw6oEZc5sUFCD_B4JRk,11296
+ellipsis/path/vector/timestamp/root.py,sha256=MrYfAUKzmIXnt8DYRYU9YB6pqnNexcWcXUu4Ze3WUGc,11296
 ellipsis/path/vector/timestamp/feature/__init__.py,sha256=miaLCHkogL9KJ_eUr4K_N15BShAe2ivcppDFJuE_SgI,210
 ellipsis/path/vector/timestamp/feature/root.py,sha256=Y_GiT1vBEvZxxvJdUvzhjGqYsfPfi1L6qHBS5jNcnBY,7212
 ellipsis/path/vector/timestamp/feature/message/__init__.py,sha256=XfX3MIa4RjpToFnxNyfxCKTvRlNtJFRQ44j31wDyhGc,100
@@ -65,8 +65,8 @@ ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
 ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
 ellipsis/util/__init__.py,sha256=_sNBUXDKJVGffRyt93xdUrJ4gON651Sp-unr7LKVCEc,756
 ellipsis/util/root.py,sha256=Ts7DeaD_X7x-csmq5V2sa_hYrt1mCd59T7-NUQcWj3Y,23980
-ellipsis-3.1.47.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.47.dist-info/METADATA,sha256=Qc1vooJjV5xuKr1Pwqi6SrDiZt5Dz55sAr7x1fx_dcc,1823
-ellipsis-3.1.47.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.47.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.47.dist-info/RECORD,,
+ellipsis-3.1.49.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.49.dist-info/METADATA,sha256=Od7VFLtt3fk_zWDTFpOZsu9AnC4hGZUX6P6rShg-_t0,1823
+ellipsis-3.1.49.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.1.49.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.49.dist-info/RECORD,,

{ellipsis-3.1.47.dist-info → ellipsis-3.1.49.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any