ellipsis 3.1.46__tar.gz → 3.1.48__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.46
+Version: 3.1.48
 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.46 → ellipsis-3.1.48}/ellipsis/__init__.py

@@ -6,7 +6,7 @@ from ellipsis import user
 from ellipsis import path
 from ellipsis import util
 
-__version__ = '3.1.46'
+__version__ = '3.1.48'
 
 
 

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/apiManager.py

@@ -74,8 +74,10 @@ def call(method, url, body = None, token = None, crash = True, parseJson = True)
         try:
             r = actualCall(method, url, body, token)
             break
-        except:
+        except Exception as ex:
             print('time out detected, retrying request')
+            print('url', url)
+            print('error',ex)
             time.sleep(WAIT)
             tried = tried +1
     if tried >= RETRIES:
@@ -125,7 +127,8 @@ def upload(url, filePath, body, token, key = 'data', memfile= None):
         conn_file = memfile
 
     payload = MultipartEncoder(fields = {**body, key: (fileName, conn_file, 'application/octet-stream')})
-    token = 'Bearer ' + token
+    if not 'Bearer' in token:
+        token = 'Bearer ' + token
 
     r = requests.post(baseUrl + url, headers = {"Authorization":token, "Content-Type": payload.content_type}, data=payload, verify=False)
 

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/path/__init__.py

@@ -9,4 +9,5 @@ from ellipsis.path import usage
 from ellipsis.path import folder
 from ellipsis.path import file
 from ellipsis.path import bookmark
+from ellipsis.path import setUpTask
 

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/path/file/root.py

@@ -8,20 +8,27 @@ import json
 import pandas as pd
 
 
-def add( filePath, token, parentId = None, publicAccess =None, metadata=None):
+def add(  token, filePath=None, memFile=None, parentId = None, publicAccess =None, metadata=None,name=None):
     token = sanitize.validString('token', token, True)
     parentId = sanitize.validUuid('parentId', parentId, False)
     publicAccess = sanitize.validObject('publicAccess', publicAccess, False)
     metadata = sanitize.validObject('metadata', metadata, False)
+    filePath = sanitize.validString('filePath', filePath, False)
+    name = sanitize.validString('name', name, False)
+    if type(memFile) == type(None) and type(filePath) == type(None):
+        raise ValueError('You need to specify either a filePath or a memFile')
+    if type(memFile) != type(None) and type(name) == type(None):
+        raise ValueError('Parameter name is required when using a memory file')
 
-
-        
     seperator = os.path.sep    
     fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
         
     body = {'name':fileName, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    if type(memFile) == type(None):
+        r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
+    else:
+        r = apiManager.upload('/path/file' , filePath , name, body, token, memfile = memFile)
 
-    r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
     return r
 
 

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/path/raster/timestamp/root.py

@@ -179,7 +179,7 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
     as_jpg = info['raster']['asJpg']
     num_bands = len(bands)
     dtype = info['raster']['format']
-
+    accessLevel = info['yourAccess']['accessLevel']
     timestamps =  info['raster']['timestamps']
     all_timestamps = [item['id'] for item in timestamps]
     if not timestampId in all_timestamps:
@@ -212,7 +212,7 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
     
     N=0
     w = 256
-    if not skipTar and ((x2_osm - x1_osm) * (y2_osm - y1_osm) > 50 or forceTar):
+    if not skipTar and ((x2_osm - x1_osm) * (y2_osm - y1_osm) > 50 and accessLevel > 100 or forceTar):
         tarZoom = next(item for item in timestamps if item["id"] == timestampId)['tarZoom']
             
         if type(tarZoom) != type(None):

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/path/root.py

@@ -155,24 +155,12 @@ def recover(pathId, token):
     }, token)
 
 
-def delete(pathId, token, recursive = False):
+def delete(pathId, token):
     pathId = sanitize.validUuid('pathId', pathId, True)
     token = sanitize.validString('token', token, False)
-    recursive = sanitize.validBool('recursive', recursive, True)
     
-    if recursive:
-        info = get(pathId, token)
-        if info['type'] == 'folder':
-            folders = listFolder(pathId = pathId, includeTrashed=True, pathTypes=['folder'], token=token)['result']
-            for f in folders:
-                delete(f['id'], token, True)
-            maps = listFolder(pathId=pathId, pathTypes=['raster','vector','file', 'pointCloud'], includeTrashed=True, token=token)['result']
-            for m in maps:
-                delete(m['id'], token, True)
-        apiManager.delete(f'/path/{pathId}', None, token)            
-    
-    else:
-        return apiManager.delete(f'/path/{pathId}', None, token)
+
+    return apiManager.delete(f'/path/{pathId}', None, token)
 
 def editPublicAccess(pathId, token, access = None, hidden=None, recursive = False):
     pathId = sanitize.validUuid('pathId', pathId, True)

ellipsis-3.1.48/ellipsis/path/setUpTask/__init__.py

@@ -0,0 +1,2 @@
+from ellipsis.path.setUpTask.root import get, copernicusImport, fileImport
+

ellipsis-3.1.48/ellipsis/path/setUpTask/root.py

