ellipsis 3.1.6__py3-none-any.whl → 3.1.8__py3-none-any.whl

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/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/path/file/__init__.py

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

ellipsis/path/file/root.py

@@ -2,6 +2,26 @@ 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):
@@ -14,12 +34,113 @@ def download(pathId, filePath, token=None):
     
 
 
-def add( filePath, token, parentId = None, publicAccess =None, metadata=None):
+def addCsv(df, name, 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
+    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/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.dist-info → ellipsis-3.1.8.dist-info}/METADATA

@@ -1,31 +1,29 @@
 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
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Fiona
+Requires-Dist: pandas
 Requires-Dist: Pillow
-Requires-Dist: Shapely
-Requires-Dist: geopandas (==0.9.0)
-Requires-Dist: geopy
-Requires-Dist: imagecodecs
+Requires-Dist: geopandas
+Requires-Dist: pyproj
 Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: pyproj (==3.0.1)
-Requires-Dist: rasterio
+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: tifffile
 
 # Ellipsis Drive Python Package
@@ -64,5 +62,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.dist-info → ellipsis-3.1.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
-ellipsis/__init__.py,sha256=93GninuGlrB3AOG4w3NKKwibcLa_Tbx-8psQkH0QGGY,232
-ellipsis/apiManager.py,sha256=QU0LzYMivctlzUN9yLOTIF1ypAwvI9xsD9Nw_kJT1Yk,3302
-ellipsis/sanitize.py,sha256=YCxtl9DFA7oipf_oiAkGUrbvB3J3ZWUFNuk06s8Byq4,9745
+ellipsis/__init__.py,sha256=H82wS2677cybsKg_xJMS528vNSog3hTt_KQnsCbfXdk,232
+ellipsis/apiManager.py,sha256=aT-fRTngM_dV2KS7xEnR_E6OlFDGA1KPUFCHV_jeO7w,3819
+ellipsis/sanitize.py,sha256=jltJfCkgyNYxsAmYCAFFIEMKnGK4edcMpnZqjbSxtp0,9982
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=29IGUJavfXC9wLC_Fxzy1cdCbnP4QPmbYlE-H6VP088,1285
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
 ellipsis/path/__init__.py,sha256=2AL0qA5fzPYtizw-baHA8l5J4MTG55giSdxJ3HrHzl8,398
 ellipsis/path/root.py,sha256=vw8p36-_rLAHuy7WUv793HRftxa3VIPmpmWtSdJiXOE,7609
-ellipsis/path/file/__init__.py,sha256=jpXoU1agFnEH1XzLSigJ8uNRC-5534I4kskuNpt-6us,85
-ellipsis/path/file/root.py,sha256=kXUfHXd_OmhjuCdDPS5vpCBoqlFPSfkAOAKex_1e6M8,829
+ellipsis/path/file/__init__.py,sha256=i_KB1S1J9pZjcPTKdyGMnjJf2tCoHFzptLGaxmTi55A,107
+ellipsis/path/file/root.py,sha256=zP4DF2dXswKnqHM7wsCN25SvjMdFll2AjHILJ41ihfQ,4417
 ellipsis/path/folder/__init__.py,sha256=HCeAZAWZSqUnWiSQYJjsVFe6AI9uKSS8tb5uTkSeAtI,91
 ellipsis/path/folder/root.py,sha256=Afof2u8LAutFL4XeHVtYZDJMCpRWfLuXEOXnBL4ETi4,1481
 ellipsis/path/hashtag/__init__.py,sha256=4u8VC7xOFJjuZ9K08yh6GsPn8YkYZ_24o_7viScUQlg,59
@@ -53,8 +53,8 @@ ellipsis/util/__init__.py,sha256=A3BEF6O5qTRU90yoaZDI-xF8R1WAFuh1fdxwWKd1Uvw,628
 ellipsis/util/root.py,sha256=d7CYEhiGb6RY5Ep7lDmIderiRfXnnPtW8f9ZJu0VTgg,19434
 ellipsis/view/__init__.py,sha256=91KyJzbSvwSP9hvJQyo1LLM48b5NixLz6G40I9h6sdY,67
 ellipsis/view/root.py,sha256=6actiBwIsM0f7sJhQl_U4j-C6Dhe0z5XGGtxIOIKdY8,1726
-ellipsis-3.1.6.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.6.dist-info/METADATA,sha256=P5wVbXyxs2EB-Zu38neKQcTtkJGuko0-e6Et4oc4wDY,1805
-ellipsis-3.1.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.6.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.6.dist-info/RECORD,,
+ellipsis-3.1.8.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.8.dist-info/METADATA,sha256=0K6dLQuzzbYmcVfZ98TViYUBSaExqVc3Vhh__q7dUVY,1748
+ellipsis-3.1.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ellipsis-3.1.8.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.8.dist-info/RECORD,,