|
@@ -238,20 +238,28 @@ def check_status(request):
|
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
notebook = json.loads(request.POST.get('notebook', '{}'))
|
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
snippet = json.loads(request.POST.get('snippet', '{}'))
|
|
|
|
|
|
|
|
- if operation_id or not snippet: # To unify with _get_snippet
|
|
|
|
|
|
|
+ with opentracing.tracer.start_span('notebook-check_status') as span:
|
|
|
|
|
+ span.set_tag('user-id', request.user.username)
|
|
|
|
|
+ span.set_tag(
|
|
|
|
|
+ 'query-id',
|
|
|
|
|
+ snippet['result']['handle']['guid'] if snippet['result'].get('handle') and snippet['result']['handle'].get('guid') else None
|
|
|
|
|
+ )
|
|
|
|
|
+
|
|
|
|
|
+ response = _check_status(request, notebook=notebook, snippet=snippet, operation_id=operation_id)
|
|
|
|
|
+
|
|
|
|
|
+ return JsonResponse(response)
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+def _check_status(request, notebook=None, snippet=None, operation_id=None):
|
|
|
|
|
+ response = {'status': -1}
|
|
|
|
|
+
|
|
|
|
|
+ if operation_id or not snippet: # To unify with _get_snippet
|
|
|
nb_doc = Document2.objects.get_by_uuid(user=request.user, uuid=operation_id or notebook['uuid'])
|
|
nb_doc = Document2.objects.get_by_uuid(user=request.user, uuid=operation_id or notebook['uuid'])
|
|
|
- notebook = Notebook(document=nb_doc).get_data() # Used below
|
|
|
|
|
|
|
+ notebook = Notebook(document=nb_doc).get_data() # Used below
|
|
|
snippet = notebook['snippets'][0]
|
|
snippet = notebook['snippets'][0]
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
- with opentracing.tracer.start_span('notebook-check_status') as span:
|
|
|
|
|
- span.set_tag('user-id', request.user.username)
|
|
|
|
|
- span.set_tag(
|
|
|
|
|
- 'query-id',
|
|
|
|
|
- snippet['result']['handle']['guid'] if snippet['result'].get('handle') and snippet['result']['handle'].get('guid') else None
|
|
|
|
|
- )
|
|
|
|
|
- response['query_status'] = get_api(request, snippet).check_status(notebook, snippet)
|
|
|
|
|
-
|
|
|
|
|
|
|
+ response['query_status'] = get_api(request, snippet).check_status(notebook, snippet)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
except SessionExpired:
|
|
except SessionExpired:
|
|
|
response['status'] = 'expired'
|
|
response['status'] = 'expired'
|
|
@@ -282,7 +290,7 @@ def check_status(request):
|
|
|
nb_doc.update_data(nb)
|
|
nb_doc.update_data(nb)
|
|
|
nb_doc.save()
|
|
nb_doc.save()
|
|
|
|
|
|
|
|
- return JsonResponse(response)
|
|
|
|
|
|
|
+ return response
|
|
|
|
|
|
|
|
|
|
|
|
|
@require_POST
|
|
@require_POST
|