@@ -0,0 +1,50 @@
+from ellipsis import apiManager
+from ellipsis import sanitize
+import os
+
+def get(token):
+    token = sanitize.validString('token', token, False)
+
+    r = apiManager.get('/path/setUpTask', {}, token)
+        
+    return r
+
+
+def copernicusImport( parameters, token):
+    token = sanitize.validString('token', token, True)
+    parameters = sanitize.validObject('parameters', parameters, True)
+    r = apiManager.post('/path/setUpTask', {'type':'copernicusImport', 'parameters':parameters}, token)
+        
+    return r
+
+
+def fileImport(  token, memFile=None, parentId = None, filePath=None, fileFormat = 'geopackage', name = None):
+    token = sanitize.validString('token', token, True)
+    parentId = sanitize.validUuid(('parentId', parentId, False))
+    filePath = sanitize.validString('filePath', filePath, False)
+    name = sanitize.validString('name', name, False)
+    fileFormat = sanitize.validString('fileFormat', fileFormat, True)
+
+
+    if type(memFile) == type(None) and type(filePath) == type(None):
+        raise ValueError('You need to specify either a filePath or a memFile')
+    if type(memFile) != type(None) and type(name) == type(None):
+        raise ValueError('Parameter name is required when using a memory file')
+
+    if type(name) != type(None):
+        nameToUse = name
+    else:
+        seperator = os.path.sep
+        nameToUse = filePath.split(seperator)[len(filePath.split(seperator)) - 1]
+
+    parameters = {'name': nameToUse, 'parentId': parentId}
+    body = {'type': fileFormat + 'Import', 'parameters': parameters}
+    if type(memFile) == type(None):
+        r = apiManager.post('/path/setUpTask', body, token)
+    else:
+        r = apiManager.upload('/path/setUpTask' , filePath , name, body, token, memfile = memFile)
+    return r
+
+
+
+

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis/path/vector/timestamp/feature/series/root.py

@@ -82,17 +82,17 @@ def add(pathId, timestampId, seriesData, token, featureId=None, showProgress = T
             df_sub['value'] = seriesData[c].astype(float)
             dfs_long = dfs_long + [df_sub]
     seriesData_long = pd.concat(dfs_long)
-
     if uploadAsFile:
 
         memfile = BytesIO()
-        seriesData_long.to_csv(memfile)
+        seriesData_long.to_csv(memfile, na_rep='null')
 
         res = apiManager.upload(url = '/path/' + pathId + '/vector/timestamp/' + timestampId + '/feature/series', filePath =  'upload', body= {'name':'upload'}, token = token, key = 'data', memfile= memfile)
         return res
     else:
-        values = seriesData_long.to_dict('records')
+        seriesData_long = seriesData_long.replace({float('nan'): None})
 
+        values = seriesData_long.to_dict('records')
 
         chunks_values = chunks(values)
         N = 0

{ellipsis-3.1.46 → ellipsis-3.1.48}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.46
+Version: 3.1.48
 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.46 → ellipsis-3.1.48}/ellipsis.egg-info/SOURCES.txt

@@ -47,6 +47,8 @@ ellipsis/path/raster/timestamp/file/__init__.py
 ellipsis/path/raster/timestamp/file/root.py
 ellipsis/path/raster/timestamp/order/__init__.py
 ellipsis/path/raster/timestamp/order/root.py
+ellipsis/path/setUpTask/__init__.py
+ellipsis/path/setUpTask/root.py
 ellipsis/path/usage/__init__.py
 ellipsis/path/usage/root.py
 ellipsis/path/vector/__init__.py

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

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

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

@@ -9,8 +9,11 @@ import pandas as pd
 
 import os
 
-token = el.account.logIn('admin', '')
-
+file = '/home/daniel/Ellipsis/keys/admin'
+with open(file,'r') as c:
+    password = c.read()
+password = password[0:-1]
+token = el.account.logIn('admin', password)
 
 
 ####################################
@@ -18,9 +21,7 @@ token = el.account.logIn('admin', '')
 #python3 setup.py sdist bdist_wheel
 #twine upload --repository pypi dist/*
 
-token = el.account.logIn(username = 'admin', password='')
 
-el.apiManager.baseUrl = 'https://acc.api.ellipsis-drive.com/v3'
 ##access token
 el.account.accessToken.create(description = 'hoi', accessList = [{'pathId': '46e1e919-8b73-42a3-a575-25c6d45fd93b' , 'access':{'accessTier':'view'}}], token = token)
 tokenId = el.account.accessToken.get(token, listAll = True)['result'][0]['id']
@@ -555,3 +556,25 @@ out = el.util.saveVector(features = sh, targetFile = b)
 
 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')
 
+
+
+###add series
+import geopandas as gpd
+import numpy as np
+import pandas as pd
+import datetime
+layerId = el.path.vector.add(name = 'series test', token = token)['id']
+timestampId = el.path.vector.timestamp.add(pathId = layerId, token = token)['id']
+
+features = gpd.read_file('/home/daniel/Ellipsis/db/testset/buildings_mini')
+
+featureIds = el.path.vector.timestamp.feature.add(pathId = layerId, timestampId=timestampId, features=features, token = token)
+N = 1000
+x = [float(x) for x in np.arange(N)]
+featureId = np.repeat(featureIds[0], N)
+date = np.repeat( datetime.datetime.now(),N)
+seriesData = pd.DataFrame({'date':date, 'featureId': featureId, 'x':x })
+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')