Merge branch 'main' of github.com:diverso-lab/uvlhub

Author: drorganvidez

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,36 @@
+name: Bug report
+description: Report a problem or unexpected behavior
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: What happened?
+      placeholder: Tell us what you saw.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      placeholder: What should have happened?
+
+  - type: input
+    id: environment
+    attributes:
+      label: Environment
+      placeholder: OS, version, browser, etc.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,26 @@
+name: Feature request
+description: Suggest an improvement or new feature
+title: "[Feature]: "
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: What problem are you trying to solve?
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposed solution
+      description: What do you want to happen?
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Links, screenshots, alternatives considered, etc.

app/modules/dataset/routes.py

@@ -3,7 +3,9 @@
 import shutil
 import tempfile
 from datetime import datetime
+from io import BytesIO
 
+import qrcode
 from flask import (
     abort,
     current_app,
@@ -17,6 +19,9 @@
     url_for,
 )
 from flask_login import current_user, login_required
+from PIL import Image, ImageDraw
+from qrcode.image.styledpil import StyledPilImage
+from qrcode.image.styles.moduledrawers.pil import RoundedModuleDrawer
 
 from app.modules.apikeys.decorators import require_api_key
 from app.modules.dataset import dataset_bp
@@ -203,6 +208,94 @@ def download_dataset(dataset_id):
     return resp
 
 
