ellipsis 3.1.48__py3-none-any.whl → 3.1.50__py3-none-any.whl

ellipsis/__init__.py

@@ -5,8 +5,8 @@ from ellipsis import account
 from ellipsis import user
 from ellipsis import path
 from ellipsis import util
-
-__version__ = '3.1.48'
+from ellipsis import compute
+__version__ = '3.1.50'
 
 
 

ellipsis/account/__init__.py

@@ -1,4 +1,4 @@
 
-from ellipsis.account.root import logIn, listRoot
+from ellipsis.account.root import logIn, listRoot, getInfo
 
 from ellipsis.account import accessToken

ellipsis/account/root.py

@@ -24,6 +24,15 @@ def logIn(username, password, validFor = None):
 
         return(token)
 
+
+def getInfo(token):
+    token = sanitize.validString('token', token, True)
+
+    r = apiManager.get( '/account', body={}, token=token)
+
+
+    return r
+
 def listRoot(rootName, token, pathTypes= None, pageStart = None, listAll = True):
     token = sanitize.validString('token', token, True)
     rootName = sanitize.validString('rootName', rootName, True)

ellipsis/apiManager.py

@@ -116,6 +116,7 @@ def actualCall(method, url, body, token):
     return r
 
 def upload(url, filePath, body, token, key = 'data', memfile= None):
+    body['debug'] = True
     body = filterNone(body, toString=True)
 
     seperator = os.path.sep

ellipsis/compute/__init__.py

@@ -0,0 +1 @@
+from ellipsis.compute.root import createCluster

ellipsis/compute/root.py

@@ -0,0 +1,112 @@
+import dill
+import base64
+import time
+
+from ellipsis.util.root import recurse
+from ellipsis import sanitize
+from ellipsis import apiManager
+from ellipsis.account import getInfo
+
+
+
+def createCluster(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)
+    interpreter = sanitize.validString('interpreter', interpreter, True)
+    requirements = sanitize.validStringArray('requirements', requirements, False)
+
+    if type(nodes) == type(None):
+        info = getInfo(token=token)
+        nodes = info['plan']['maxComputeNodes']
+        if nodes == 0:
+            raise ValueError('You have no compute nodes in your plan. Please update your subscription')
+
+    requirements = "\n".join(requirements)
+
+    body = {'layers':layers, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements}
+    r = apiManager.post('/compute', body, token)
+
+    clusterId = r['id']
+    while awaitTillStarted:
+        res = listClusters(token=token)['result']
+        r = [x for x in res if x['id'] == clusterId][0]
+
+        if r['status'] == 'available':
+            break
+        time.sleep(1)
+
+    return {'id':clusterId}
+
+
+def execute(clusterId, f, token, awaitTillCompleted=True):
+    clusterId = sanitize.validUuid('clusterId', clusterId, True)
+    token = sanitize.validString('token', token, True)
+
+    if str(type(f)) != "<class 'function'>":
+        raise ValueError('parameter f must be a function')
+
+    f_bytes = dill.dumps(f)
+    f_string = base64.b64encode(f_bytes)
+
+    body = { 'file':f_string}
+    apiManager.post('/compute/' + clusterId + '/execute', body, token)
+
+    while awaitTillCompleted:
+        res = listClusters(token=token)['result']
+        r = [x for x in res if x['id'] == clusterId][0]
+        if r['status'] == 'completed':
+            break
+        time.sleep(1)
+
+    return r['result']
+
+def parseResults(r):
+    results = []
+    for x in r:
+        x = base64.b64decode(x)
+        x = dill.loads(x)
+        results = results + x
+
+    return results
+
+def terminateCluster(clusterId, token, awaitTillTerminated = True):
+    clusterId = sanitize.validUuid('clusterId', clusterId, True)
+    token = sanitize.validString('token', token, True)
+
+
+    r = apiManager.post('/compute/' + clusterId + '/terminate', {}, token)
+
+    while awaitTillTerminated:
+        res = listClusters(token=token)['result']
+        z = [x for x in res if x['id'] == clusterId][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]
+    if len(r) ==0:
+        raise ValueError('No cluster found for given id')
+    return r[0]
+
+def listClusters(token, pageStart = None, listAll = True):
+    token = sanitize.validString('token', token, True)
+
+
+    body = { 'pageStart':pageStart }
+
+
+    def f(body):
+        return apiManager.get('/compute', body, token)
+
+    r = recurse(f, body, listAll)
+    for i in range(len(r['result'])):
+        if 'result' in r['result'][i]:
+            r['result'][i]['result'] = parseResults(r['result'][i]['result'])
+    return r
+

