ellipsis 3.1.46__py3-none-any.whl → 3.1.48__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.46'
+__version__ = '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/path/__init__.py

@@ -9,4 +9,5 @@ from ellipsis.path import usage
 from ellipsis.path import folder
 from ellipsis.path import file
 from ellipsis.path import bookmark
+from ellipsis.path import setUpTask
 

ellipsis/path/file/root.py

@@ -8,20 +8,27 @@ import json
 import pandas as pd
 
 
-def add( filePath, token, parentId = None, publicAccess =None, metadata=None):
+def add(  token, filePath=None, memFile=None, parentId = None, publicAccess =None, metadata=None,name=None):
     token = sanitize.validString('token', token, True)
     parentId = sanitize.validUuid('parentId', parentId, False)
     publicAccess = sanitize.validObject('publicAccess', publicAccess, False)
     metadata = sanitize.validObject('metadata', metadata, False)
+    filePath = sanitize.validString('filePath', filePath, False)
+    name = sanitize.validString('name', name, False)
+    if type(memFile) == type(None) and type(filePath) == type(None):
+        raise ValueError('You need to specify either a filePath or a memFile')
+    if type(memFile) != type(None) and type(name) == type(None):
+        raise ValueError('Parameter name is required when using a memory file')
 
-
-        
     seperator = os.path.sep    
     fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
         
     body = {'name':fileName, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    if type(memFile) == type(None):
+        r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
+    else:
+        r = apiManager.upload('/path/file' , filePath , name, body, token, memfile = memFile)
 
-    r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
     return r
 
 

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/root.py

@@ -155,24 +155,12 @@ def recover(pathId, token):
     }, token)
 
 
-def delete(pathId, token, recursive = False):
+def delete(pathId, token):
     pathId = sanitize.validUuid('pathId', pathId, True)
     token = sanitize.validString('token', token, False)
-    recursive = sanitize.validBool('recursive', recursive, True)
     
-    if recursive:
-        info = get(pathId, token)
-        if info['type'] == 'folder':
-            folders = listFolder(pathId = pathId, includeTrashed=True, pathTypes=['folder'], token=token)['result']
-            for f in folders:
-                delete(f['id'], token, True)
-            maps = listFolder(pathId=pathId, pathTypes=['raster','vector','file', 'pointCloud'], includeTrashed=True, token=token)['result']
-            for m in maps:
-                delete(m['id'], token, True)
-        apiManager.delete(f'/path/{pathId}', None, token)            
-    
-    else:
-        return apiManager.delete(f'/path/{pathId}', None, token)
+
+    return apiManager.delete(f'/path/{pathId}', None, token)
 
 def editPublicAccess(pathId, token, access = None, hidden=None, recursive = False):
     pathId = sanitize.validUuid('pathId', pathId, True)

ellipsis/path/setUpTask/__init__.py

@@ -0,0 +1,2 @@
+from ellipsis.path.setUpTask.root import get, copernicusImport, fileImport
+

ellipsis/path/setUpTask/root.py

@@ -0,0 +1,50 @@
+from ellipsis import apiManager
+from ellipsis import sanitize
+import os
+
+def get(token):
+    token = sanitize.validString('token', token, False)
+
+    r = apiManager.get('/path/setUpTask', {}, token)
+        
+    return r
+
+
+def copernicusImport( parameters, token):
+    token = sanitize.validString('token', token, True)
+    parameters = sanitize.validObject('parameters', parameters, True)
+    r = apiManager.post('/path/setUpTask', {'type':'copernicusImport', 'parameters':parameters}, token)
+        
+    return r
+
+
+def fileImport(  token, memFile=None, parentId = None, filePath=None, fileFormat = 'geopackage', name = None):
+    token = sanitize.validString('token', token, True)
+    parentId = sanitize.validUuid(('parentId', parentId, False))
+    filePath = sanitize.validString('filePath', filePath, False)
+    name = sanitize.validString('name', name, False)
+    fileFormat = sanitize.validString('fileFormat', fileFormat, True)
+
+
+    if type(memFile) == type(None) and type(filePath) == type(None):
+        raise ValueError('You need to specify either a filePath or a memFile')
+    if type(memFile) != type(None) and type(name) == type(None):
+        raise ValueError('Parameter name is required when using a memory file')
+
+    if type(name) != type(None):
+        nameToUse = name
+    else:
+        seperator = os.path.sep
+        nameToUse = filePath.split(seperator)[len(filePath.split(seperator)) - 1]
+
+    parameters = {'name': nameToUse, 'parentId': parentId}
+    body = {'type': fileFormat + 'Import', 'parameters': parameters}
+    if type(memFile) == type(None):
+        r = apiManager.post('/path/setUpTask', body, token)
+    else:
+        r = apiManager.upload('/path/setUpTask' , filePath , name, body, token, memfile = memFile)
+    return r
+
+
+
+

