Merge pull request #75 from mwang87/proxi-api

Merging

test-production-integration/test_integration.py

@@ -37,6 +37,18 @@ def test_img():
         r = requests.get(url)
         r.raise_for_status()
 
+def test_json():
+    from urllib.parse import quote
+    for usi in test_usi_list:
+        url = f"{PRODUCTION_URL}/json/?usi={quote(usi)}"
+        r = requests.get(url)
+        r.raise_for_status()
+
+        url = f"{PRODUCTION_URL}/api/proxi/v0.1/spectra?usi={quote(usi)}"
+        r = requests.get(url)
+        r.raise_for_status()
+
+
 def test_filtration():
     url = f"{PRODUCTION_URL}/svg/?usi=mzspec:MS2LDATASK-190:document:270684&width=10&height=6&mz_min=0&mz_max=80&max_intensity=&grid=true&annotate_peaks=[%220-4%22,%220-11%22,%220-19%22,%220-20%22]&annotate_precision=4&annotation_rotation=90"
     r = requests.get(url)

views.py

@@ -442,6 +442,30 @@ def peak_json():
     return flask.jsonify(spectrum_dict)
 
 
+@app.route('/api/proxi/v0.1/spectra')
+def peak_proxi_json():
+    spectrum, _ = parsing.parse_usi(flask.request.args.get('usi'))
+
+    spectrum_dict = {
+        'intensities': [str(intensity) for intensity in spectrum.intensity],
+        'mzs': [str(mz) for mz in spectrum.mz],
+        'attributes': [
+            {
+                'accession': 'MS:1000744',
+                'name': 'selected ion m/z',
+                'value': str(spectrum.precursor_mz)
+            },
+            {
+                'accession': 'MS:1000041',
+                'name': 'precursor charge',
+                'value': str(spectrum.precursor_charge)
+            }
+        ]
+    }
+
+    return flask.jsonify([spectrum_dict])
+
+
 @app.route('/csv/')
 def peak_csv():
     spectrum, _ = parsing.parse_usi(flask.request.args.get('usi'))