ellipsis 3.1.51__tar.gz → 3.1.53__tar.gz

{ellipsis-3.1.51 → ellipsis-3.1.53}/PKG-INFO

@@ -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

{ellipsis-3.1.51 → ellipsis-3.1.53}/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-3.1.51 → ellipsis-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-3.1.51 → ellipsis-3.1.53}/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 → ellipsis-3.1.53}/ellipsis.egg-info/PKG-INFO

@@ -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

{ellipsis-3.1.51 → ellipsis-3.1.53}/ellipsis.egg-info/requires.txt

@@ -1,6 +1,7 @@
 Fiona
 Pillow
 Shapely
+dill
 geopandas
 geopy
 imagecodecs

{ellipsis-3.1.51 → ellipsis-3.1.53}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="ellipsis",
-    version="3.1.51",
+    version="3.1.53",
     author="Daniel van der Maas",
     author_email="daniel@ellipsis-drive.com",
     description="Package to interact with the Ellipsis API",
@@ -36,7 +36,8 @@ setuptools.setup(
     'scikit-image',
     'Fiona',
     'pygltflib',
-    'tifffile'
+    'tifffile',
+    'dill'
     ],
     python_requires='>=3.6',
 )