ellipsis 3.1.6__tar.gz → 3.1.8__tar.gz

{ellipsis-3.1.6 → ellipsis-3.1.8}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.6
+Version: 3.1.8
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
 Author-email: daniel@ellipsis-drive.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -50,5 +48,3 @@ Another example
     info = el.path.get(folderId, token)
     layers = el.path.listPath(folderId, pathType='layer', token = token, listAll = True)
     folders = el.path.listPath(folderId, pathType='folder', token = token, listAll = True)
-
-

{ellipsis-3.1.6 → ellipsis-3.1.8}/ellipsis/__init__.py

@@ -7,4 +7,4 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.6'
+__version__ = '3.1.8'

{ellipsis-3.1.6 → ellipsis-3.1.8}/ellipsis/apiManager.py

@@ -89,39 +89,52 @@ def call(method, url, body = None, token = None, crash = True):
         return r
 
 
-def upload(url, filePath, body, token, key = 'data'):
+def upload(url, filePath, body, token, key = 'data', memfile= None):
     body = filterNone(body)
-
     seperator = os.path.sep    
     fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
+
+    if str(type(memfile)) == str(type(None)):
+        conn_file = open(filePath, 'rb')
+    else:
+        conn_file = memfile
+    
+    payload = MultipartEncoder(fields = {**body, key: (fileName, conn_file, 'application/octet-stream')})
+    
     
     for k in body.keys():
         body[k] = str(body[k])
 
-    conn_file = open(filePath, 'rb')
-
-    payload = MultipartEncoder(fields = {**body, key: (fileName, conn_file, 'application/octet-stream')})
 
     token = 'Bearer ' + token
         
     r = requests.post(baseUrl + url, headers = {"Authorization":token, "Content-Type": payload.content_type}, data=payload)
-    conn_file.close()
+    
+    if str(type(memfile)) == str(type(None)):
+        conn_file.close()
     
     if r.status_code != 200:
         raise ValueError(r.text)
     return r.json()
 
-def download(url, filePath, token):
+def download(url, filePath, token, memfile = None):
 
     token = 'Bearer ' + token
     with requests.get(baseUrl + url, stream=True, headers={"Authorization": token}) as r:
         r.raise_for_status()
-        with open(filePath, 'wb') as f:
+        if str(type(memfile)) == str(type(None)):
+            with open(filePath, 'wb') as f:
+                for chunk in r.iter_content(chunk_size=8192): 
+                    # If you have chunk encoded response uncomment if
+                    # and set chunk_size parameter to None.
+                    #if chunk: 
+                    f.write(chunk)
+        else:
             for chunk in r.iter_content(chunk_size=8192): 
                 # If you have chunk encoded response uncomment if
                 # and set chunk_size parameter to None.
                 #if chunk: 
-                f.write(chunk)
+                memfile.write(chunk)
 
 
     

ellipsis-3.1.8/ellipsis/path/file/__init__.py

@@ -0,0 +1,2 @@
+from ellipsis.path.file.root import download, add, addPickle, getPickle, addCsv, getCsv, addJson, getJson
+

ellipsis-3.1.8/ellipsis/path/file/root.py