ellipsis/path/vector/root.py

@@ -12,6 +12,15 @@ def add( name, token, parentId = None, publicAccess =None, metadata=None):
 
     return apiManager.post('/path/vector', body, token)
 
+def editRendering(pathId, maxZoom, token):
+    token = sanitize.validString('token', token, True)
+    pathId = sanitize.validUuid('parentId', pathId, True)
+    maxZoom = sanitize.validInt('maxZoom', maxZoom, True)
+
+    body = {"method":"vector tiles","parameters":{"zoom":maxZoom,"mb":2,"step":1000,"amount":1000},"centerPointOnly":False,"lod":6}
+    r = apiManager.put('/path/' + pathId + '/vector/renderOptions' , body, token)
+    return r
+
 
 def editFilter(pathId, propertyFilter, token):
     pathId = sanitize.validUuid('pathId', pathId, True) 

ellipsis/path/vector/timestamp/root.py

@@ -13,6 +13,9 @@ from ellipsis.path import get as getInfo
 
 import datetime
 
+
+
+
 def add(pathId,  token, properties = None, description = None, date ={'from': datetime.datetime.now(), 'to': datetime.datetime.now()}):
 
     pathId = sanitize.validUuid('pathId', pathId, True) 
@@ -150,7 +153,8 @@ def getFeaturesByIds(pathId, timestampId, featureIds, token = None, showProgress
     sh = sh.to_crs('EPSG:' + str(epsg))
     r['result'] = sh
     return r
-    
+
+
 
 def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, token = None, listAll = True, pageStart = None, epsg = 4326, coordinateBuffer = None, onlyIfCenterPointInExtent = False):
     pathId = sanitize.validUuid('pathId', pathId, True) 

ellipsis/sanitize.py

@@ -81,7 +81,7 @@ def validString(name, value, required):
         return
 
     if type(value) != type('x'):
-        raise ValueError(name + 'must be of type string')
+        raise ValueError(name + ' must be of type string')
     return(value)
 
 def validShapely(name, value, required):
@@ -317,6 +317,26 @@ def validFloatArray(name, value, required):
     return value
 
 
+def validDictArray(name, value, required):
+    if not required and type(value) == type(None):
+        return
+
+    try:
+        value = list(value)
+
+    except:
+        raise ValueError(name + ' must be an iterable')
+
+    types = np.array([(not 'dict' in str(type(x)))  for x in value])
+
+    if np.sum(types) > 0:
+        raise ValueError(name + ' must be a list of dictionaries')
+
+
+    return value
+
+
+
 def validIntArray(name, value, required):
     if not required and type(value) == type(None):
         return

