ellipsis 3.1.51__py3-none-any.whl → 3.1.53__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.1.51'
+__version__ = '3.1.53'
 
 
 

ellipsis/compute/root.py

@@ -7,10 +7,9 @@ from ellipsis import sanitize
 from ellipsis import apiManager
 from ellipsis.account import getInfo
 
+apiManager.baseUrl = 'https://acc.api.ellipsis-drive.com/v3'
 
-
-def createCluster(layers, token, nodes=None, interpreter='python3.12', requirements= [], awaitTillStarted = True):
-
+def createCompute(layers, token, nodes=None, interpreter='python3.12', requirements= [], awaitTillStarted = True):
     layers = sanitize.validDictArray('layers', layers, True)
     token = sanitize.validString('token', token, True)
     nodes = sanitize.validInt('nodes', nodes, False)
@@ -28,20 +27,22 @@ def createCluster(layers, token, nodes=None, interpreter='python3.12', requireme
     body = {'layers':layers, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements}
     r = apiManager.post('/compute', body, token)
 
-    clusterId = r['id']
+    computeId = r['id']
     while awaitTillStarted:
-        res = listClusters(token=token)['result']
-        r = [x for x in res if x['id'] == clusterId][0]
-
+        res = listComputes(token=token)['result']
+        r = [x for x in res if x['id'] == computeId][0]
         if r['status'] == 'available':
             break
+        if r['status'] == 'errored':
+            raise ValueError(r['message'])
+
         time.sleep(1)
 
-    return {'id':clusterId}
+    return {'id':computeId}
 
 
-def execute(clusterId, f, token, awaitTillCompleted=True):
-    clusterId = sanitize.validUuid('clusterId', clusterId, True)
+def execute(computeId, f, token, awaitTillCompleted=True):
+    computeId = sanitize.validUuid('computeId', computeId, True)
     token = sanitize.validString('token', token, True)
 
     if str(type(f)) != "<class 'function'>":
@@ -51,16 +52,21 @@ def execute(clusterId, f, token, awaitTillCompleted=True):
     f_string = base64.b64encode(f_bytes)
 
     body = { 'file':f_string}
-    apiManager.post('/compute/' + clusterId + '/execute', body, token)
+    apiManager.post('/compute/' + computeId + '/execute', body, token)
 
     while awaitTillCompleted:
-        res = listClusters(token=token)['result']
-        r = [x for x in res if x['id'] == clusterId][0]
+        res = listComputes(token=token)['result']
+        r = [x for x in res if x['id'] == computeId][0]
         if r['status'] == 'completed':
             break
         time.sleep(1)
 
-    return r['result']
+    for x in r['result']:
+        if x['type'] == 'exception':
+            raise x['value']
+
+    values = [x['value'] for x in r['result']]
+    return values
 
 def parseResults(r):
     results = []
@@ -71,30 +77,51 @@ def parseResults(r):
 
     return results
 
-def terminateCluster(clusterId, token, awaitTillTerminated = True):
-    clusterId = sanitize.validUuid('clusterId', clusterId, True)
+def terminatecompute(computeId, token, awaitTillTerminated = True):
+    computeId = sanitize.validUuid('computeId', computeId, True)
     token = sanitize.validString('token', token, True)
+    sanitize.validBool('awaitTillTerminated',awaitTillTerminated, True)
 
 
-    r = apiManager.post('/compute/' + clusterId + '/terminate', {}, token)
+    r = apiManager.post('/compute/' + computeId + '/terminate', {}, token)
 
     while awaitTillTerminated:
-        res = listClusters(token=token)['result']
-        z = [x for x in res if x['id'] == clusterId][0]
+        res = listComputes(token=token)['result']
+        z = [x for x in res if x['id'] == computeId][0]
         if z['status'] == 'stopped':
             break
         time.sleep(1)
 
     return r
 
-def getClusterInfo(clusterId, token):
-    res = listClusters(token=token)['result']
-    r = [x for x in res if x['id'] == clusterId]
+def terminateAll(token, awaitTillTerminated = True ):
+    token = sanitize.validString('token', token, True)
+    sanitize.validBool('awaitTillTerminated',awaitTillTerminated, True)
+
+    res = listComputes(token = token)['result']
+
+    for x in res:
+        if x['status'] != 'stopped' and x['status'] != 'errored' and x['status'] != 'stopping':
+
+            apiManager.post('/compute/' + x['id'] + '/terminate', {}, token)
+
+            while awaitTillTerminated:
+                res = listComputes(token=token)['result']
+                z = [x for x in res if x['id'] == x['id']][0]
+                if z['status'] == 'stopped':
+                    break
+                time.sleep(1)
+
+
+
+def getComputeInfo(computeId, token):
+    res = listComputes(token=token)['result']
+    r = [x for x in res if x['id'] == computeId]
     if len(r) ==0:
-        raise ValueError('No cluster found for given id')
+        raise ValueError('No compute found for given id')
     return r[0]
 
-def listClusters(token, pageStart = None, listAll = True):
+def listComputes(token, pageStart = None, listAll = True):
     token = sanitize.validString('token', token, True)
 
 

ellipsis/path/vector/root.py

@@ -31,5 +31,15 @@ def editFilter(pathId, propertyFilter, token):
     r = apiManager.post('/path/' + pathId + '/vector/filter' , body, token)
     return r
 
+def computeAllVectorTiles(pathId, timestampId, token):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    timestampId = sanitize.validUuid('timestampId', timestampId, True)
+    token = sanitize.validString('token', token, True)
+
+    r = apiManager.post('/path/' + pathId + '/vector/timestamp/' + timestampId + '/precompute/completeVectorTile' , {}, token)
+
+    return r
+
+
 
 

{ellipsis-3.1.51.dist-info → ellipsis-3.1.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.51
+Version: 3.1.53
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: Fiona
 Requires-Dist: Pillow
 Requires-Dist: Shapely
+Requires-Dist: dill
 Requires-Dist: geopandas
 Requires-Dist: geopy
 Requires-Dist: imagecodecs

{ellipsis-3.1.51.dist-info → ellipsis-3.1.53.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ellipsis/__init__.py,sha256=i80vZ2_QmnXj1oBX5d4V6vHMHiVufbd5KiF1HpydmpI,238
+ellipsis/__init__.py,sha256=lxeIxyjSlr7NeusvW1_p_Hqwb4t11nrW4dGWz6A8JA8,238
 ellipsis/apiManager.py,sha256=T0YYV26r02yDMFO5ePmBbM4_gfy55KleECAyM1OSrCk,5598
 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=2UDm8SlCNXemkvDeNDnDV9HP_NU0ouwLVrjGzzqQ0Rc,48
-ellipsis/compute/root.py,sha256=I89ut7UURp1Bx3yFQIOHwqLLc7RacKTvq7iyFZLIBKc,3343
+ellipsis/compute/root.py,sha256=uP-yHsNFDn3VSqPY2OcYZ83jRSpIJZH7nDBDGsH6lBU,4376
 ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
 ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -46,7 +46,7 @@ ellipsis/path/setUpTask/root.py,sha256=ERmbcGvxyCcGSKeJDe3bdYke9Do4VK02o-aeTQ77s
 ellipsis/path/usage/__init__.py,sha256=2BHmLV9soOYDhyQFH2B86bBjmWXGsfuX4KneEBDo6O4,96
 ellipsis/path/usage/root.py,sha256=NAZCDHXHcN6kodU3EpbNwlWM3It60ewsGXt4LJ_enG0,1566
 ellipsis/path/vector/__init__.py,sha256=hsWLBZOmDYw5Ra9TzX5hFipi4ZcXdVP1E35cHk2PQwQ,281
-ellipsis/path/vector/root.py,sha256=XA6698yrY1HEHCUc7b8e_ideyuUWw2p-blE0w7p3I3E,1427
+ellipsis/path/vector/root.py,sha256=P8zKEA6b4F9sQ7di5FHtiHrp3wnG49QVfDgq68_n7Ek,1808
 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
@@ -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=Ts7DeaD_X7x-csmq5V2sa_hYrt1mCd59T7-NUQcWj3Y,23980
-ellipsis-3.1.51.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.51.dist-info/METADATA,sha256=8l3_aMAIGtCUzmIGjn1FYm3b6NkCT0kwE612NyRcZ_w,1823
-ellipsis-3.1.51.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ellipsis-3.1.51.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.51.dist-info/RECORD,,
+ellipsis-3.1.53.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.53.dist-info/METADATA,sha256=JH8p--VonrpjP-7A2U-3prjlpsO2qBaXdlctNsThE7s,1843
+ellipsis-3.1.53.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.1.53.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.53.dist-info/RECORD,,