Skip to content

Commit b34eac8

Browse files
fix: lint formating
1 parent 39e2e3e commit b34eac8

File tree

3 files changed

+41
-22
lines changed

3 files changed

+41
-22
lines changed

app/modules/dataset/routes.py

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,31 @@
33
import shutil
44
import tempfile
55
from datetime import datetime
6-
from flask import abort, current_app, jsonify, make_response, redirect, render_template, request, send_file, url_for, flash
6+
7+
from flask import (
8+
abort,
9+
current_app,
10+
flash,
11+
jsonify,
12+
make_response,
13+
redirect,
14+
render_template,
15+
request,
16+
send_file,
17+
url_for,
18+
)
719
from flask_login import current_user, login_required
820

921
from app.modules.apikeys.decorators import require_api_key
1022
from app.modules.dataset import dataset_bp
1123
from app.modules.dataset.decorators import is_dataset_owner
1224
from app.modules.dataset.forms import DataSetForm
13-
from app.modules.dataset.models import DataSet
25+
from app.modules.dataset.models import DataSet, PublicationType
1426
from app.modules.dataset.services import (
1527
AuthorService,
16-
DataSetService,
1728
DatasetMetadataUpdateError,
1829
DatasetMetadataValidationError,
30+
DataSetService,
1931
DOIMappingService,
2032
DSDownloadRecordService,
2133
DSMetaDataService,
@@ -28,7 +40,6 @@
2840
from app.modules.hubfile.models import Hubfile
2941
from app.modules.hubfile.services import HubfileService
3042
from app.modules.zenodo.services import ZenodoDatasetService, ZenodoService
31-
from app.modules.dataset.models import PublicationType
3243

3344
logger = logging.getLogger(__name__)
3445

@@ -119,15 +130,16 @@ def create_dataset():
119130
hubfile_service.clear_temp()
120131
return render_template("dataset/create_and_edit_dataset.html", form=form)
121132

122-
@dataset_bp.route('/dataset/edit/<int:dataset_id>', methods=['GET', 'POST'])
133+
134+
@dataset_bp.route("/dataset/edit/<int:dataset_id>", methods=["GET", "POST"])
123135
@login_required
124136
def edit_metadata(dataset_id):
125137
dataset = dataset_service.get_or_404(dataset_id)
126138
form = DataSetForm()
127139
if dataset.user_id != current_user.id:
128140
abort(403)
129141

130-
if request.method == 'POST':
142+
if request.method == "POST":
131143
is_ajax = request.headers.get("X-Requested-With") == "XMLHttpRequest"
132144
try:
133145
dataset_service.update_metadata_from_request(dataset, request.form, zenodo_service=zenodo_service)
@@ -149,9 +161,16 @@ def edit_metadata(dataset_id):
149161
return jsonify({"message": f"Unexpected error updating metadata: {exc}"}), 400
150162
flash(f"Unexpected error updating metadata: {exc}", "danger")
151163

152-
return redirect(url_for('dataset.list_dataset'))
164+
return redirect(url_for("dataset.list_dataset"))
165+
166+
return render_template(
167+
"dataset/create_and_edit_dataset.html",
168+
dataset=dataset,
169+
is_edit=True,
170+
form=form,
171+
PublicationType=PublicationType,
172+
)
153173

154-
return render_template('dataset/create_and_edit_dataset.html', dataset=dataset, is_edit = True, form=form, PublicationType=PublicationType)
155174

156175
@dataset_bp.route("/datasets/list", methods=["GET"])
157176
@login_required

app/modules/dataset/services.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ def _validate_orcid(self, orcid: str) -> str:
168168
)
169169
with urllib_request.urlopen(req, timeout=5) as response:
170170
if response.status != 200:
171-
raise DatasetMetadataValidationError(
172-
f"Could not validate ORCID (status {response.status})."
173-
)
171+
raise DatasetMetadataValidationError(f"Could not validate ORCID (status {response.status}).")
174172
except urllib_error.HTTPError as exc:
175173
if exc.code == 404:
176174
raise DatasetMetadataValidationError("ORCID not found.")
@@ -297,9 +295,7 @@ def _sync_metadata_in_zenodo_if_needed(self, dataset: DataSet, zenodo_service) -
297295
if not deposition_id:
298296
raise DatasetMetadataUpdateError("Dataset is synchronized but missing Zenodo deposition_id.")
299297

300-
metadata = zenodo_service.build_metadata(
301-
dataset, anonymous=dataset.ds_meta_data.dataset_anonymous
302-
)
298+
metadata = zenodo_service.build_metadata(dataset, anonymous=dataset.ds_meta_data.dataset_anonymous)
303299
zenodo_service.update_deposition(deposition_id, metadata)
304300

305301
def _publish_dataset_to_zenodo(self, dataset: DataSet, zenodo_service) -> None:

app/modules/dataset/tests/test_unit.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
from urllib.error import HTTPError
21
from unittest.mock import MagicMock, patch
2+
from urllib.error import HTTPError
33

44
import pytest
55
from werkzeug.datastructures import MultiDict
66

77
from app import create_app
88
from app.modules.dataset.services import (
9-
DataSetService,
109
DatasetMetadataUpdateError,
1110
DatasetMetadataValidationError,
11+
DataSetService,
1212
)
1313

1414

@@ -111,9 +111,11 @@ def test_update_metadata_from_request_success():
111111
]
112112
)
113113

114-
with patch.object(service, "zip_dataset", return_value="C:\\tmp\\dataset_1.zip"), patch(
115-
"app.modules.dataset.services.os.path.exists", return_value=True
116-
), patch("app.modules.dataset.services.shutil.rmtree"):
114+
with (
115+
patch.object(service, "zip_dataset", return_value="C:\\tmp\\dataset_1.zip"),
116+
patch("app.modules.dataset.services.os.path.exists", return_value=True),
117+
patch("app.modules.dataset.services.shutil.rmtree"),
118+
):
117119
service.update_metadata_from_request(dataset, form_data, zenodo_service=zenodo_service)
118120

119121
assert dataset.ds_meta_data.title == "Updated dataset"
@@ -371,9 +373,11 @@ def test_update_metadata_from_request_unsynced_dataset_to_zenodo_publishes_and_s
371373
zenodo_service.publish_deposition = MagicMock()
372374
zenodo_service.get_doi.return_value = "10.5072/zenodo.101"
373375

374-
with patch.object(service, "zip_dataset", return_value="C:\\tmp\\dataset_1.zip"), patch(
375-
"app.modules.dataset.services.os.path.exists", return_value=True
376-
), patch("app.modules.dataset.services.shutil.rmtree"):
376+
with (
377+
patch.object(service, "zip_dataset", return_value="C:\\tmp\\dataset_1.zip"),
378+
patch("app.modules.dataset.services.os.path.exists", return_value=True),
379+
patch("app.modules.dataset.services.shutil.rmtree"),
380+
):
377381
form_data = MultiDict(
378382
[("title", "Updated dataset"), ("description", "Updated description"), ("dataset_type", "zenodo")]
379383
)

0 commit comments

Comments
 (0)