ellipsis 3.2.4__py3-none-any.whl → 3.2.6__py3-none-any.whl

ellipsis/__init__.py

@@ -6,7 +6,7 @@ from ellipsis import user
 from ellipsis import path
 from ellipsis import util
 from ellipsis import compute
-__version__ = '3.2.4'
+__version__ = '3.2.6'
 
 
 

ellipsis/compute/root.py

@@ -12,7 +12,7 @@ from io import BytesIO
 
 def createCompute(layers, token, files = None, nodes=None, interpreter='python3.12', requirements= [], awaitTillStarted = True, largeResult = False):
     layers = sanitize.validDictArray('layers', layers, True)
-    files = sanitize.validUuidArray('files', files, True)
+    files = sanitize.validUuidArray('files', files, False)
     token = sanitize.validString('token', token, True)
     nodes = sanitize.validInt('nodes', nodes, False)
     interpreter = sanitize.validString('interpreter', interpreter, True)
@@ -31,6 +31,7 @@ def createCompute(layers, token, files = None, nodes=None, interpreter='python3.
 
     computeId = r['id']
     while awaitTillStarted:
+        print('waiting')
         res = listComputes(token=token)['result']
         r = [x for x in res if x['id'] == computeId][0]
         if r['status'] == 'available':
@@ -59,6 +60,7 @@ def execute(computeId, f, token, awaitTillCompleted=True):
     while awaitTillCompleted:
         res = listComputes(token=token)['result']
         r = [x for x in res if x['id'] == computeId][0]
+        print('waiting')
         if r['status'] == 'completed':
             break
         time.sleep(1)
@@ -146,14 +148,27 @@ def addToLayer(response, pathId, timestampId, token):
     token = sanitize.validString('token', token, True)
 
     for url in response:
-        memfile = downloadFile(url,  token)
-        addFile(pathId = pathId, timestampId=timestampId, token = token, fileFormat='tif', memFile=memfile, name='out.tif')
+        print('fetching file ' + url.split('/')[-1])
+        memfile = BytesIO()
+        memfile = downloadFile(url,  token, memfile=memfile)
+        print('read file ' + url.split('/')[-1])
+        print('adding file ' + url.split('/')[-1])
+        addFile(pathId = pathId, timestampId=timestampId, token = token, fileFormat='tif', memFile=memfile, name= url.split('/')[-1] + '.tif' )
+        print('file ' + url.split('/')[-1] + ' added to layer')
     activate(pathId=pathId, timestampId=timestampId, token=token)
+    print('layer can now be found at ' + apiManager.baseUrl + '/drive/me?pathId=' + pathId )
 
 
 
-def downloadFile(url,  token):
-    memfile = BytesIO()
-    apiManager.download(url = url, filePath='', memfile=memfile, token = token)
-    memfile.seek(0)
-    return memfile
+def downloadFile(url,  token, filePath = None, memfile = None):
+
+    url = sanitize.validString('url', url, True)
+    token = sanitize.validString('token', token, True)
+    filePath = sanitize.validString('filePath', filePath, False)
+    if memfile == None and filePath == None:
+        raise ValueError('Either memfile or filePath is required')
+
+    apiManager.download(url = url, filePath=filePath, memfile=memfile, token = token)
+
+    if memfile != None:
+        return memfile

{ellipsis-3.2.4.dist-info → ellipsis-3.2.6.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-ellipsis/__init__.py,sha256=EJ02d1UN9rkZkh-vretLuqjTy1xlFwXDFcJnbRO4VNU,237
+ellipsis/__init__.py,sha256=WgtGW5z3sVpEExvHTlhAdXkCqkV7T-cfU7CbNozgHfQ,237
 ellipsis/apiManager.py,sha256=iX6XFwilMfuCQYioAmgRgReL8W63FUBr3UC506ucIF4,5603
 ellipsis/sanitize.py,sha256=VuTPjHAUNCGUaOzKU2ojloiEN8kPhm53fIjbk6E9IEg,10597
 ellipsis/account/__init__.py,sha256=jTmwL9HVS27vAHPC_2a98RQJWbpSKBN4ptiXpY0qJgk,101
@@ -6,7 +6,7 @@ ellipsis/account/root.py,sha256=p8AehZQizaPlpGdFB5RsMduyUF4ynN0cGDz41nIxjYM,1942
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
 ellipsis/compute/__init__.py,sha256=zcjm8GX1kSi5PEK5CXsR3wc2wxBdy3EIMo_y1sFEguQ,115
-ellipsis/compute/root.py,sha256=S6csK95CKT8LF9VTVjRux4EoDfo6fZvsDF8po0huVaM,5411
+ellipsis/compute/root.py,sha256=raqMp1sYw3rPw5Vi5CY4mUhCRTKiuCx2pT5r0T6USNs,6144
 ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
 ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -67,8 +67,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=3pw-tXGTQC5PMUtpReJEA9rgyJZNlTM3uUISPz2Sq6Q,23976
-ellipsis-3.2.4.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.2.4.dist-info/METADATA,sha256=LyJYDVOtgX8vW9ligtntBbHd-FH3fBsRV5My9Gq54Z0,1842
-ellipsis-3.2.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ellipsis-3.2.4.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.2.4.dist-info/RECORD,,
+ellipsis-3.2.6.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.2.6.dist-info/METADATA,sha256=STWvm4CaLABwUP9Re8be6T0w0ncC0yle2NLfe7gi5Ig,1842
+ellipsis-3.2.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.2.6.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.2.6.dist-info/RECORD,,