only associate one jupyter notebook per run

Signed-off-by: Lance-Drane <[email protected]>

Author: Lance-Drane

ipsportal/data_api.py

@@ -2,6 +2,7 @@
 
 import logging
 from flask import Blueprint, jsonify, request, Response
+from pymongo.errors import PyMongoError
 from typing import Any, Tuple
 from .db import db, get_runid, get_data_tags
 from .minio import put_minio_object
@@ -109,14 +110,6 @@ def add() -> Tuple[Response, int]:
     if not portal_runid:
         return jsonify("Missing value for HTTP Header X-Ips-Portal-Runid"), 400
 
-    # Jupyter links are optional to associate with a data event.
-    # If they DO exist, we use a non-printable delimiter to separate links in the header value
-    juypter_links_header = request.headers.get("X-Ips-Jupyter-Links")
-    if juypter_links_header:
-        jupyter_links = juypter_links_header.split("\x01")
-    else:
-        jupyter_links = []
-
     # runid is needed because the portal_runid is not a valid bucket name for MINIO
     runid = get_runid(portal_runid)
     if runid is None:
@@ -147,7 +140,6 @@ def add() -> Tuple[Response, int]:
                 "tags": {
                     "tag": resolved_tag,
                     "data_location_url": data_location_url,
-                    "jupyter_urls": jupyter_links,
                 }
             },
         },
@@ -182,14 +174,6 @@ def add_url() -> Tuple[Response, int]:
     if not isinstance(url, str):
         errors.append({"url": "Must be provided and a string"})
 
-    if not isinstance(data.get('tags'), list):
-        errors.append({"tags": "Must be provided and a non-empty list"})
-    else:
-        try:
-            tag_lookups = set(map(float, data.get('tags')))
-        except ValueError:
-            errors.append({"tags": "Must be floating point values"})
-
     portal_runid = data.get('portal_runid')
     if not isinstance(portal_runid, str):
         errors.append({"portal_runid": "Must be provided"})
@@ -203,16 +187,14 @@ def add_url() -> Tuple[Response, int]:
     if errors:
         return jsonify(errors), 400
 
-    # TODO figure out how to do this entirely in Mongo
-    for tags_prop in result['tags']:  # type: ignore[index]
-        if tags_prop['tag'] in tag_lookups and url not in tags_prop['jupyter_urls']:
-            tags_prop['jupyter_urls'].append(url)
-    db.data.replace_one(
-        {'_id': result['_id']},  # type: ignore[index]
-        result  # type: ignore[arg-type]
-    )
-
-    return jsonify([]), 200
+    try:
+        db.data.update_one(
+            {"portal_runid": portal_runid},
+            {"$set": {"jupyter_url": url}},
+        )
+        return jsonify([]), 200
+    except PyMongoError:
+        return jsonify([{"portal_runid", "does not exist"}]), 400
 
 
 @bp.route("/api/data/query", methods=["POST"])

ipsportal/db.py

@@ -178,3 +178,12 @@ def get_data_tags(portal_runid: str) -> Optional[dict[str, Any]]:
     if result:
         return result.get('tags')
     return None
+
+
+def get_data_information(portal_runid: str) -> tuple[Optional[dict[str, Any]], Optional[str]]:
+    result = db.data.find_one(
+        {"portal_runid": portal_runid}, projection={"_id": False, "tags": True, "jupyter_url": True}
+    )
+    if result:
+        return result.get('tags'), result.get('jupyter_url')
+    return None, None

ipsportal/run.py

@@ -1,6 +1,6 @@
 from typing import Tuple
 from flask import Blueprint, render_template
-from ipsportal.db import get_run, get_runid, get_data_tags
+from ipsportal.db import get_run, get_runid, get_data_information
 
 bp = Blueprint('index', __name__)
 
@@ -20,5 +20,5 @@ def run(runid: int) -> Tuple[str, int]:
         run['parent_runid'] = get_runid(str(run.get('parent_portal_runid')))
     else:
         run['parent_runid'] = None
-    data_info = get_data_tags(run['portal_runid'])
-    return render_template("events.html", run=run, data_info=data_info), 200
+    data_info, jupyter_url = get_data_information(run['portal_runid'])
+    return render_template("events.html", run=run, data_info=data_info, jupyter_url=jupyter_url), 200

ipsportal/templates/events.html

@@ -100,6 +100,12 @@ <h4>{% block title %}Run - {{ run.runid }}{% endblock %}</h4>
     <td><a href="{{run.parent_runid}}">Run {{ run.parent_runid }}</a></td>
   </tr>
   {% endif %}
+  {% if jupyter_url %}
+  <tr>
+    <th>Associated JupyterHub Notebook</th>
+    <td><a href="{{jupyter_url}}">Explore JupyterHub Notebook</a></td>
+  </tr>
+  {% endif %}
   </tbody>
 </table>
 
@@ -112,16 +118,6 @@ <h4>{% block title %}Run - {{ run.runid }}{% endblock %}</h4>
     <details>
       <summary>{{item.tag}}</summary>
       <p><a class="raw-data-uri" href="{{item.data_location_url}}" download="{{run.portal_runid}}__{{item.tag}}">Download raw data</a></p>
-      {% if item.jupyter_urls %}
-      <details>
-        <summary>Associated JupyterHub Links</summary>
-        <ul>
-        {% for url in item.jupyter_urls %}
-          <li><a href="{{url}}">{{url}}</a></li>
-        {% endfor %}
-        </ul>
-      </details>  
-      {% endif %}    
     </details>
   </li>
   {% endfor %}