ellipsis 3.2.4__tar.gz → 3.2.6__tar.gz

{ellipsis-3.2.4 → ellipsis-3.2.6}/PKG-INFO

@@ -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 → ellipsis-3.2.6}/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-3.2.4 → ellipsis-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 → ellipsis-3.2.6}/ellipsis.egg-info/PKG-INFO

@@ -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 → ellipsis-3.2.6}/setup.py

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