{ellipsis-3.1.48.dist-info → ellipsis-3.1.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.48
+Version: 3.1.50
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -11,22 +11,22 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
+Requires-Dist: Fiona
 Requires-Dist: Pillow
-Requires-Dist: matplotlib
+Requires-Dist: Shapely
 Requires-Dist: geopandas
-Requires-Dist: pyproj
+Requires-Dist: geopy
+Requires-Dist: imagecodecs
 Requires-Dist: imageio
+Requires-Dist: matplotlib
 Requires-Dist: numpy
-Requires-Dist: imagecodecs
+Requires-Dist: pandas
+Requires-Dist: pygltflib
+Requires-Dist: pyproj
+Requires-Dist: rasterio
 Requires-Dist: requests
 Requires-Dist: requests-toolbelt
-Requires-Dist: rasterio
-Requires-Dist: Shapely
-Requires-Dist: geopy
 Requires-Dist: scikit-image
-Requires-Dist: Fiona
-Requires-Dist: pygltflib
 Requires-Dist: tifffile
 
 # Ellipsis Drive Python Package

{ellipsis-3.1.48.dist-info → ellipsis-3.1.50.dist-info}/RECORD

@@ -1,10 +1,12 @@
-ellipsis/__init__.py,sha256=KwTCnOXo6LwHgK67wjnduQDCLwIlXztMDJs1-tCnAWg,210
-ellipsis/apiManager.py,sha256=iU8HoHycJSDowyjiSqAMaqRY1MgoaPWwFeYCiJfzaaE,5573
-ellipsis/sanitize.py,sha256=T5FawJRZ2eqGv0itiMkZ1fuJpahsSyhBMFty9cG-wwA,10194
-ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
-ellipsis/account/root.py,sha256=tgGAT2BzP3zgAqsevvkeognn5S67T-MrIP52BLN9rbE,1791
+ellipsis/__init__.py,sha256=pNIJjavEIZGWwAtesOpLrFsnp8VcxmlBAWrITOGTLg8,238
+ellipsis/apiManager.py,sha256=T0YYV26r02yDMFO5ePmBbM4_gfy55KleECAyM1OSrCk,5598
+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=2UDm8SlCNXemkvDeNDnDV9HP_NU0ouwLVrjGzzqQ0Rc,48
+ellipsis/compute/root.py,sha256=I89ut7UURp1Bx3yFQIOHwqLLc7RacKTvq7iyFZLIBKc,3343
 ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
 ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -44,13 +46,13 @@ 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=hIbJlp1kO_k2AhaFagUfd_We7taOBdD3K9n6lheWpYI,228
-ellipsis/path/vector/root.py,sha256=dGW6md_Hxu8y0IZ2sX8FJuH8aEy-qPY5IpsyMKKhtgo,984
+ellipsis/path/vector/root.py,sha256=XA6698yrY1HEHCUc7b8e_ideyuUWw2p-blE0w7p3I3E,1427
 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/timestamp/__init__.py,sha256=n0ncRxXoQIDX1WeV0lbpJH1BND793CdZ5swGgeu1Kfk,330
-ellipsis/path/vector/timestamp/root.py,sha256=kcLdfBWpoqRXWswz-nqrEM0mxw6oEZc5sUFCD_B4JRk,11296
+ellipsis/path/vector/timestamp/root.py,sha256=MrYfAUKzmIXnt8DYRYU9YB6pqnNexcWcXUu4Ze3WUGc,11296
 ellipsis/path/vector/timestamp/feature/__init__.py,sha256=miaLCHkogL9KJ_eUr4K_N15BShAe2ivcppDFJuE_SgI,210
 ellipsis/path/vector/timestamp/feature/root.py,sha256=Y_GiT1vBEvZxxvJdUvzhjGqYsfPfi1L6qHBS5jNcnBY,7212
 ellipsis/path/vector/timestamp/feature/message/__init__.py,sha256=XfX3MIa4RjpToFnxNyfxCKTvRlNtJFRQ44j31wDyhGc,100
@@ -65,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.48.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.48.dist-info/METADATA,sha256=sdIfJZ4ddvKrElMJq-XraR859JmHykpGB_ai2HnPCW4,1823
-ellipsis-3.1.48.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.48.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.48.dist-info/RECORD,,
+ellipsis-3.1.50.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.50.dist-info/METADATA,sha256=F_4xCQHgtOAfNUsLIAKpCz6FXxgDP8RRhDQHya5YBYo,1823
+ellipsis-3.1.50.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.1.50.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.50.dist-info/RECORD,,

{ellipsis-3.1.48.dist-info → ellipsis-3.1.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any