ellipsis 3.1.48__tar.gz → 3.1.50__tar.gz

{ellipsis-3.1.48 → ellipsis-3.1.50}/PKG-INFO

@@ -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,23 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-Requires-Dist: imagecodecs
-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 → ellipsis-3.1.50}/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-3.1.50/ellipsis/account/__init__.py

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

{ellipsis-3.1.48 → ellipsis-3.1.50}/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-3.1.48 → ellipsis-3.1.50}/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-3.1.50/ellipsis/compute/__init__.py

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

ellipsis-3.1.50/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-3.1.48 → ellipsis-3.1.50}/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-3.1.48 → ellipsis-3.1.50}/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-3.1.48 → ellipsis-3.1.50}/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 → ellipsis-3.1.50}/ellipsis.egg-info/PKG-INFO

@@ -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,23 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-Requires-Dist: imagecodecs
-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 → ellipsis-3.1.50}/ellipsis.egg-info/SOURCES.txt

@@ -13,6 +13,8 @@ ellipsis/account/__init__.py
 ellipsis/account/root.py
 ellipsis/account/accessToken/__init__.py
 ellipsis/account/accessToken/root.py
+ellipsis/compute/__init__.py
+ellipsis/compute/root.py
 ellipsis/path/__init__.py
 ellipsis/path/root.py
 ellipsis/path/bookmark/__init__.py

{ellipsis-3.1.48 → ellipsis-3.1.50}/setup.py

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

{ellipsis-3.1.48 → ellipsis-3.1.50}/test/test.py

@@ -5,10 +5,28 @@ import time
 import numpy as np
 import pandas as pd
 
+from test.pointCloud import timestampId
+
+el.path.folder.listFolder()
+
+import dill
+with open('/home/daniel/Downloads/nonTrivial.dill', "rb") as dill_file:
+ f = dill.load(dill_file)
+f(r , None, None)
 
 
 import os
 
+token = 'epat_S8uBdcJ8GqjUeh5ycJqXurMKHYnrs5BZT002G4nWWQu6Enl6TrDvtAzK1I9RPQmk'
+file = '/home/daniel/Ellipsis/db/zone0.tif'
+
+
+pathId = 'cc889803-e643-4384-9b73-a89c8f09dd65'
+timestampId = 'cc889803-e643-4384-9b73-a89c8f09dd65'
+el.path.raster.timestamp.file.add(pathId=pathId, timestampId=timestampId, fileFormat='tif', filePath = file, token = token)
+
+
+
 file = '/home/daniel/Ellipsis/keys/admin'
 with open(file,'r') as c:
     password = c.read()
@@ -52,7 +70,18 @@ setDomains(pathId = pathId, token = daan_token, domains = ['hoi'])
 setDomains(pathId = pathId, token = daan_token, domains = None)
 
 
+####account
+token = logIn('admin', 'k67cFGK1ued6aPP')
+
+layers = [{'pathId':'07c6ad34-9e0b-494f-9c8c-3f5cfbc1b76f', 'timestampId':'7cf1c34b-b863-419f-9dd5-33eb6ab8b2ac'}]
+clusterId = createCluster(layers = layers, token=token, requirements = ['numpy'], nodes = 2)['id']
 
+def f(params):
+    r = params['7cf1c34b-b863-419f-9dd5-33eb6ab8b2ac']['raster']
+    z = np.max(r)
+    return z
+
+out = execute(clusterId=clusterId, f=f, token = token)
 
 
 ###files
@@ -553,7 +582,7 @@ el.path.raster.timestamp.file.add(pathId = 'f3f55c63-4f22-4dac-8d96-cd9a38069ee2
 sh = gpd.read_file('/home/daniel/Ellipsis/db/testset/buildings_mini')
 b = BytesIO()
 out = el.util.saveVector(features = sh, targetFile = b)
-
+el.util.saveRaster()
 el.path.vector.timestamp.file.add(pathId = 'c6a341e1-59bf-44f8-a0d7-0962415a8fa2', timestampId= 'ad490f78-0cf0-426e-9238-e0ef803c7371', token = token, fileFormat='gpkg', memFile=out, name = 'test.gpkg')
 
 

ellipsis-3.1.48/ellipsis/account/__init__.py

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

{ellipsis-3.1.48 → ellipsis-3.1.50}/ellipsis.egg-info/requires.txt

@@ -1,17 +1,17 @@
-pandas
+Fiona
 Pillow
-matplotlib
+Shapely
 geopandas
-pyproj
+geopy
+imagecodecs
 imageio
+matplotlib
 numpy
-imagecodecs
+pandas
+pygltflib
+pyproj
+rasterio
 requests
 requests-toolbelt
-rasterio
-Shapely
-geopy
 scikit-image
-Fiona
-pygltflib
 tifffile