ellipsis 3.2.0__tar.gz → 3.2.2__tar.gz

{ellipsis-3.2.0 → ellipsis-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.2.0
+Version: 3.2.2
 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.0 → ellipsis-3.2.2}/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.0'
+__version__ = '3.2.2'
 
 
 

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis/apiManager.py

@@ -140,7 +140,7 @@ def upload(url, filePath, body, token, key = 'data', memfile= None):
         raise ValueError(r.text)
     return r.json()
 
-def download(url, filePath, token = None, memfile = None):
+def download(url, filePath=None, token = None, memfile = None):
     if type(token) == type(None):
         with requests.get(baseUrl + url, stream=True) as r:
             r.raise_for_status()

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis/compute/__init__.py

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

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis/compute/root.py

@@ -4,17 +4,19 @@ import time
 
 from ellipsis.util.root import recurse
 from ellipsis import sanitize
-from ellipsis import apiManager
 from ellipsis.account import getInfo
+from ellipsis import apiManager
+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):
+def createCompute(layers, token, nodes=None, interpreter='python3.12', requirements= [], awaitTillStarted = True, largeResult = False):
     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)
-
+    largeResult = sanitize.validBool('largeResult', largeResult, True)
     if type(nodes) == type(None):
         info = getInfo(token=token)
         nodes = info['plan']['maxComputeNodes']
@@ -23,7 +25,7 @@ def createCompute(layers, token, nodes=None, interpreter='python3.12', requireme
 
     requirements = "\n".join(requirements)
 
-    body = {'layers':layers, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements}
+    body = {'layers':layers, 'interpreter':interpreter, 'nodes':nodes, 'requirements':requirements, 'largeResult': largeResult}
     r = apiManager.post('/compute', body, token)
 
     computeId = r['id']
@@ -64,7 +66,8 @@ def execute(computeId, f, token, awaitTillCompleted=True):
         if x['type'] == 'exception':
             raise x['value']
 
-    values = [x['value'] for x in r['result']]
+
+    values = [ '/compute/' + computeId + '/file/'+ x['value'] if x['type'] == 'file' else x['value'] for x in r['result']]
     return values
 
 def parseResults(r):
@@ -133,6 +136,23 @@ def listComputes(token, pageStart = None, listAll = True):
     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'])
+                r['result'][i]['result'] = parseResults(r['result'][i]['result'])
     return r
 
+def addToLayer(response, pathId, timestampId, token):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    timestampId = sanitize.validUuid('timestampId', timestampId, True)
+    token = sanitize.validString('token', token, True)
+
+    for url in response:
+        memfile = downloadFile(url,  token)
+        addFile(pathId = pathId, timestampId=timestampId, token = token, fileFormat='tif', memFile=memfile, name='out.tif')
+    activate(pathId=pathId, timestampId=timestampId, token=token)
+
+
+
+def downloadFile(url,  token):
+    memfile = BytesIO()
+    apiManager.download(url = url, filePath='', memfile=memfile, token = token)
+    memfile.seek(0)
+    return memfile

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis/path/raster/timestamp/root.py

@@ -6,7 +6,6 @@ from ellipsis.util.root import reprojectRaster
 from ellipsis.path.raster.timestamp.util import constructImage
 from ellipsis.path.raster.timestamp.util import cutOfTilesPerZoom
 
-from rasterio.io import MemoryFile
 from skimage.transform import resize
 import json
 import numpy as np
@@ -31,6 +30,8 @@ def getSampledRaster(pathId, timestampId, extent, width, height, epsg=3857, toke
     epsg = sanitize.validInt('epsg', epsg, True)
 
     res = getActualExtent(extent['xMin'], extent['xMax'], extent['yMin'], extent['yMax'], 'EPSG:' + str(epsg))
+    #res = getActualExtent(minx = extentWeb['xMin'], maxx = extentWeb['xMax'], miny = extentWeb['yMin'], maxy = extentWeb['yMax'], crs = 'EPSG:3857', out_crs = 4326)
+    #extent = res['message']
 
     if res['status'] == '400':
         raise ValueError('Invalid epsg and extent combination')
@@ -46,7 +47,7 @@ def getSampledRaster(pathId, timestampId, extent, width, height, epsg=3857, toke
 
 
     r = tifffile.imread(BytesIO(r.content))
-
+    #np.unique(r)
     r = np.transpose(r, [2,0,1])
 
 
@@ -328,8 +329,8 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
         y_index = tileY - y1_osm
         
         r = iterate(fetch, 0, tileX, tileY)
+        r_total[0:r.shape[0],y_index*w:(y_index+1)*w,x_index*w:(x_index+1)*w] = r
 
-        r_total[:,y_index*w:(y_index+1)*w,x_index*w:(x_index+1)*w] = r
         I = I + 1
         if showProgress:
             loadingBar(I, len(tiles))

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis/path/vector/timestamp/file/__init__.py

@@ -1,2 +1,2 @@
-from ellipsis.path.vector.timestamp.file.root import get, add, download
+from ellipsis.path.vector.timestamp.file.root import get, add, download, revert, recover, delete
 

{ellipsis-3.2.0 → ellipsis-3.2.2}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.2.0
+Version: 3.2.2
 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.0 → ellipsis-3.2.2}/setup.py

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

{ellipsis-3.2.0 → ellipsis-3.2.2}/test/test.py

@@ -307,7 +307,7 @@ el.path.delete(mapId, admin_token)
 ##raster information retrieval
 
 import ellipsis as el
-token = el.account.logIn('admin', 'aEUZXm4jzXW6GnQHUyrl')
+token = el.account.logIn('demo_user', 'demo_user')
 
 
 mapId = '0ce1a67a-3d10-4970-967b-c8880e3c7d67'
@@ -606,3 +606,26 @@ seriesData['x'].values[4] = np.nan
 el.path.vector.timestamp.feature.series.add(pathId = layerId, timestampId = timestampId, uploadAsFile = True, seriesData=seriesData, token=token)
 
 t = pd.read_csv('/home/daniel/Downloads/test.csv')
+
+
+import ellipsis as el
+pathId = '3a5351e8-0333-47c6-9124-06b9971c9f99'
+timestampId = '78c9a95a-57a7-4db6-a029-33c85a3f75e3'
+
+token = el.account.logIn('demo_user', 'demo_user')
+
+#wijzig alle namen binnen een extent
+
+#haal de huidige features op
+extent = {'xMin':2, 'xMax':6, 'yMin':53, 'yMax':54}
+features = el.path.vector.timestamp.getFeaturesByExtent(pathId, timestampId, extent)['result']
+featuresIds = features['id'].values
+#update de features hoe je wil
+features['bottum'] = 'up'
+#submit de aangepaste features
+el.path.vector.timestamp.feature.edit(pathId, timestampId, featureIds, token, newFeatures)
+
+import ellipsis as el
+r = el.path.raster.timestamp.getRaster(pathId = '07125c90-bfde-4036-b85e-b1fdee861ca6', timestampId= 'aa23ec66-91bb-4276-a98c-1b45b6a962fb', extent= {'xMin':70.75458, 'yMin':29.17649 , 'xMax':81.69791, 'yMax': 31.97394 }, epsg=4326)
+
+el.util.plotRaster(r['raster'])