ellipsis 3.2.0__py3-none-any.whl → 3.2.2__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.2.0'
+__version__ = '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/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/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/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/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.dist-info → ellipsis-3.2.2.dist-info}/METADATA

@@ -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.dist-info → ellipsis-3.2.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ellipsis/__init__.py,sha256=-_z5ZgwqTjO6gsw3IBYRdaa9yjVdgrnnVFOLyIQJtr4,237
-ellipsis/apiManager.py,sha256=T0YYV26r02yDMFO5ePmBbM4_gfy55KleECAyM1OSrCk,5598
+ellipsis/__init__.py,sha256=PIgb_Pm9VSfWqIFVMyBucJ38UvtoI6fbdJXYptibSko,237
+ellipsis/apiManager.py,sha256=iX6XFwilMfuCQYioAmgRgReL8W63FUBr3UC506ucIF4,5603
 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=-FC0XRa4C66PSNOzMPuyqt4SNLFSThvH4GWa5CPLVz4,71
-ellipsis/compute/root.py,sha256=l2F-UGpl50yNWjTebC4Q_Qul5e4B_tCcisQc_gPE170,4315
+ellipsis/compute/__init__.py,sha256=D_PEEIfNar00N85LUF4m1p9R4icrnAktJP_26PoAPqA,115
+ellipsis/compute/root.py,sha256=wonw4CyScT8coJoBQiEFfl8vY_uCOdOvS1ooQHAMnVg,5324
 ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
 ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -35,7 +35,7 @@ ellipsis/path/raster/root.py,sha256=-y0SEukHEYUDvyJyDI1x7gtcDm-Wum_Ze7ekSYJr6O4,
 ellipsis/path/raster/style/__init__.py,sha256=mxlqVtSd2dsKai3DAVQjtNsh2KnTrZVyF8loRwUNT7E,61
 ellipsis/path/raster/style/root.py,sha256=YFQlGTdgjpwXn4h0ug7LrQZFLmRp2bdJN71A0iqZRFo,1627
 ellipsis/path/raster/timestamp/__init__.py,sha256=brmFXg69CKRcWaAfPbxWfsvHvnn5q8GBQhVzUTVb4_w,842
-ellipsis/path/raster/timestamp/root.py,sha256=AVwrLIcyyK_1G90C3jLCWFSFxisv5bzIobdt5IHk5R0,17330
+ellipsis/path/raster/timestamp/root.py,sha256=3FiF_ls5iow96kDnSVqGQqCAl3Bj1DgFiF6sF6b-Ty0,17518
 ellipsis/path/raster/timestamp/util.py,sha256=eupFFSBp5CaTDIRg6DYnZnfWY61h81JZ7c15NdJ-j5E,2580
 ellipsis/path/raster/timestamp/file/__init__.py,sha256=Ln9_dQ4-PMwb5VP--Qh09IV5zmr-47RShpe0-f_NVh4,97
 ellipsis/path/raster/timestamp/file/root.py,sha256=KD8E64eZtS62C-WCl3BTeVjsc08BaLXpuLwxfbmnTLI,4545
@@ -59,7 +59,7 @@ ellipsis/path/vector/timestamp/feature/message/__init__.py,sha256=XfX3MIa4RjpToF
 ellipsis/path/vector/timestamp/feature/message/root.py,sha256=isLzkITTiluKoIsH0PYT0K5Cr-LBzTA0TSE4-2tZU5M,3949
 ellipsis/path/vector/timestamp/feature/series/__init__.py,sha256=vPi57QdUPTEnQE31abgxzwWU3Gzu-Xxi3ZVD4z5MMwg,107
 ellipsis/path/vector/timestamp/feature/series/root.py,sha256=DEeX5noIHMQA-sNlyLnxiZEBBEs5Xpsnclv9Xfe6Uas,7605
-ellipsis/path/vector/timestamp/file/__init__.py,sha256=qJtOXI9MEv4KifDjMW3zUDKnef8PD69SQmgRc3wDShQ,73
+ellipsis/path/vector/timestamp/file/__init__.py,sha256=sLdDeC6kiLxrQmHzyVJfg8MAT1JdzdZ2LdnguOllrUI,98
 ellipsis/path/vector/timestamp/file/root.py,sha256=STswXCVZMtLmYceXKQsLKhyNmWzifDHp084mdS9fYLQ,4736
 ellipsis/path/vector/timestamp/order/__init__.py,sha256=w11nMYDQJzZJU_q8o7ApadV2EOdCX93gNkHZ7PO1gUo,74
 ellipsis/path/vector/timestamp/order/root.py,sha256=kknhHJSuj91WaRF-qzfovummHwplwyizi5q-V8cA0To,1249
@@ -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.2.0.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.2.0.dist-info/METADATA,sha256=pynnmna2DzMd4oP8ASvlM24b2fQA18IsinJOFzEn-Rw,1842
-ellipsis-3.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ellipsis-3.2.0.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.2.0.dist-info/RECORD,,
+ellipsis-3.2.2.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.2.2.dist-info/METADATA,sha256=rO9sYvY9--rfGTbMTNsObnAvjyqDxXFoH3d-Ivbee0o,1842
+ellipsis-3.2.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.2.2.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.2.2.dist-info/RECORD,,