xi2annotator 1.0.1__tar.gz → 1.0.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {xi2annotator-1.0.1/xi2annotator.egg-info → xi2annotator-1.0.2}/PKG-INFO +3 -2
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/pyproject.toml +3 -2
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/annotation.py +2 -3
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/routes.py +2 -1
- {xi2annotator-1.0.1 → xi2annotator-1.0.2/xi2annotator.egg-info}/PKG-INFO +3 -2
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator.egg-info/requires.txt +2 -1
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/COPYING +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/COPYING.LESSER +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/setup.cfg +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/__init__.py +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/__main__.py +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/app.py +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator/config.py +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator.egg-info/SOURCES.txt +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator.egg-info/dependency_links.txt +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator.egg-info/entry_points.txt +0 -0
- {xi2annotator-1.0.1 → xi2annotator-1.0.2}/xi2annotator.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: xi2annotator
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.2
|
|
4
4
|
Summary: Mass spectrometry spectrum annotation web service
|
|
5
5
|
Author: Rappsilber Laboratory
|
|
6
6
|
License: AGPL-3.0-or-later
|
|
@@ -20,6 +20,7 @@ Requires-Dist: pytest>=3.6.4; extra == "dev"
|
|
|
20
20
|
Requires-Dist: pytest-flask==1.3.0; extra == "dev"
|
|
21
21
|
Requires-Dist: pytest-cov; extra == "dev"
|
|
22
22
|
Requires-Dist: pytest-flake8>=1.1.0; extra == "dev"
|
|
23
|
-
Requires-Dist: flake8
|
|
23
|
+
Requires-Dist: flake8>=6.0.0; extra == "dev"
|
|
24
24
|
Requires-Dist: build; extra == "dev"
|
|
25
|
+
Requires-Dist: recursive-diff; extra == "dev"
|
|
25
26
|
Dynamic: license-file
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "xi2annotator"
|
|
7
|
-
version = "1.0.
|
|
7
|
+
version = "1.0.2"
|
|
8
8
|
description = "Mass spectrometry spectrum annotation web service"
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
requires-python = ">=3.8"
|
|
@@ -29,8 +29,9 @@ dev = [
|
|
|
29
29
|
"pytest-flask==1.3.0",
|
|
30
30
|
"pytest-cov",
|
|
31
31
|
"pytest-flake8>=1.1.0",
|
|
32
|
-
"flake8
|
|
32
|
+
"flake8>=6.0.0",
|
|
33
33
|
"build",
|
|
34
|
+
"recursive-diff",
|
|
34
35
|
]
|
|
35
36
|
|
|
36
37
|
[project.urls]
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
# USA
|
|
17
17
|
|
|
18
18
|
import traceback
|
|
19
|
-
from flask import jsonify
|
|
20
19
|
from xicommon.config import Crosslinker, Modification, ModificationConfig, Loss, \
|
|
21
20
|
FragmentationConfig, Config
|
|
22
21
|
from xicommon.mock_context import MockContext
|
|
@@ -338,11 +337,11 @@ def annotate_request(json_request):
|
|
|
338
337
|
# ToDo: the version should come from a central place
|
|
339
338
|
json_request['annotation']['xiVersion'] = const.VERSION
|
|
340
339
|
|
|
341
|
-
return
|
|
340
|
+
return json_request
|
|
342
341
|
except Exception as e:
|
|
343
342
|
debug_value = os.environ.get("XI2ANNOTATOR_DEBUG", "false")
|
|
344
343
|
if debug_value.lower() != "false" and debug_value != "0":
|
|
345
|
-
return
|
|
344
|
+
return {'error': str(e), "stacktrace": traceback.format_exc()}, 400
|
|
346
345
|
raise e
|
|
347
346
|
|
|
348
347
|
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
# USA
|
|
17
17
|
|
|
18
18
|
from flask import request
|
|
19
|
+
from flask import jsonify
|
|
19
20
|
from xi2annotator import bp
|
|
20
21
|
from xi2annotator.annotation import annotate_request
|
|
21
22
|
|
|
@@ -27,4 +28,4 @@ def annotate():
|
|
|
27
28
|
# get the content of the json request
|
|
28
29
|
content = request.get_json()
|
|
29
30
|
|
|
30
|
-
return annotate_request(content)
|
|
31
|
+
return jsonify(annotate_request(content))
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: xi2annotator
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.2
|
|
4
4
|
Summary: Mass spectrometry spectrum annotation web service
|
|
5
5
|
Author: Rappsilber Laboratory
|
|
6
6
|
License: AGPL-3.0-or-later
|
|
@@ -20,6 +20,7 @@ Requires-Dist: pytest>=3.6.4; extra == "dev"
|
|
|
20
20
|
Requires-Dist: pytest-flask==1.3.0; extra == "dev"
|
|
21
21
|
Requires-Dist: pytest-cov; extra == "dev"
|
|
22
22
|
Requires-Dist: pytest-flake8>=1.1.0; extra == "dev"
|
|
23
|
-
Requires-Dist: flake8
|
|
23
|
+
Requires-Dist: flake8>=6.0.0; extra == "dev"
|
|
24
24
|
Requires-Dist: build; extra == "dev"
|
|
25
|
+
Requires-Dist: recursive-diff; extra == "dev"
|
|
25
26
|
Dynamic: license-file
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|