ellipsis 3.2.2__py3-none-any.whl → 3.2.4__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.2'
+__version__ = '3.2.4'
 
 
 

ellipsis/compute/__init__.py

@@ -1 +1 @@
-from ellipsis.compute.root import createCompute, listComputes, execute, terminatecompute, terminateAll, addToLayer
+from ellipsis.compute.root import createCompute, listComputes, execute, terminateCompute, terminateAll, addToLayer

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, True)
     token = sanitize.validString('token', token, True)
     nodes = sanitize.validInt('nodes', nodes, False)
     interpreter = sanitize.validString('interpreter', interpreter, True)
@@ -25,7 +26,7 @@ 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']
@@ -79,7 +80,7 @@ def parseResults(r):
 
     return results
 
-def terminatecompute(computeId, token, awaitTillTerminated = True):
+def terminateCompute(computeId, token, awaitTillTerminated = True):
     computeId = sanitize.validUuid('computeId', computeId, True)
     token = sanitize.validString('token', token, True)
     sanitize.validBool('awaitTillTerminated',awaitTillTerminated, True)

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

@@ -381,6 +381,7 @@ def analyse(pathId, timestampIds, geometry, returnType= 'all', approximate=True,
     return r
 
 
+
 def add(pathId, token, description= None, date ={'from': datetime.datetime.now(), 'to': datetime.datetime.now()}):
     
 

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

@@ -21,8 +21,8 @@ import multiprocessing
 import warnings
 import uuid
 import shapely
-from shapely.ops import cascaded_union
 
+from io import BytesIO
 
 from ellipsis import sanitize
 from rasterio.warp import reproject as warp, Resampling, calculate_default_transform
@@ -487,7 +487,7 @@ def cut(sh, bounds, tile, chosen):
             collections = np.array(['collection' in str(type(x)) for x in sh_intersects['geometry']])
             geometryCollections = sh_intersects['geometry'][collections].values
     
-            newGeometries = [ cascaded_union([geometry for geometry in collection if chosen in str(type(geometry))]) for collection in geometryCollections   ]
+            newGeometries = [ shapely.ops.cascaded_union([geometry for geometry in collection if chosen in str(type(geometry))]) for collection in geometryCollections   ]
     
             sh_intersects['geometry'][collections] = newGeometries
             

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

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

@@ -1,18 +1,18 @@
-ellipsis/__init__.py,sha256=PIgb_Pm9VSfWqIFVMyBucJ38UvtoI6fbdJXYptibSko,237
+ellipsis/__init__.py,sha256=EJ02d1UN9rkZkh-vretLuqjTy1xlFwXDFcJnbRO4VNU,237
 ellipsis/apiManager.py,sha256=iX6XFwilMfuCQYioAmgRgReL8W63FUBr3UC506ucIF4,5603
 ellipsis/sanitize.py,sha256=VuTPjHAUNCGUaOzKU2ojloiEN8kPhm53fIjbk6E9IEg,10597
 ellipsis/account/__init__.py,sha256=jTmwL9HVS27vAHPC_2a98RQJWbpSKBN4ptiXpY0qJgk,101
 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=D_PEEIfNar00N85LUF4m1p9R4icrnAktJP_26PoAPqA,115
-ellipsis/compute/root.py,sha256=wonw4CyScT8coJoBQiEFfl8vY_uCOdOvS1ooQHAMnVg,5324
+ellipsis/compute/__init__.py,sha256=zcjm8GX1kSi5PEK5CXsR3wc2wxBdy3EIMo_y1sFEguQ,115
+ellipsis/compute/root.py,sha256=S6csK95CKT8LF9VTVjRux4EoDfo6fZvsDF8po0huVaM,5411
 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=zY7Hc5hRZkSvRsHnjfYwTTBBLcg9sYhbuqvXP_yWjxk,4993
+ellipsis/path/file/root.py,sha256=xBQBBdISRw3BDp8FqX5s-Mki1wwYjN2U6bvHWIZv_1U,5045
 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,9 +33,9 @@ ellipsis/path/pointCloud/timestamp/order/root.py,sha256=ni4lYOmatqLg5NQ1VTLeG9R7
 ellipsis/path/raster/__init__.py,sha256=xWEsdpQxsqnwSdRqmZujS3pEUAmemHmUCtMKCaWLK0M,217
 ellipsis/path/raster/root.py,sha256=-y0SEukHEYUDvyJyDI1x7gtcDm-Wum_Ze7ekSYJr6O4,1749
 ellipsis/path/raster/style/__init__.py,sha256=mxlqVtSd2dsKai3DAVQjtNsh2KnTrZVyF8loRwUNT7E,61
-ellipsis/path/raster/style/root.py,sha256=YFQlGTdgjpwXn4h0ug7LrQZFLmRp2bdJN71A0iqZRFo,1627
+ellipsis/path/raster/style/root.py,sha256=W9paEo_5nE-OpfoTwrrxNaSo1V-vnpGoA4H3rL043gQ,1696
 ellipsis/path/raster/timestamp/__init__.py,sha256=brmFXg69CKRcWaAfPbxWfsvHvnn5q8GBQhVzUTVb4_w,842
-ellipsis/path/raster/timestamp/root.py,sha256=3FiF_ls5iow96kDnSVqGQqCAl3Bj1DgFiF6sF6b-Ty0,17518
+ellipsis/path/raster/timestamp/root.py,sha256=6fGels-BtxWpF6EarxWni-AHK-5r2kb7fqVUFEnLNY4,17519
 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/root.py,sha256=P8zKEA6b4F9sQ7di5FHtiHrp3wnG49QVfDgq68_n7Ek,
 ellipsis/path/vector/featureProperty/__init__.py,sha256=-S6G0Sq66m8HVTg4bCp33fsUzYq-2hPueg5BotSpk2Q,81
 ellipsis/path/vector/featureProperty/root.py,sha256=eb2bw4UGO3eYGaYgjwu43pZyA4iAjQTik_4HurZaGbM,2111
 ellipsis/path/vector/style/__init__.py,sha256=riiDnL4FDq4EFhSYAYHBSe_o5oltRTSrj4sc72F6IVQ,63
-ellipsis/path/vector/style/root.py,sha256=09PsRbCJ35YV8bl8xoWFoeGRpdmf5IBmmqwhRj30OTM,1641
+ellipsis/path/vector/style/root.py,sha256=l78kbpeHwZCbQkc1HhKK9Lf-vq41BXjnAGhiEJNJZ5w,1772
 ellipsis/path/vector/timestamp/__init__.py,sha256=n0ncRxXoQIDX1WeV0lbpJH1BND793CdZ5swGgeu1Kfk,330
 ellipsis/path/vector/timestamp/root.py,sha256=MrYfAUKzmIXnt8DYRYU9YB6pqnNexcWcXUu4Ze3WUGc,11296
 ellipsis/path/vector/timestamp/feature/__init__.py,sha256=miaLCHkogL9KJ_eUr4K_N15BShAe2ivcppDFJuE_SgI,210
@@ -66,9 +66,9 @@ ellipsis/path/vector/timestamp/order/root.py,sha256=kknhHJSuj91WaRF-qzfovummHwpl
 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.2.2.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.2.2.dist-info/METADATA,sha256=rO9sYvY9--rfGTbMTNsObnAvjyqDxXFoH3d-Ivbee0o,1842
-ellipsis-3.2.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ellipsis-3.2.2.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.2.2.dist-info/RECORD,,
+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,,