invenio-app-rdm 13.0.0b2.dev2__tar.gz → 13.0.0b2.dev3__tar.gz

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/CHANGES.rst

@@ -10,6 +10,19 @@
 Changes
 =======
 
+Version v13.0.0b2.dev3 (released 2025-02-21)
+
+- views: FAIR signposting level 1 support
+- meta: FAIR signposting level 1 support (link rel item)
+- globals: site.overrides: Increase pdf preview iframe height
+- tests: fix mock module paths
+- tests: add __init__.py in all directories
+    * This is necessary for pytest v8.x to be able to detect all unique
+      tests.
+
+- tests: filter out excessive warnings
+- fix: flask changed to TRUSTED_HOSTS
+
 Version v13.0.0b2.dev2 (released 2025-02-13)
 
 - Bump prerelease dependencies to stable.

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev2
+Version: 13.0.0b2.dev3
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -96,6 +96,19 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev3 (released 2025-02-21)
+
+- views: FAIR signposting level 1 support
+- meta: FAIR signposting level 1 support (link rel item)
+- globals: site.overrides: Increase pdf preview iframe height
+- tests: fix mock module paths
+- tests: add __init__.py in all directories
+    * This is necessary for pytest v8.x to be able to detect all unique
+      tests.
+
+- tests: filter out excessive warnings
+- fix: flask changed to TRUSTED_HOSTS
+
 Version v13.0.0b2.dev2 (released 2025-02-13)
 
 - Bump prerelease dependencies to stable.

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b2.dev2"
+__version__ = "13.0.0b2.dev3"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/config.py

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2020 Northwestern University.
-# Copyright (C) 2021-2024 Graz University of Technology.
+# Copyright (C) 2021-2025 Graz University of Technology.
 # Copyright (C) 2022-2024 KTH Royal Institute of Technology.
 # Copyright (C) 2023      TU Wien
 #
@@ -184,7 +184,7 @@ def _(x):
 # =====
 # See https://flask.palletsprojects.com/en/1.1.x/config/
 
-APP_ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
+TRUSTED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
 """Allowed hosts.
 
 Since HAProxy and Nginx route all requests no matter the host header

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/meta.html

@@ -1,5 +1,5 @@
 {#
-Copyright (C) 2020-2024 CERN.
+Copyright (C) 2020-2025 CERN.
 Copyright (C) 2020 Northwestern University.
 Copyright (C) 2021 New York University.
 Copyright (C) 2023 Front Matter.
@@ -28,6 +28,8 @@ _external=True) %}
       <meta name="citation_pdf_url" content="{{ file_url }}"/>
     {%- endif %}
     <link rel="alternate" type="{{ file.mimetype }}" href="{{ file_url }}">
+    {#- See https://signposting.org/FAIR/ #}
+    <link rel="item" type="{{ file.mimetype }}" href="{{ file_url }}">
   {%- endfor %}
 {% endif %}
 

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/records_ui/views/decorators.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 #
@@ -11,7 +11,7 @@
 
 from functools import wraps
 
-from flask import g, make_response, redirect, request, session, url_for
+from flask import current_app, g, make_response, redirect, request, session, url_for
 from flask_login import login_required
 from invenio_communities.communities.resources.serializer import (
     UICommunityJSONSerializer,
@@ -19,6 +19,9 @@ from invenio_communities.communities.resources.serializer import (
 from invenio_communities.proxies import current_communities
 from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_rdm_records.proxies import current_rdm_records
+from invenio_rdm_records.resources.serializers.signposting import (
+    FAIRSignpostingProfileLvl1Serializer,
+)
 from invenio_records_resources.services.errors import PermissionDeniedError
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -365,20 +368,88 @@ def pass_draft_community(f):
     return view
 
 
-def add_signposting(f):
-    """Add signposting link to view's response headers."""
+def _get_header(rel, value, link_type=None):
+    header = f'<{value}> ; rel="{rel}"'
+    if link_type:
+        header += f' ; type="{link_type}"'
+    return header
+
+
+def _get_signposting_collection(pid_value):
+    ui_url = record_url_for(pid_value=pid_value)
+    return _get_header("collection", ui_url, "text/html")
+
+
+def _get_signposting_describes(pid_value):
+    ui_url = record_url_for(pid_value=pid_value)
+    return _get_header("describes", ui_url, "text/html")
+
+
+def _get_signposting_linkset(pid_value):
+    api_url = record_url_for(_app="api", pid_value=pid_value)
+    return _get_header("linkset", api_url, "application/linkset+json")
+
+
+def add_signposting_landing_page(f):
+    """Add signposting links to the landing page view's response headers."""
 
     @wraps(f)
     def view(*args, **kwargs):
         response = make_response(f(*args, **kwargs))
 
         # Relies on other decorators having operated before it
