|
@@ -45,12 +45,6 @@ def notebook(request):
|
|
|
else:
|
|
else:
|
|
|
notebook = Notebook()
|
|
notebook = Notebook()
|
|
|
|
|
|
|
|
- autocomplete_base_url = ''
|
|
|
|
|
- try:
|
|
|
|
|
- autocomplete_base_url = reverse('beeswax:api_autocomplete_databases', kwargs={})
|
|
|
|
|
- except:
|
|
|
|
|
- LOG.exception('failed to get autocomplete base url')
|
|
|
|
|
-
|
|
|
|
|
is_yarn_mode = False
|
|
is_yarn_mode = False
|
|
|
try:
|
|
try:
|
|
|
from spark.conf import LIVY_SERVER_SESSION_KIND
|
|
from spark.conf import LIVY_SERVER_SESSION_KIND
|
|
@@ -64,7 +58,6 @@ def notebook(request):
|
|
|
'languages': get_interpreters(request.user),
|
|
'languages': get_interpreters(request.user),
|
|
|
'session_properties': SparkApi.PROPERTIES,
|
|
'session_properties': SparkApi.PROPERTIES,
|
|
|
}),
|
|
}),
|
|
|
- 'autocomplete_base_url': autocomplete_base_url,
|
|
|
|
|
'is_yarn_mode': is_yarn_mode
|
|
'is_yarn_mode': is_yarn_mode
|
|
|
})
|
|
})
|
|
|
|
|
|
|
@@ -83,12 +76,6 @@ def editor(request):
|
|
|
data['type'] = 'query-%s' % editor_type
|
|
data['type'] = 'query-%s' % editor_type
|
|
|
editor.data = json.dumps(data)
|
|
editor.data = json.dumps(data)
|
|
|
|
|
|
|
|
- autocomplete_base_url = ''
|
|
|
|
|
- try:
|
|
|
|
|
- autocomplete_base_url = reverse('beeswax:api_autocomplete_databases', kwargs={})
|
|
|
|
|
- except:
|
|
|
|
|
- LOG.exception('failed to get autocomplete base url')
|
|
|
|
|
-
|
|
|
|
|
return render('editor.mako', request, {
|
|
return render('editor.mako', request, {
|
|
|
'notebooks_json': json.dumps([editor.get_data()]),
|
|
'notebooks_json': json.dumps([editor.get_data()]),
|
|
|
'options_json': json.dumps({
|
|
'options_json': json.dumps({
|
|
@@ -96,7 +83,6 @@ def editor(request):
|
|
|
'mode': 'editor',
|
|
'mode': 'editor',
|
|
|
}),
|
|
}),
|
|
|
'editor_type': editor_type,
|
|
'editor_type': editor_type,
|
|
|
- 'autocomplete_base_url': autocomplete_base_url,
|
|
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
@@ -104,6 +90,57 @@ def new(request):
|
|
|
return notebook(request)
|
|
return notebook(request)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+def browse(request):
|
|
|
|
|
+ database = request.GET.get('database', 'default')
|
|
|
|
|
+ table = request.GET.get('table')
|
|
|
|
|
+ editor_type = request.GET.get('type', 'hive')
|
|
|
|
|
+
|
|
|
|
|
+ editor = Notebook()
|
|
|
|
|
+ editor.data = json.dumps({
|
|
|
|
|
+ 'description':'',
|
|
|
|
|
+ 'sessions':[
|
|
|
|
|
+ {
|
|
|
|
|
+ 'type':'hive',
|
|
|
|
|
+ 'properties':[
|
|
|
|
|
+
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'id':None
|
|
|
|
|
+ }
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'selectedSnippet':'hive',
|
|
|
|
|
+ 'type': 'query-%s' % editor_type,
|
|
|
|
|
+
|
|
|
|
|
+ 'snippets':[
|
|
|
|
|
+ {
|
|
|
|
|
+ 'status':'ready-execute',
|
|
|
|
|
+ 'id':'e8b323b3-88ef-3a84-6264-af11fa5fbefb',
|
|
|
|
|
+ 'statement_raw':'select * from %(database)s',
|
|
|
|
|
+ 'statement':'select * from sample_07',
|
|
|
|
|
+ 'type':'hive',
|
|
|
|
|
+ 'properties':{
|
|
|
|
|
+ 'files':[
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'settings':[
|
|
|
|
|
+ ]
|
|
|
|
|
+ },
|
|
|
|
|
+ 'name': 'Browse',
|
|
|
|
|
+ 'database':'default',
|
|
|
|
|
+ 'result':{ }
|
|
|
|
|
+ }
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'name':'Browse'
|
|
|
|
|
+ })
|
|
|
|
|
+
|
|
|
|
|
+ return render('editor.mako', request, {
|
|
|
|
|
+ 'notebooks_json': json.dumps([editor.get_data()]),
|
|
|
|
|
+ 'options_json': json.dumps({
|
|
|
|
|
+ 'languages': [{"name": "%s SQL" % editor_type.title(), "type": editor_type}],
|
|
|
|
|
+ 'mode': 'editor',
|
|
|
|
|
+ }),
|
|
|
|
|
+ 'editor_type': editor_type,
|
|
|
|
|
+ })
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
def notebooks(request):
|
|
def notebooks(request):
|
|
|
notebooks = [d.content_object.to_dict() for d in Document.objects.get_docs(request.user, Document2, qfilter=Q(extra='notebook') | Q(extra__startswith='query')) if not d.content_object.is_history]
|
|
notebooks = [d.content_object.to_dict() for d in Document.objects.get_docs(request.user, Document2, qfilter=Q(extra='notebook') | Q(extra__startswith='query')) if not d.content_object.is_history]
|
|
|
|
|
|