ellipsis 3.2.7__py3-none-any.whl → 3.2.9__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of ellipsis might be problematic. Click here for more details.

Files changed (7) hide show
  1. ellipsis/__init__.py +1 -1
  2. ellipsis/compute/root.py +10 -4
  3. {ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/METADATA +1 -1
  4. {ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/RECORD +7 -7
  5. {ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/LICENSE +0 -0
  6. {ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/WHEEL +0 -0
  7. {ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/top_level.txt +0 -0
ellipsis/__init__.py CHANGED
@@ -6,7 +6,7 @@ from ellipsis import user
6
6
  from ellipsis import path
7
7
  from ellipsis import util
8
8
  from ellipsis import compute
9
- __version__ = '3.2.7'
9
+ __version__ = '3.2.9'
10
10
 
11
11
 
12
12
 
ellipsis/compute/root.py CHANGED
@@ -44,18 +44,22 @@ def createCompute(layers, token, files = None, nodes=None, interpreter='python3.
44
44
  return {'id':computeId}
45
45
 
46
46
 
47
- def execute(computeId, f, token, awaitTillCompleted=True):
47
+ def execute(computeId, f, token, awaitTillCompleted=True, writeToLayer = None):
48
48
  computeId = sanitize.validUuid('computeId', computeId, True)
49
49
  token = sanitize.validString('token', token, True)
50
+ writeToLayer = sanitize.validObject('writeToLayer', writeToLayer, False)
51
+ awaitTillCompleted = sanitize.validBool('awaitTillCompleted', awaitTillCompleted, False)
50
52
 
51
53
  if str(type(f)) != "<class 'function'>":
52
54
  raise ValueError('parameter f must be a function')
53
-
55
+ if type(writeToLayer) != type(None):
56
+ if not 'file' in writeToLayer:
57
+ writeToLayer['file'] = {'format':'tif'}
54
58
  f_bytes = dill.dumps(f)
55
59
  f_string = base64.b64encode( f_bytes )
56
60
  f_string = str(f_string)[2: -1]
57
- body = { 'file':f_string}
58
-
61
+ body = { 'file':f_string, 'writeToLayer':writeToLayer}
62
+ print('body', body)
59
63
  apiManager.post('/compute/' + computeId + '/execute', body, token)
60
64
 
61
65
  while awaitTillCompleted:
@@ -64,6 +68,8 @@ def execute(computeId, f, token, awaitTillCompleted=True):
64
68
  print('waiting')
65
69
  if r['status'] == 'completed':
66
70
  break
71
+ if r['status'] == 'errored':
72
+ raise ValueError(str(r['message']))
67
73
  time.sleep(1)
68
74
 
69
75
  for x in r['result']:
{ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ellipsis
3
- Version: 3.2.7
3
+ Version: 3.2.9
4
4
  Summary: Package to interact with the Ellipsis API
5
5
  Home-page: https://github.com/ellipsis-drive-internal/python-package
6
6
  Author: Daniel van der Maas
{ellipsis-3.2.7.dist-info → ellipsis-3.2.9.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- ellipsis/__init__.py,sha256=Fp0S3vEy7OglOryHyopp12uwMBVOqMoSG9nVhQeX69s,237
1
+ ellipsis/__init__.py,sha256=YAoi8suMcB3gdFKnRIlasSY-kS0mksSvxZuJ0pkhZPw,237
2
2
  ellipsis/apiManager.py,sha256=iX6XFwilMfuCQYioAmgRgReL8W63FUBr3UC506ucIF4,5603
3
3
  ellipsis/sanitize.py,sha256=VuTPjHAUNCGUaOzKU2ojloiEN8kPhm53fIjbk6E9IEg,10597
4
4
  ellipsis/account/__init__.py,sha256=jTmwL9HVS27vAHPC_2a98RQJWbpSKBN4ptiXpY0qJgk,101
@@ -6,7 +6,7 @@ ellipsis/account/root.py,sha256=p8AehZQizaPlpGdFB5RsMduyUF4ynN0cGDz41nIxjYM,1942
6
6
  ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
7
7
  ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
8
8
  ellipsis/compute/__init__.py,sha256=zcjm8GX1kSi5PEK5CXsR3wc2wxBdy3EIMo_y1sFEguQ,115
9
- ellipsis/compute/root.py,sha256=cmf3ZReM4m9XS37v0qMkqXEF0ScaFM_flPx3V1ryl_o,6182
9
+ ellipsis/compute/root.py,sha256=_p2oFkw_FgZVoZ8_Qj0Vn7xNZ-_Na3csLRdRbrwtVPo,6641
10
10
  ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
11
11
  ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
12
12
  ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -67,8 +67,8 @@ ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
67
67
  ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
68
68
  ellipsis/util/__init__.py,sha256=_sNBUXDKJVGffRyt93xdUrJ4gON651Sp-unr7LKVCEc,756
69
69
  ellipsis/util/root.py,sha256=3pw-tXGTQC5PMUtpReJEA9rgyJZNlTM3uUISPz2Sq6Q,23976
70
- ellipsis-3.2.7.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
71
- ellipsis-3.2.7.dist-info/METADATA,sha256=Ywc7n-Ncs2GI9AUfCzyUXGwWkAxMcT6DcWSzYlcO1ZQ,1842
72
- ellipsis-3.2.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
73
- ellipsis-3.2.7.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
74
- ellipsis-3.2.7.dist-info/RECORD,,
70
+ ellipsis-3.2.9.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
71
+ ellipsis-3.2.9.dist-info/METADATA,sha256=yaacVlEkrIt6SroHddyyNY-P3O0Xl7-vvxQApB6YCS8,1842
72
+ ellipsis-3.2.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
73
+ ellipsis-3.2.9.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
74
+ ellipsis-3.2.9.dist-info/RECORD,,