|
@@ -215,11 +215,11 @@ class HS2Api():
|
|
|
return {'status': 'canceled'}
|
|
return {'status': 'canceled'}
|
|
|
|
|
|
|
|
@query_error_handler
|
|
@query_error_handler
|
|
|
- def get_log(self, snippet):
|
|
|
|
|
|
|
+ def get_log(self, snippet, startFrom=None, size=None):
|
|
|
db = self._get_db(snippet)
|
|
db = self._get_db(snippet)
|
|
|
|
|
|
|
|
handle = self._get_handle(snippet)
|
|
handle = self._get_handle(snippet)
|
|
|
- return db.get_log(handle)
|
|
|
|
|
|
|
+ return db.get_log(handle, start_over=startFrom == 0)
|
|
|
|
|
|
|
|
def download(self, notebook, snippet, format):
|
|
def download(self, notebook, snippet, format):
|
|
|
try:
|
|
try:
|
|
@@ -398,7 +398,7 @@ class SparkApi():
|
|
|
|
|
|
|
|
return {'status': 'canceled'}
|
|
return {'status': 'canceled'}
|
|
|
|
|
|
|
|
- def get_log(self, snippet):
|
|
|
|
|
|
|
+ def get_log(self, snippet, startFrom=0, size=None):
|
|
|
return 'Not available'
|
|
return 'Not available'
|
|
|
|
|
|
|
|
def _progress(self, snippet, logs):
|
|
def _progress(self, snippet, logs):
|
|
@@ -452,11 +452,10 @@ class SparkBatchApi():
|
|
|
'status': state,
|
|
'status': state,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- def get_log(self, snippet):
|
|
|
|
|
|
|
+ def get_log(self, snippet, startFrom=0, size=None):
|
|
|
api = get_spark_api(self.user)
|
|
api = get_spark_api(self.user)
|
|
|
|
|
|
|
|
- log = api.get_batch_log(snippet['result']['handle']['id'])
|
|
|
|
|
- return '\n'.join(log)
|
|
|
|
|
|
|
+ return api.get_batch_log(snippet['result']['handle']['id'], startFrom=startFrom, size=size)
|
|
|
|
|
|
|
|
def _progress(self, snippet, logs):
|
|
def _progress(self, snippet, logs):
|
|
|
return 50
|
|
return 50
|