@@ -0,0 +1,146 @@
+from ellipsis import apiManager
+from ellipsis import sanitize
+
+import os
+import pickle
+from io import BytesIO
+import json
+import pandas as pd
+
+
+def add( filePath, token, parentId = None, publicAccess =None, metadata=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)
+
+
+        
+    seperator = os.path.sep    
+    fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
+        
+    body = {'name':fileName, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
+    return r
+
+
+def download(pathId, filePath, token=None):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    token = sanitize.validString('token', token, False)
+    filePath = sanitize.validString('filePath', filePath, True)
+
+
+    apiManager.download('/path/' + pathId + '/file/data', filePath, token)
+    
+
+
+def addCsv(df, name, token, parentId = None, publicAccess =None, metadata=None):
+    token = sanitize.validString('token', token, True)
+    name = sanitize.validString('name', name, True)
+    df = sanitize.validPandas('df', df, True)
+
+    parentId = sanitize.validUuid('parentId', parentId, False)
+    publicAccess = sanitize.validObject('publicAccess', publicAccess, False)
+    metadata = sanitize.validObject('metadata', metadata, False)
+    
+    memfile = BytesIO()
+    df.to_csv(memfile)
+    
+
+    body = {'name':name, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    r = apiManager.upload('/path/file' , name,  body, token, key='data', memfile = memfile)
+
+    
+    return r
+
+def getCsv(pathId, token=None):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    token = sanitize.validString('token', token, False)
+
+
+    r = apiManager.get('/path/' + pathId + '/file/data', {}, token)
+
+
+    memfile = BytesIO(bytes(r, 'utf-8'))
+    try:
+        df =  pd.read_csv(memfile)
+    except:
+        raise ValueError('Read file is not a valid CSV')
+    return df
+
+
+
+def addJson(d, name, token, parentId = None, publicAccess =None, metadata=None):
+    token = sanitize.validString('token', token, True)
+    name = sanitize.validString('name', name, True)
+    d = sanitize.validObject('d', d, True)
+
+    parentId = sanitize.validUuid('parentId', parentId, False)
+    publicAccess = sanitize.validObject('publicAccess', publicAccess, False)
+    metadata = sanitize.validObject('metadata', metadata, False)
+    
+    memfile = BytesIO()
+    d = json.dumps(d)
+    memfile.write(bytes(d, 'utf-8'))
+    
+
+    body = {'name':name, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    r = apiManager.upload('/path/file' , name,  body, token, key='data', memfile = memfile)
+
+    
+    return r
+
+
+def getJson(pathId, token=None):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    token = sanitize.validString('token', token, False)
+
+    memfile = BytesIO()
+    apiManager.download('/path/' + pathId + '/file/data', '', token, memfile)    
+    memfile.seek(0)
+    try:
+        x = json.load(memfile)
+    except:
+        raise ValueError('Read file not a valid pickle file')
+
+
+    return x
+
+
+
+def addPickle(x, name, token, parentId = None, publicAccess =None, metadata=None):
+    token = sanitize.validString('token', token, True)
+    name = sanitize.validString('name', name, True)
+    parentId = sanitize.validUuid('parentId', parentId, False)
+    publicAccess = sanitize.validObject('publicAccess', publicAccess, False)
+    metadata = sanitize.validObject('metadata', metadata, False)
+    
+    memfile = BytesIO()
+    pickle.dump(x, memfile)
+
+    body = {'name':name, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
+    r = apiManager.upload('/path/file' , name,  body, token, key='data', memfile = memfile)
+
+    return r
+    
+
+def getPickle(pathId, token=None):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    token = sanitize.validString('token', token, False)
+
+    memfile = BytesIO()
+    apiManager.download('/path/' + pathId + '/file/data', '', token, memfile)    
+    memfile.seek(0)
+    try:
+        x = pickle.load(memfile)
+    except:
+        raise ValueError('Read file not a valid pickle file')
+
+
+    return x
+
+
+
+
+
+

{ellipsis-3.1.6 → ellipsis-3.1.8}/ellipsis/sanitize.py

@@ -68,7 +68,13 @@ def validUuidArray(name, value, required):
             raise ValueError(name + ' must be a list of uuids')    
     return(value)
 
+def validPandas(name, value, required):
+    if not required and type(value) == type(None):
+        return
 
+    if type(value) != type(pd.DataFrame()):
+        raise ValueError(name + 'must be of type pandas data frame')
+    return(value)
 
 def validString(name, value, required):
     if not required and type(value) == type(None):

{ellipsis-3.1.6 → ellipsis-3.1.8}/ellipsis.egg-info/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.6
+Version: 3.1.8
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
 Author-email: daniel@ellipsis-drive.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -50,5 +48,3 @@ Another example
     info = el.path.get(folderId, token)
     layers = el.path.listPath(folderId, pathType='layer', token = token, listAll = True)
     folders = el.path.listPath(folderId, pathType='folder', token = token, listAll = True)
-
-

{ellipsis-3.1.6 → ellipsis-3.1.8}/ellipsis.egg-info/requires.txt

@@ -1,14 +1,14 @@
-Fiona
+pandas
 Pillow
-Shapely
-geopandas==0.9.0
-geopy
-imagecodecs
+geopandas
+pyproj
 numpy
-pandas
-pyproj==3.0.1
-rasterio
+imagecodecs
 requests
 requests-toolbelt
+rasterio
+Shapely
+geopy
 scikit-image
+Fiona
 tifffile

{ellipsis-3.1.6 → ellipsis-3.1.8}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="ellipsis",
-    version="3.1.6",
+    version="3.1.8",
     author="Daniel van der Maas",
     author_email="daniel@ellipsis-drive.com",
     description="Package to interact with the Ellipsis API",
@@ -22,8 +22,8 @@ setuptools.setup(
     install_requires=[
     'pandas',
     'Pillow',
-    'geopandas==0.9.0',
-    'pyproj==3.0.1',
+    'geopandas',
+    'pyproj',
     'numpy',
     'imagecodecs',
     'requests',

{ellipsis-3.1.6 → ellipsis-3.1.8}/test/test.py

@@ -24,7 +24,7 @@ folderId = '46e1e919-8b73-42a3-a575-25c6d45fd93b'
 
 
 ##account
-demo_token = el.account.logIn("demo_user", "")
+demo_token = el.account.logIn("demo_user", "demo_user")
 admin_token = el.account.logIn(username = 'admin', password='')
 daan_token = el.account.logIn('daan', "")
 
@@ -45,6 +45,9 @@ r_file = el.path.searchFile(token=token);
 filePath = '/home/daniel/Ellipsis/db/testset/0.tif'
 pathId = el.path.file.add(filePath, token)['id']
 el.path.file.download(pathId = pathId, filePath =  '/home/daniel/Downloads/out.tif')
+el.path.trash(pathId, token)
+el.path.delete(pathId, token)
+
 
 ##user
 

ellipsis-3.1.6/ellipsis/path/file/__init__.py

@@ -1,2 +0,0 @@
-from ellipsis.path.file.root import download
-from ellipsis.path.file.root import add

ellipsis-3.1.6/ellipsis/path/file/root.py

@@ -1,25 +0,0 @@
-from ellipsis import apiManager
-from ellipsis import sanitize
-
-import os
-
-
-def download(pathId, filePath, token=None):
-    pathId = sanitize.validUuid('pathId', pathId, True)
-    token = sanitize.validString('token', token, False)
-    filePath = sanitize.validString('filePath', filePath, True)
-
-
-    apiManager.download('/path/' + pathId + '/file/data', filePath, token)
-    
-
-
-def add( filePath, token, parentId = None, publicAccess =None, metadata=None):
-    token = sanitize.validString('token', token, True)
-        
-    seperator = os.path.sep    
-    fileName = filePath.split(seperator)[len(filePath.split(seperator))-1 ]
-        
-    body = {'name':fileName, 'publicAccess':publicAccess, 'metadata':metadata, 'parentId':parentId}
-    r = apiManager.upload('/path/file' , filePath, body, token, key = 'data')
-    return r