Move load_data_for_chart to utils

2 files changed, 5 insertions, 12 deletions

diff --git a/app/main/datasets.py b/app/main/datasets.py
index c06b4bf..7245e51 100644
--- a/app/main/datasets.py
+++ b/app/main/datasets.py
@@ -2,18 +2,11 @@
 
 import os
 import json
+import logging
 
-from flask import current_app
+
+from app.utils.datasets import md5sum
 
 
-def load_data_for_chart(name):
-    dataset_dir = os.path.join(
-        current_app.instance_path, current_app.config["DATASET_DIR"]
-    )
-    target_filename = os.path.join(dataset_dir, name + ".json")
-    with open(target_filename, 'rb') as fid:
-        data = json.load(fid)
-    chart_data = [{"value": x} for x in data['series']['V1']['raw']]
-    return {"chart_data": chart_data}
 
 
diff --git a/app/main/routes.py b/app/main/routes.py
index 60dd6e1..d249c5c 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -9,7 +9,7 @@ from app import db
 from app.decorators import login_required
 from app.main import bp
 from app.models import Annotation, Task
-from app.main.datasets import load_data_for_chart
+from app.utils.datasets import load_data_for_chart
 
 RUBRIC = """
 <i>Please mark all the points in the time series where an <b>abrupt change</b> 
@@ -99,7 +99,7 @@ def task(task_id):
     if task.done:
         flash("It's not possible to edit annotations at the moment.")
         return redirect(url_for("main.index"))
-    data = load_data_for_chart(task.dataset.name)
+    data = load_data_for_chart(task.dataset.name, task.dataset.md5sum)
     return render_template(
         "annotate/index.html",
         title="Annotate %s" % task.dataset.name,