+def _build_dataset_qr_response(dataset: DataSet):
+    if not dataset.ds_meta_data.dataset_doi:
+        abort(404, description="QR available only for synchronized datasets with DOI.")
+
+    target_url = url_for("dataset.subdomain_index", doi=dataset.ds_meta_data.dataset_doi, _external=True)
+    qr = qrcode.QRCode(
+        version=None,
+        error_correction=qrcode.constants.ERROR_CORRECT_H,
+        box_size=10,
+        border=5,
+    )
+    qr.add_data(target_url)
+    qr.make(fit=True)
+
+    img = qr.make_image(
+        image_factory=StyledPilImage,
+        module_drawer=RoundedModuleDrawer(radius_ratio=0.9),
+        fill_color="black",
+        back_color="white",
+    ).convert("RGBA")
+
+    logo_path = os.path.join(current_app.root_path, "static", "media", "logos", "uvlhub_ball.png")
+    if os.path.exists(logo_path):
+        logo = Image.open(logo_path).convert("RGBA")
+        qr_width, qr_height = img.size
+
+        logo_size = max(40, qr_width // 5)
+        logo.thumbnail((logo_size, logo_size), Image.Resampling.LANCZOS)
+
+        padding = max(4, logo_size // 12)
+        logo_background = Image.new(
+            "RGBA",
+            (logo.width + (2 * padding), logo.height + (2 * padding)),
+            (0, 0, 0, 0),
+        )
+        bg_draw = ImageDraw.Draw(logo_background)
+        bg_radius = max(6, logo_background.width // 5)
+        bg_draw.rounded_rectangle(
+            [(0, 0), (logo_background.width - 1, logo_background.height - 1)],
+            radius=bg_radius,
+            fill=(255, 255, 255, 255),
+        )
+
+        rounded_logo = Image.new("RGBA", logo.size, (0, 0, 0, 0))
+        logo_mask = Image.new("L", logo.size, 0)
+        logo_mask_draw = ImageDraw.Draw(logo_mask)
+        logo_radius = max(4, logo.width // 5)
+        logo_mask_draw.rounded_rectangle(
+            [(0, 0), (logo.width - 1, logo.height - 1)],
+            radius=logo_radius,
+            fill=255,
+        )
+        rounded_logo.paste(logo, (0, 0), logo_mask)
+
+        bg_position = ((qr_width - logo_background.width) // 2, (qr_height - logo_background.height) // 2)
+        img.paste(logo_background, bg_position, logo_background)
+
+        logo_position = ((qr_width - rounded_logo.width) // 2, (qr_height - rounded_logo.height) // 2)
+        img.paste(rounded_logo, logo_position, rounded_logo)
+
+    img_io = BytesIO()
+    img.save(img_io, format="PNG")
+    img_io.seek(0)
+
+    return send_file(
+        img_io,
+        mimetype="image/png",
+        as_attachment=True,
+        download_name=f"dataset_{dataset.id}_qr.png",
+    )
+
+
+@dataset_bp.route("/datasets/<int:dataset_id>/qr", methods=["GET"])
+@dataset_bp.route("/datasets/<int:dataset_id>/qr/", methods=["GET"])
+def dataset_qr_by_id(dataset_id):
+    dataset = dataset_service.get_or_404(dataset_id)
+    return _build_dataset_qr_response(dataset)
+
+
+@dataset_bp.route("/doi/<path:doi>/qr", methods=["GET"])
+@dataset_bp.route("/doi/<path:doi>/qr/", methods=["GET"])
+def dataset_qr_by_doi(doi):
+    ds_meta_data = dsmetadata_service.filter_by_doi(doi)
+    if not ds_meta_data:
+        abort(404, description="Dataset not found for the given DOI.")
+    return _build_dataset_qr_response(ds_meta_data.dataset)
+
+
 @dataset_bp.route("/datasets/download/all", methods=["GET"])
 def download_all_dataset():
     selected_formats = request.args.getlist("formats")
@@ -260,6 +353,56 @@ def subdomain_index(doi):
     return resp
 
 
+@dataset_bp.route("/doi/<path:doi>/files/raw/<path:filename>", methods=["GET"])
+@dataset_bp.route("/doi/<path:doi>/files/raw/<path:filename>/", methods=["GET"])
+def doi_file_raw(doi, filename):
+
+    new_doi = doi_mapping_service.get_new_doi(doi)
+    if new_doi:
+        return redirect(
+            url_for("dataset.doi_file_raw", doi=new_doi, filename=filename),
+            code=302,
+        )
+
+    ds_meta_data = dsmetadata_service.filter_by_doi(doi)
+    if not ds_meta_data:
+        abort(404)
+
+    dataset = ds_meta_data.dataset
+
+    selected_file = None
+    for fm in dataset.feature_models:
+        for hf in fm.hubfiles:
+            if hf.name == filename:
+                selected_file = hf
+                break
+        if selected_file:
+            break
+
+    if not selected_file:
+        abort(404, description="File not found in this DOI dataset")
+
+    file_path = os.path.join(
+        current_app.root_path,
+        "..",
+        "uploads",
+        f"user_{dataset.user_id}",
+        f"dataset_{dataset.id}",
+        "uvl",
+        selected_file.name,
+    )
+
+    if not os.path.exists(file_path):
+        abort(404, description="File missing on disk")
+
+    return send_file(
+        file_path,
+        mimetype="text/plain; charset=utf-8",
+        as_attachment=False,
+        download_name=selected_file.name,
+    )
+
+
 @dataset_bp.route("/datasets/unsynchronized/<int:dataset_id>/", methods=["GET"])
 @login_required
 @is_dataset_owner

app/modules/dataset/templates/dataset/view_dataset.html

@@ -111,14 +111,14 @@
                             View associated publication
                             </a>
                             {% endif %}
+
                         </div>
                     </div>
 
-                    {% if dataset.ds_meta_data.dataset_doi %}
+                                        {% if dataset.ds_meta_data.dataset_doi %}
                     <!-- DOI + Copy icon -->
                     <div class="row mt-3">
                         <div class="col-12 d-flex align-items-center flex-wrap">
-                            
                             <!-- Etiqueta DOI -->
                             <span class="px-3 py-1 bg-dark text-white fw-bold rounded-start" style="font-family: monospace;">
                             DOI
@@ -141,6 +141,13 @@
                             title="Copy DOI">
                             </i>
 
+                            <a href="{{ url_for('dataset.dataset_qr_by_id', dataset_id=dataset.id) }}"
+                            class="ms-2 d-inline-flex align-items-center text-dark text-decoration-none"
+                            data-bs-toggle="tooltip"
+                            title="Download QR">
+                                <i class="fa-solid fa-qrcode" style="font-size: 18px; line-height: 1;"></i>
+                            </a>
+
                             <!-- Texto oculto para copiar -->
                             <div id="dataset_doi_uvlhub_{{ dataset.id }}" style="display: none;">
                             {{ dataset.get_uvlhub_doi() }}
@@ -149,6 +156,7 @@
                     </div>
                     {% endif %}
 
+
                 </div>
             </div>
 

app/modules/dataset/tests/test_unit.py

@@ -4,6 +4,7 @@
 import pytest
 from flask import Response
 from werkzeug.datastructures import MultiDict
+from werkzeug.exceptions import NotFound
 
 from app import create_app
 from app.modules.dataset import routes as dataset_routes
@@ -70,6 +71,77 @@ def test_subdomain_index_not_found(test_client):
     assert response.status_code == 404
 
 
+def _mock_dataset_for_qr(dataset_id=1, doi="10.1234/test-doi"):
+    dataset = MagicMock()
+    dataset.id = dataset_id
+    dataset.ds_meta_data = MagicMock()
+    dataset.ds_meta_data.dataset_doi = doi
+    return dataset
+
+
+def test_dataset_qr_by_id_success():
+    pytest.importorskip("qrcode")
+    dataset_routes = __import__("app.modules.dataset.routes", fromlist=["routes"])
+    app = create_app("testing")
+    with (
+        patch("app.modules.dataset.routes.dataset_service.get_or_404") as mock_get_or_404,
+        patch("app.modules.dataset.routes._build_dataset_qr_response") as mock_build_qr,
+    ):
+        mock_get_or_404.return_value = _mock_dataset_for_qr(dataset_id=7, doi="10.1234/dataset7")
+        mock_build_qr.return_value = Response(b"qr-image", mimetype="image/png", status=200)
+        with app.test_request_context("/datasets/7/qr"):
+            response = dataset_routes.dataset_qr_by_id(7)
+
+    assert response.status_code == 200
+    assert response.mimetype == "image/png"
+    assert response.data == b"qr-image"
+    mock_get_or_404.assert_called_once_with(7)
+    mock_build_qr.assert_called_once()
+
+
+def test_dataset_qr_by_id_without_doi_returns_404():
+    pytest.importorskip("qrcode")
+    dataset_routes = __import__("app.modules.dataset.routes", fromlist=["routes"])
+    app = create_app("testing")
+    with patch("app.modules.dataset.routes.dataset_service.get_or_404") as mock_get_or_404:
+        mock_get_or_404.return_value = _mock_dataset_for_qr(dataset_id=8, doi=None)
+        with app.test_request_context("/datasets/8/qr"):
+            with pytest.raises(NotFound):
+                dataset_routes.dataset_qr_by_id(8)
+
+
+def test_dataset_qr_by_doi_success():
+    pytest.importorskip("qrcode")
+    dataset_routes = __import__("app.modules.dataset.routes", fromlist=["routes"])
+    app = create_app("testing")
+    dataset = _mock_dataset_for_qr(dataset_id=9, doi="10.1234/dataset9")
+    with (
+        patch("app.modules.dataset.routes.dsmetadata_service.filter_by_doi") as mock_filter_by_doi,
+        patch("app.modules.dataset.routes._build_dataset_qr_response") as mock_build_qr,
+    ):
+        mock_filter_by_doi.return_value = MagicMock(dataset=dataset)
+        mock_build_qr.return_value = Response(b"qr-image", mimetype="image/png", status=200)
+        with app.test_request_context("/doi/10.1234/dataset9/qr"):
+            response = dataset_routes.dataset_qr_by_doi("10.1234/dataset9")
+
+    assert response.status_code == 200
+    assert response.mimetype == "image/png"
+    assert response.data == b"qr-image"
+    mock_filter_by_doi.assert_called_once_with("10.1234/dataset9")
+    mock_build_qr.assert_called_once_with(dataset)
+
+
+def test_dataset_qr_by_doi_not_found_returns_404():
+    pytest.importorskip("qrcode")
+    dataset_routes = __import__("app.modules.dataset.routes", fromlist=["routes"])
+    app = create_app("testing")
+    with patch("app.modules.dataset.routes.dsmetadata_service.filter_by_doi") as mock_filter_by_doi:
+        mock_filter_by_doi.return_value = None
+        with app.test_request_context("/doi/10.1234/non-existent/qr"):
+            with pytest.raises(NotFound):
+                dataset_routes.dataset_qr_by_doi("10.1234/non-existent")
+
+
 def _mock_dataset_for_edit():
     dataset = MagicMock()
     dataset.ds_meta_data = MagicMock()