-        pid_value = kwargs["pid_value"]
-        signposting_link = record_url_for(_app="api", pid_value=pid_value)
+        record = kwargs["record"]
 
-        response.headers["Link"] = (
-            f'<{signposting_link}> ; rel="linkset" ; type="application/linkset+json"'  # fmt: skip
+        signposting_headers = FAIRSignpostingProfileLvl1Serializer().serialize_object(
+            record.to_dict()
         )
+
+        response.headers["Link"] = signposting_headers
+
+        return response
+
+    return view
+
+
+def add_signposting_content_resources(f):
+    """Add signposting links to the content resources view's response headers."""
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        # Relies on other decorators having operated before it
+        pid_value = kwargs["pid_value"]
+
+        signposting_headers = [
+            _get_signposting_collection(pid_value),
+            _get_signposting_linkset(pid_value),
+        ]
+
+        response.headers["Link"] = " , ".join(signposting_headers)
+
+        return response
+
+    return view
+
+
+def add_signposting_metadata_resources(f):
+    """Add signposting links to the metadata resources view's response headers."""
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        # Relies on other decorators having operated before it
+        pid_value = kwargs["pid_value"]
+
+        signposting_headers = [
+            _get_signposting_describes(pid_value),
+            _get_signposting_linkset(pid_value),
+        ]
+
+        response.headers["Link"] = " , ".join(signposting_headers)
+
         return response
 
     return view

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/records_ui/views/records.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
 # Copyright (C) 2021-2023 TU Wien.
 #
@@ -39,7 +39,9 @@ from invenio_app_rdm.records_ui.previewer.iiif_simple import (
 
 from ..utils import get_external_resources
 from .decorators import (
-    add_signposting,
+    add_signposting_content_resources,
+    add_signposting_landing_page,
+    add_signposting_metadata_resources,
     pass_file_item,
     pass_file_metadata,
     pass_include_deleted,
@@ -141,7 +143,7 @@ class PreviewFile:
 @pass_record_or_draft(expand=True)
 @pass_record_files
 @pass_record_media_files
-@add_signposting
+@add_signposting_landing_page
 def record_detail(
     pid_value, record, files, media_files, is_preview=False, include_deleted=False
 ):
@@ -263,6 +265,7 @@ def record_detail(
 
 @pass_is_preview
 @pass_record_or_draft(expand=False)
+@add_signposting_metadata_resources
 def record_export(
     pid_value, record, export_format=None, permissions=None, is_preview=False
 ):
@@ -325,7 +328,7 @@ def record_file_preview(
 
 @pass_is_preview
 @pass_file_item(is_media=False)
-@add_signposting
+@add_signposting_content_resources
 def record_file_download(pid_value, file_item=None, is_preview=False, **kwargs):
     """Download a file from a record."""
     download = bool(request.args.get("download"))

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm/theme/assets/semantic-ui/less/invenio_app_rdm/theme/globals/site.overrides

@@ -311,7 +311,7 @@ a.remove-default-style:hover {
   display: block;
   border-style: none;
   width:100%;
-  height:400px;
+  height:60vh;
 }
 
 

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev2
+Version: 13.0.0b2.dev3
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -96,6 +96,19 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev3 (released 2025-02-21)
+
+- views: FAIR signposting level 1 support
+- meta: FAIR signposting level 1 support (link rel item)
+- globals: site.overrides: Increase pdf preview iframe height
+- tests: fix mock module paths
+- tests: add __init__.py in all directories
+    * This is necessary for pytest v8.x to be able to detect all unique
+      tests.
+
+- tests: filter out excessive warnings
+- fix: flask changed to TRUSTED_HOSTS
+
 Version v13.0.0b2.dev2 (released 2025-02-13)
 
 - Bump prerelease dependencies to stable.

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm.egg-info/SOURCES.txt

@@ -565,15 +565,18 @@ invenio_app_rdm/users_ui/views/__init__.py
 invenio_app_rdm/users_ui/views/dashboard.py
 invenio_app_rdm/users_ui/views/ui.py
 invenio_app_rdm/utils/files.py
+tests/__init__.py
 tests/conftest.py
 tests/test_tasks.py
 tests/test_utils.py
 tests/test_version.py
 tests/test_views.py
+tests/api/__init__.py
 tests/api/conftest.py
 tests/api/test_protect_files_rest.py
 tests/api/test_record_api.py
 tests/api/test_stats_api.py
+tests/fixtures/__init__.py
 tests/fixtures/conftest.py
 tests/fixtures/test_cli.py
 tests/fixtures/test_fixtures.py
@@ -583,8 +586,10 @@ tests/fixtures/app_data/pages/about.html
 tests/mock_module/__init__.py
 tests/mock_module/views.py
 tests/mock_module/templates/mock_mail.html
+tests/redirector/__init__.py
 tests/redirector/conftest.py
 tests/redirector/test_redirector.py
+tests/ui/__init__.py
 tests/ui/conftest.py
 tests/ui/test_deposits.py
 tests/ui/test_export_formats.py

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/invenio_app_rdm.egg-info/top_level.txt

@@ -1 +1,2 @@
 invenio_app_rdm
+tests

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/setup.cfg

@@ -143,6 +143,8 @@ ignore =
 addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_app_rdm --cov-report=term-missing
 testpaths = tests invenio_app_rdm
 live_server_scope = module
+filterwarnings = 
+	ignore::marshmallow.warnings.RemovedInMarshmallow4Warning
 
 [egg_info]
 tag_build = 

invenio_app_rdm-13.0.0b2.dev3/tests/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Graz University of Technology.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests."""

invenio_app_rdm-13.0.0b2.dev3/tests/api/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Graz University of Technology.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests."""

{invenio_app_rdm-13.0.0b2.dev2 → invenio_app_rdm-13.0.0b2.dev3}/tests/conftest.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2021 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
-# Copyright (C) 2024 Graz University of Technology.
+# Copyright (C) 2024-2025 Graz University of Technology.
 #
 # Invenio App RDM is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -77,7 +77,9 @@ pytest_plugins = ("celery.contrib.pytest",)
 def extra_entry_points():
     """Register extra entry point."""
     return {
-        "invenio_base.blueprints": ["mock_module = mock_module.views:create_blueprint"],
+        "invenio_base.blueprints": [
+            "mock_module = tests.mock_module.views:create_blueprint"
+        ],
     }
 
 

invenio_app_rdm-13.0.0b2.dev3/tests/fixtures/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Graz University of Technology.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests."""

invenio_app_rdm-13.0.0b2.dev3/tests/redirector/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Graz University of Technology.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests."""

invenio_app_rdm-13.0.0b2.dev3/tests/ui/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Graz University of Technology.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests."""

invenio_app_rdm-13.0.0b2.dev3/tests/ui/test_signposting_ui.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2023 Northwestern University.
+#
+# Invenio-App-RDM is free software; you can redistribute it and/or modify
+# it under the terms of the MIT License; see LICENSE file for more details.
+
+"""Test Signposting.
+
+See https://signposting.org/FAIR/#level2 for more information on Signposting
+"""
+import pytest
+
+
+@pytest.mark.parametrize("http_method", ["head", "get"])
+def test_link_in_landing_page_response_headers(
+    running_app, client, record_with_file, http_method
+):
+    client_http_method = getattr(client, http_method)
+    res = client_http_method(f"/records/{record_with_file.id}")
+
+    # The link headers are already tested in details in `invenio-rdm-records` (see `test_signposting_serializer`).
+    # Here we still want to issue the HTTP call to the URL in order to make sure that the decorator is working properly,
+    # but the assertions are less detailed to avoid having to adapt this test every time we modify the logic in `invenio-rdm-records`.
+    link_headers = res.headers["Link"].split(" , ")
+
+    # The test record does not have:
+    # - an author with an identifier.
+    # - a cite-as since it has no DOI.
+    # - a license.
+
+    # There should be at least 10 export formats supported (e.g. "application/dcat+xml", "application/x-bibtex", etc.).
+    assert sum('; rel="describedby" ;' in header for header in link_headers) >= 10
+
+    # There should be at least one file in the record.
+    assert sum('; rel="item" ;' in header for header in link_headers) >= 1
+
+    # There should be at least one description of the type of the record (e.g. "https://schema.org/Photograph").
+    assert sum('; rel="type"' in header for header in link_headers) >= 1
+
+    # There should be at least one link to a linkset (e.g. "application/linkset" and/or "application/linkset+json")
+    assert sum('; rel="linkset" ;' in header for header in link_headers) >= 1
+
+
+@pytest.mark.parametrize("http_method", ["head", "get"])
+def test_link_in_content_resource_response_headers(
+    running_app, client, record_with_file, http_method
+):
+    ui_url = f"https://127.0.0.1:5000/records/{record_with_file.id}"
+    api_url = f"https://127.0.0.1:5000/api/records/{record_with_file.id}"
+    filename = "article.txt"
+
+    client_http_method = getattr(client, http_method)
+    res = client_http_method(f"/records/{record_with_file.id}/files/{filename}")
+
+    assert res.headers["Link"].split(" , ") == [
+        f'<{ui_url}> ; rel="collection" ; type="text/html"',
+        f'<{api_url}> ; rel="linkset" ; type="application/linkset+json"',
+    ]
+
+
+@pytest.mark.parametrize("http_method", ["head", "get"])
+def test_link_in_metadata_resource_response_headers(
+    running_app, client, record, http_method
+):
+    ui_url = f"https://127.0.0.1:5000/records/{record.id}"
+    api_url = f"https://127.0.0.1:5000/api/records/{record.id}"
+
+    client_http_method = getattr(client, http_method)
+    res = client_http_method(f"/records/{record.id}/export/bibtex")
+
+    assert res.headers["Link"].split(" , ") == [
+        f'<{ui_url}> ; rel="describes" ; type="text/html"',
+        f'<{api_url}> ; rel="linkset" ; type="application/linkset+json"',
+    ]

invenio_app_rdm-13.0.0b2.dev2/tests/ui/test_signposting_ui.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2023 Northwestern University.
-#
-# Invenio-App-RDM is free software; you can redistribute it and/or modify
-# it under the terms of the MIT License; see LICENSE file for more details.
-
-"""Test Signposting.
-
-See https://signposting.org/FAIR/#level2 for more information on Signposting
-"""
-
-
-def test_link_in_landing_page_response_headers(running_app, client, record):
-    res = client.head(f"/records/{record.id}")
-
-    assert (
-        res.headers["Link"]
-        == f'<https://127.0.0.1:5000/api/records/{record.id}> ; rel="linkset" ; type="application/linkset+json"'  # noqa
-    )
-
-
-def test_link_in_content_resource_response_headers(
-    running_app, client, record_with_file
-):
-    filename = "article.txt"
-
-    res = client.head(f"/records/{record_with_file.id}/files/{filename}")
-
-    assert (
-        res.headers["Link"]
-        == f'<https://127.0.0.1:5000/api/records/{record_with_file.id}> ; rel="linkset" ; type="application/linkset+json"'  # noqa
-    )