ellipsis 3.1.47__tar.gz → 3.1.49__tar.gz

{ellipsis-3.1.47 → ellipsis-3.1.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.47
+Version: 3.1.49
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -11,23 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-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: pygltflib
-Requires-Dist: tifffile
 
 # Ellipsis Drive Python Package
 

{ellipsis-3.1.47 → ellipsis-3.1.49}/ellipsis/__init__.py

@@ -6,7 +6,7 @@ from ellipsis import user
 from ellipsis import path
 from ellipsis import util
 
-__version__ = '3.1.47'
+__version__ = '3.1.49'
 
 
 

{ellipsis-3.1.47 → ellipsis-3.1.49}/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:
@@ -114,6 +116,7 @@ def actualCall(method, url, body, token):
     return r
 
 def upload(url, filePath, body, token, key = 'data', memfile= None):
+    body['debug'] = True
     body = filterNone(body, toString=True)
 
     seperator = os.path.sep
@@ -125,7 +128,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.47 → ellipsis-3.1.49}/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.47 → ellipsis-3.1.49}/ellipsis/path/vector/timestamp/root.py

@@ -13,6 +13,9 @@ from ellipsis.path import get as getInfo
 
 import datetime
 
+
+
+
 def add(pathId,  token, properties = None, description = None, date ={'from': datetime.datetime.now(), 'to': datetime.datetime.now()}):
 
     pathId = sanitize.validUuid('pathId', pathId, True) 
@@ -150,7 +153,8 @@ def getFeaturesByIds(pathId, timestampId, featureIds, token = None, showProgress
     sh = sh.to_crs('EPSG:' + str(epsg))
     r['result'] = sh
     return r
-    
+
+
 
 def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, token = None, listAll = True, pageStart = None, epsg = 4326, coordinateBuffer = None, onlyIfCenterPointInExtent = False):
     pathId = sanitize.validUuid('pathId', pathId, True) 

{ellipsis-3.1.47 → ellipsis-3.1.49}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.47
+Version: 3.1.49
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -11,23 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-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: pygltflib
-Requires-Dist: tifffile
 
 # Ellipsis Drive Python Package
 

{ellipsis-3.1.47 → ellipsis-3.1.49}/setup.py

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

{ellipsis-3.1.47 → ellipsis-3.1.49}/test/test.py

@@ -5,10 +5,28 @@ import time
 import numpy as np
 import pandas as pd
 
+from test.pointCloud import timestampId
+
+el.path.folder.listFolder()
+
+import dill
+with open('/home/daniel/Downloads/nonTrivial.dill', "rb") as dill_file:
+ f = dill.load(dill_file)
+f(r , None, None)
 
 
 import os
 
+token = 'epat_S8uBdcJ8GqjUeh5ycJqXurMKHYnrs5BZT002G4nWWQu6Enl6TrDvtAzK1I9RPQmk'
+file = '/home/daniel/Ellipsis/db/zone0.tif'
+
+
+pathId = 'cc889803-e643-4384-9b73-a89c8f09dd65'
+timestampId = 'cc889803-e643-4384-9b73-a89c8f09dd65'
+el.path.raster.timestamp.file.add(pathId=pathId, timestampId=timestampId, fileFormat='tif', filePath = file, token = token)
+
+
+
 file = '/home/daniel/Ellipsis/keys/admin'
 with open(file,'r') as c:
     password = c.read()
@@ -577,3 +595,4 @@ 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')

{ellipsis-3.1.47 → ellipsis-3.1.49}/ellipsis.egg-info/requires.txt

@@ -1,17 +1,17 @@
-pandas
+Fiona
 Pillow
-matplotlib
+Shapely
 geopandas
-pyproj
+geopy
+imagecodecs
 imageio
+matplotlib
 numpy
-imagecodecs
+pandas
+pygltflib
+pyproj
+rasterio
 requests
 requests-toolbelt
-rasterio
-Shapely
-geopy
 scikit-image
-Fiona
-pygltflib
 tifffile