ellipsis/path/vector/timestamp/feature/series/root.py

@@ -82,17 +82,17 @@ def add(pathId, timestampId, seriesData, token, featureId=None, showProgress = T
             df_sub['value'] = seriesData[c].astype(float)
             dfs_long = dfs_long + [df_sub]
     seriesData_long = pd.concat(dfs_long)
-
     if uploadAsFile:
 
         memfile = BytesIO()
-        seriesData_long.to_csv(memfile)
+        seriesData_long.to_csv(memfile, na_rep='null')
 
         res = apiManager.upload(url = '/path/' + pathId + '/vector/timestamp/' + timestampId + '/feature/series', filePath =  'upload', body= {'name':'upload'}, token = token, key = 'data', memfile= memfile)
         return res
     else:
-        values = seriesData_long.to_dict('records')
+        seriesData_long = seriesData_long.replace({float('nan'): None})
 
+        values = seriesData_long.to_dict('records')
 
         chunks_values = chunks(values)
         N = 0

{ellipsis-3.1.46.dist-info → ellipsis-3.1.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.46
+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.46.dist-info → ellipsis-3.1.48.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ellipsis/__init__.py,sha256=R6MNlybVTKLz0IBT7OihsOuFtHSwX6YvXctY1vI5LXg,210
-ellipsis/apiManager.py,sha256=JJ-1nT29BIcVSzMvEdkm1Wq6PsXT7Jq5OmJrRdg7C2o,5463
+ellipsis/__init__.py,sha256=KwTCnOXo6LwHgK67wjnduQDCLwIlXztMDJs1-tCnAWg,210
+ellipsis/apiManager.py,sha256=iU8HoHycJSDowyjiSqAMaqRY1MgoaPWwFeYCiJfzaaE,5573
 ellipsis/sanitize.py,sha256=T5FawJRZ2eqGv0itiMkZ1fuJpahsSyhBMFty9cG-wwA,10194
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=tgGAT2BzP3zgAqsevvkeognn5S67T-MrIP52BLN9rbE,1791
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
-ellipsis/path/__init__.py,sha256=cc03CEyQvWmdaFPo4T8KBeyYiz-04VtzcCDwMrHADmU,470
-ellipsis/path/root.py,sha256=3HaKJhjAeHMqK1rBjcvT92aG6kBWllpu3prUqO3Ov6s,8618
+ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
+ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
 ellipsis/path/bookmark/root.py,sha256=knhVIVAJS0jBT6JLdVgnufVRdxIR0VZBYfv292hg6xY,1285
 ellipsis/path/file/__init__.py,sha256=i_KB1S1J9pZjcPTKdyGMnjJf2tCoHFzptLGaxmTi55A,107
-ellipsis/path/file/root.py,sha256=3aqUFHQ7JLZf2arFoxOruOEKU-yOqUooj_LexGdPZ_s,4418
+ellipsis/path/file/root.py,sha256=zY7Hc5hRZkSvRsHnjfYwTTBBLcg9sYhbuqvXP_yWjxk,4993
 ellipsis/path/folder/__init__.py,sha256=5keiFbsuXj5bYQHt8NahGkUYvXrJk8C7cQhgHA-4VBc,139
 ellipsis/path/folder/root.py,sha256=OJSaOLWPQDXXty5sxsG_G0Fiip0VdWzj_XrcxY9Gnj8,1913
 ellipsis/path/hashtag/__init__.py,sha256=4u8VC7xOFJjuZ9K08yh6GsPn8YkYZ_24o_7viScUQlg,59
@@ -33,12 +33,14 @@ 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
 ellipsis/path/raster/timestamp/order/__init__.py,sha256=4YEK4XW9TM-HsjoFlFeyGMtI3OKX2VCXfb4NsTsugBo,74
 ellipsis/path/raster/timestamp/order/root.py,sha256=zWcfI_q9KlfevzyvwWY8ni27KCvOyAiaJvohVfasjXg,1176
+ellipsis/path/setUpTask/__init__.py,sha256=oDyCMCPzSIlMfAFIXrkviBlYwbPOmsUa3B3beyXfm_o,76
+ellipsis/path/setUpTask/root.py,sha256=ERmbcGvxyCcGSKeJDe3bdYke9Do4VK02o-aeTQ77swM,1766
 ellipsis/path/usage/__init__.py,sha256=2BHmLV9soOYDhyQFH2B86bBjmWXGsfuX4KneEBDo6O4,96
 ellipsis/path/usage/root.py,sha256=NAZCDHXHcN6kodU3EpbNwlWM3It60ewsGXt4LJ_enG0,1566
 ellipsis/path/vector/__init__.py,sha256=hIbJlp1kO_k2AhaFagUfd_We7taOBdD3K9n6lheWpYI,228
@@ -54,7 +56,7 @@ ellipsis/path/vector/timestamp/feature/root.py,sha256=Y_GiT1vBEvZxxvJdUvzhjGqYsf
 ellipsis/path/vector/timestamp/feature/message/__init__.py,sha256=XfX3MIa4RjpToFnxNyfxCKTvRlNtJFRQ44j31wDyhGc,100
 ellipsis/path/vector/timestamp/feature/message/root.py,sha256=isLzkITTiluKoIsH0PYT0K5Cr-LBzTA0TSE4-2tZU5M,3949
 ellipsis/path/vector/timestamp/feature/series/__init__.py,sha256=vPi57QdUPTEnQE31abgxzwWU3Gzu-Xxi3ZVD4z5MMwg,107
-ellipsis/path/vector/timestamp/feature/series/root.py,sha256=KCm28pQ8E6WREftuSi4wge_2QpojDW11b55j7_tG7Js,7519
+ellipsis/path/vector/timestamp/feature/series/root.py,sha256=DEeX5noIHMQA-sNlyLnxiZEBBEs5Xpsnclv9Xfe6Uas,7605
 ellipsis/path/vector/timestamp/file/__init__.py,sha256=qJtOXI9MEv4KifDjMW3zUDKnef8PD69SQmgRc3wDShQ,73
 ellipsis/path/vector/timestamp/file/root.py,sha256=STswXCVZMtLmYceXKQsLKhyNmWzifDHp084mdS9fYLQ,4736
 ellipsis/path/vector/timestamp/order/__init__.py,sha256=w11nMYDQJzZJU_q8o7ApadV2EOdCX93gNkHZ7PO1gUo,74
@@ -63,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.46.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.46.dist-info/METADATA,sha256=GD17VF-4T2g_Ff-HUy-02yXLnP6eT_YucVKjzYzBhzg,1823
-ellipsis-3.1.46.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.46.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.46.dist-info/RECORD,,
+ellipsis-3.1.48.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.48.dist-info/METADATA,sha256=sdIfJZ4ddvKrElMJq-XraR859JmHykpGB_ai2HnPCW4,1823
+ellipsis-3.1.48.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ellipsis-3.1.48.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.48.dist-info/RECORD,,