jenkins-bot has submitted this change and it was merged.
Change subject: Add metadata to json output
......................................................................
Add metadata to json output
Change-Id: I7631a3fa78c3f8a219a0ce5c6f3da866fcbe0001
---
M quarry/web/app.py
M quarry/web/output.py
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 4152b49..593ee57 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -351,7 +351,7 @@
def output_result(qrun_id, resultset_id=0, format='json'):
qrun = g.conn.session.query(QueryRun).get(qrun_id)
reader = SQLiteResultReader(qrun, app.config['OUTPUT_PATH_TEMPLATE'])
- response = output.get_formatted_response(format, reader, resultset_id)
+ response = output.get_formatted_response(format, qrun, reader,
resultset_id)
if request.args.get('download', 'false') == 'true':
# Download this!
if qrun.rev.query.title:
diff --git a/quarry/web/output.py b/quarry/web/output.py
index 5ba11b5..44812e2 100644
--- a/quarry/web/output.py
+++ b/quarry/web/output.py
@@ -3,9 +3,9 @@
import unicodecsv
-def get_formatted_response(format, reader, resultset_id):
+def get_formatted_response(format, queryrun, reader, resultset_id):
if format == 'json':
- return json_formatter(reader, resultset_id)
+ return json_formatter(queryrun, reader, resultset_id)
elif format == 'csv':
return separated_formatter(reader, resultset_id, ',')
elif format == 'tsv':
@@ -33,12 +33,18 @@
return Response(respond(), content_type='text/csv')
-def json_formatter(reader, resultset_id):
+def json_formatter(qrun, reader, resultset_id):
rows = list(reader.get_rows(resultset_id))
header = rows[0]
del rows[0]
data = {
+ 'meta': {
+ 'run_id': qrun.id,
+ 'rev_id': qrun.rev.id,
+ 'query_id': qrun.rev.query.id,
+ },
'headers': header,
'rows': rows
}
- return Response(json.dumps(data), mimetype='application/json')
+ return Response(json.dumps(data),
+ mimetype='application/json')
--
To view, visit https://gerrit.wikimedia.org/r/178129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7631a3fa78c3f8a219a0ce5c6f3da866fcbe0001
Gerrit-PatchSet: 4
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
