ellipsis 3.2.3__tar.gz → 3.2.5__tar.gz

{ellipsis-3.2.3 → ellipsis-3.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.2.3
+Version: 3.2.5
 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.3 → ellipsis-3.2.5}/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.3'
+__version__ = '3.2.5'
 
 
 

{ellipsis-3.2.3 → ellipsis-3.2.5}/ellipsis/compute/root.py

@@ -10,8 +10,9 @@ from ellipsis.path.raster.timestamp.file import add as addFile
 from ellipsis.path.raster.timestamp import activate
 from io import BytesIO
 
-def createCompute(layers, token, nodes=None, interpreter='python3.12', requirements= [], awaitTillStarted = True, largeResult = False):
+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, False)
     token = sanitize.validString('token', token, True)
     nodes = sanitize.validInt('nodes', nodes, False)
     interpreter = sanitize.validString('interpreter', interpreter, True)
@@ -25,11 +26,12 @@ def createCompute(layers, token, nodes=None, interpreter='python3.12', requireme
 
     requirements = "\n".join(requirements)
 
-    body = {'layers':layers, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements, 'largeResult': largeResult}
+    body = {'layers':layers, 'files':files, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements, 'largeResult': largeResult}
     r = apiManager.post('/compute', body, token)
 
     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':
@@ -58,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)
@@ -145,14 +148,26 @@ 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])
+        addFile(pathId = pathId, timestampId=timestampId, token = token, fileFormat='tif', memFile=memfile, name= url.split('/')[-1] )
+        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.3 → ellipsis-3.2.5}/ellipsis/path/file/root.py

@@ -22,7 +22,8 @@ def add(  token, filePath=None, memFile=None, parentId = None, publicAccess =Non
 
     seperator = os.path.sep    
     fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
-        
+    if len(fileName) > 64:
+        fileName = fileName[0:63]
     body = {'name':fileName, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
     if type(memFile) == type(None):
         r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')

{ellipsis-3.2.3 → ellipsis-3.2.5}/ellipsis/path/raster/style/root.py

@@ -1,15 +1,17 @@
 from ellipsis import apiManager
 from ellipsis import sanitize
 
-def add(pathId, name, method, parameters, token, default=True):
+def add(pathId, name, parameters, token, default=True, method = None):
     token = sanitize.validString('token', token, True)
     pathId = sanitize.validUuid('pathId', pathId, True)    
-    method = sanitize.validString('method', method, True)    
+    method = sanitize.validString('method', method, False)
     name = sanitize.validString('name', name, True)    
     default = sanitize.validBool('default', default, True)    
     parameters = sanitize.validObject('parameters', parameters, True)
-
-    body = {'name':name, 'method': method, 'parameters':parameters, 'default':default}
+    if type(method) == type(None):
+        body = {'name':name, 'parameters':parameters, 'default':default}
+    else:
+        body = {'name':name, 'method': method, 'parameters':parameters, 'default':default}
     r = apiManager.post('/path/' + pathId + '/raster/style', body, token)
     return r
 
@@ -29,7 +31,6 @@ def edit(pathId, styleId, method, parameters, token, name=None, default = None):
     method = sanitize.validString('method', method, True)    
     parameters = sanitize.validObject('parameters', parameters, True)
     default = sanitize.validBool('default', default, False)    
-    default = sanitize.validString('name', name, False)
 
     body = {'method': method, 'parameters':parameters, 'default':default, 'name':name}
     r = apiManager.patch('/path/' + pathId + '/raster/style/' + styleId, body, token)

{ellipsis-3.2.3 → ellipsis-3.2.5}/ellipsis/path/vector/style/root.py

@@ -3,14 +3,16 @@ from ellipsis import sanitize
 
 
 
-def add(pathId, name, method, parameters, token, default = True):
+def add(pathId, name, parameters, token, default = True, method = None):
     pathId = sanitize.validUuid('pathId', pathId, True) 
-    method = sanitize.validString('method', method, True)
+    method = sanitize.validString('method', method, False)
     parameters = sanitize.validObject('parameters', parameters, True)
     token = sanitize.validString('token', token, True)
     default = sanitize.validBool('default', default, True)
-
-    body = {'name': name, 'default':default, 'method': method, 'parameters':parameters}
+    if type(method) == type(None):
+        body = {'name': name, 'default':default,  'parameters':parameters}
+    else:
+        body = {'name': name, 'default':default, 'method': method, 'parameters':parameters}
 
     r = apiManager.post('/path/' + pathId + '/vector/style', body, token)
     return r

{ellipsis-3.2.3 → ellipsis-3.2.5}/ellipsis.egg-info/PKG-INFO

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

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