Merge branch 'develop' into feature/dashboard

Author: drorganvidez

.github/workflows/CI_lint.yml

@@ -22,11 +22,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
 
-      # Step 2: Set up Python environment (3.12)
+      # Step 2: Set up Python environment (3.13)
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       # Step 3: Install linting and formatting tools
       - name: Install Dependencies

.github/workflows/CI_pytest.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Delete rosemary editable mode
         run: sed -i '/rosemary @ file:\/\/\/app/d' requirements.txt
@@ -57,5 +57,12 @@ jobs:
           # constraints.txt must contain: setuptools<82
           pip install -r requirements.txt -c constraints.txt
 
+      - name: Install generator vendor package
+        # The generator module pulls its feature-model generator from a
+        # vendored source tree (bundled as a wheel for Pyodide at runtime).
+        # pytest also imports Params from it directly, so install it editable
+        # into the CI Python env.
+        run: pip install --no-cache-dir -e ./app/modules/generator/vendor
+
       - name: Run Tests
-        run: pytest app/modules/ --ignore-glob='*selenium*'
+        run: pytest app/modules/ --ignore-glob='*selenium*' -m 'not slow'

app/modules/dataset/assets/js/authors.js

@@ -112,7 +112,7 @@ function generateUniqueId() {
 }
 
 // Global index counter for authors (used in name attributes)
-let authorIndex = 0;
+let authorIndex = Number(window.initialAuthorIndex || 0);
 
 export function initializeAuthors() {
     // Botón "Add author"
@@ -122,7 +122,9 @@ export function initializeAuthors() {
 
         const rendered = Mustache.render(template, {
             id: uniqueId,
-            index: authorIndex
+            nameField: `authors[${authorIndex}][name]`,
+            affiliationField: `authors[${authorIndex}][affiliation]`,
+            orcidField: `authors[${authorIndex}][orcid]`
         });
 
         document.getElementById('authors-container').insertAdjacentHTML('beforeend', rendered);
@@ -181,16 +183,18 @@ export function initializeAuthors() {
             const template = document.getElementById('author-template').innerHTML;
             const rendered = Mustache.render(template, {
                 id: uniqueId,
-                index: authorIndex
+                nameField: `authors[${authorIndex}][name]`,
+                affiliationField: `authors[${authorIndex}][affiliation]`,
+                orcidField: `authors[${authorIndex}][orcid]`
             });
 
             document.getElementById('authors-container').insertAdjacentHTML('beforeend', rendered);
 
             // Rellenar campos del bloque recién creado
             const base = document.getElementById(`author-${uniqueId}`);
-            base.querySelector(`input[name="authors${authorIndex}[name]"]`).value = `${data.name} ${data.surname}`;
-            base.querySelector(`input[name="authors${authorIndex}[affiliation]"]`).value = data.affiliation || "";
-            base.querySelector(`input[name="authors${authorIndex}[orcid]"]`).value = data.orcid || "";
+            base.querySelector('.author-name').value = `${data.name} ${data.surname}`;
+            base.querySelector('.author-affiliation').value = data.affiliation || "";
+            base.querySelector('.orcid-input').value = data.orcid || "";
 
             // Deshabilitar botón "myself" hasta que se borre
             btn.dataset.myselfId = uniqueId;

app/modules/dataset/models.py

@@ -87,6 +87,7 @@ class DSMetaData(db.Model):
     ds_metrics = db.relationship("DSMetrics", uselist=False, backref="ds_meta_data", cascade="all, delete")
     authors = db.relationship("Author", backref="ds_meta_data", lazy=True, cascade="all, delete")
     dataset_anonymous = db.Column(Boolean, default=False)
+    metadata_synced = db.Column(Boolean, nullable=False, default=True)
 
 
 class DataSet(db.Model):
@@ -162,6 +163,9 @@ def get_uvlhub_doi_path(self) -> str:
     def is_anonymous(self) -> bool:
         return self.ds_meta_data.dataset_anonymous
 
+    def is_metadata_synchronized(self) -> bool:
+        return bool(self.ds_meta_data.metadata_synced)
+
     def get_publication(self) -> str | None:
         if not self.ds_meta_data.publication_type:
             return None
@@ -178,6 +182,7 @@ def to_dict(self):
             "publication_type": self.get_cleaned_publication_type(),
             "publication_doi": self.ds_meta_data.publication_doi,
             "dataset_doi": self.ds_meta_data.dataset_doi,
+            "metadata_synced": self.ds_meta_data.metadata_synced,
             "tags": self.ds_meta_data.tags.split(",") if self.ds_meta_data.tags else [],
             "url": self.get_uvlhub_doi(),
             "download": f'{request.host_url.rstrip("/")}/dataset/download/{self.id}',

app/modules/dataset/routes.py

@@ -28,6 +28,7 @@
 from qrcode.image.styles.moduledrawers.pil import RoundedModuleDrawer
 from werkzeug.utils import secure_filename
 
+from app import db
 from app.modules.apikeys.decorators import require_api_key
 from app.modules.auth.services import AuthenticationService
 from app.modules.dataset import dataset_bp
@@ -243,9 +244,39 @@ def edit_metadata(dataset_id):
     if request.method == "POST":
         is_ajax = request.headers.get("X-Requested-With") == "XMLHttpRequest"
         try:
-            dataset_service.update_metadata_from_request(dataset, request.form, zenodo_service=zenodo_service)
+            update_result = dataset_service.update_metadata_from_request(
+                dataset,
+                request.form,
+                zenodo_service=zenodo_service,
+            )
+            if update_result.get("sync_deferred"):
+                warning_message = (
+                    "Dataset metadata updated locally. Zenodo is currently unavailable, "
+                    "so synchronization is still pending."
+                )
+                flash(warning_message, "warning")
+                if is_ajax:
+                    return (
+                        jsonify(
+                            {
+                                "message": warning_message,
+                                "metadata_synced": False,
+                                "sync_deferred": True,
+                            }
+                        ),
+                        200,
+                    )
             if is_ajax:
-                return jsonify({"message": "Dataset updated successfully"}), 200
+                return (
+                    jsonify(
+                        {
+                            "message": "Dataset updated successfully",
+                            "metadata_synced": update_result.get("metadata_synced", True),
+                            "sync_deferred": False,
+                        }
+                    ),
+                    200,
+                )
             flash("Dataset updated successfully!", "success")
         except DatasetMetadataValidationError as exc:
             if is_ajax:
@@ -519,6 +550,29 @@ def get_unsynchronized_dataset(dataset_id):
     return render_template("dataset/view_dataset.html", dataset=dataset, hubfiles=hubfiles)
 
 
+@dataset_bp.route("/datasets/retry-sync/<int:dataset_id>", methods=["POST"])
+@login_required
+@is_dataset_owner
+def retry_sync_dataset(dataset_id):
+    dataset = dataset_service.get_or_404(dataset_id)
+
+    if not dataset.ds_meta_data.dataset_doi:
+        return jsonify({"error": "Dataset is not synchronized with Zenodo yet"}), 400
+
+    if dataset.ds_meta_data.metadata_synced:
+        return jsonify({"error": "Dataset metadata is already in sync"}), 400
+
+    try:
+        dataset_service._sync_metadata_in_zenodo_if_needed(dataset, zenodo_service)
+        dataset.ds_meta_data.metadata_synced = True
+        db.session.commit()
+    except Exception as exc:
+        logger.exception(f"[RETRY SYNC ERROR] {exc}")
+        return jsonify({"error": f"Zenodo sync failed: {exc}"}), 500
+
+    return jsonify({"message": "Metadata successfully synced to Zenodo"}), 200
+
+
 @dataset_bp.route("/datasets/sync/<int:dataset_id>", methods=["POST", "GET"])
 @login_required
 @is_dataset_owner

app/modules/dataset/services.py

@@ -36,6 +36,7 @@
 )
 from app.modules.hubfile.services import UploadIngestService
 from app.modules.statistics.services import StatisticsService
+from app.modules.zenodo.services import ZenodoUnavailableError
 from core.services.BaseService import BaseService
 
 logger = logging.getLogger(__name__)
@@ -400,24 +401,44 @@ def _transition_dataset_state_if_needed(self, dataset: DataSet, dataset_type: st
         if not wants_sync:
             dataset.ds_meta_data.dataset_doi = None
             dataset.ds_meta_data.deposition_id = None
+            dataset.ds_meta_data.metadata_synced = True
             return
 
         if zenodo_service is None:
             raise DatasetMetadataUpdateError("Zenodo service is required to synchronize the dataset.")
 
         if is_synced:
             self._sync_metadata_in_zenodo_if_needed(dataset, zenodo_service)
+            dataset.ds_meta_data.metadata_synced = True
             return
 
         self._publish_dataset_to_zenodo(dataset, zenodo_service)
+        dataset.ds_meta_data.metadata_synced = True
 
-    def update_metadata_from_request(self, dataset: DataSet, form_data, zenodo_service=None) -> None:
+    def update_metadata_from_request(self, dataset: DataSet, form_data, zenodo_service=None) -> dict:
+        was_synchronized = bool(dataset.ds_meta_data.dataset_doi)
+        sync_deferred = False
         try:
             dataset_type = self._get_requested_dataset_type(form_data)
             self._apply_metadata_from_form(dataset, form_data)
             self._replace_authors_from_form(dataset, form_data)
-            self._transition_dataset_state_if_needed(dataset, dataset_type, zenodo_service)
+            try:
+                self._transition_dataset_state_if_needed(dataset, dataset_type, zenodo_service)
+            except ZenodoUnavailableError as exc:
+                if was_synchronized and dataset_type in {"zenodo", "zenodo_anonymous"}:
+                    dataset.ds_meta_data.metadata_synced = False
+                    sync_deferred = True
+                    logger.warning(
+                        "Zenodo unavailable while updating metadata for dataset %s. Changes saved locally.",
+                        getattr(dataset, "id", "unknown"),
+                    )
+                else:
+                    raise DatasetMetadataUpdateError(str(exc))
             self.repository.session.commit()
+            return {
+                "metadata_synced": bool(dataset.ds_meta_data.metadata_synced),
+                "sync_deferred": sync_deferred,
+            }
         except DatasetMetadataValidationError:
             self.repository.session.rollback()
             raise
@@ -786,6 +807,7 @@ def create_local_dataset(self, form, current_user, temp_root: str = None):
                 publication_type=publication_type,
                 publication_doi=publication_doi,
                 tags=",".join(tags) if tags else "",
+                metadata_synced=True,
             )
             self.logger.info(f"[LOCAL] DSMetaData created with ID: {ds_meta.id}")
 

app/modules/dataset/templates/dataset/create_and_edit_dataset.html

@@ -47,7 +47,7 @@ <h3 class="stepper-title">Setup dataset type</h3>
                 </div>
                 <!--end::Step 1-->
                 <!--begin::Step 2-->
-                <div class="stepper-item" data-kt-stepper-element="nav">
+                <div class="stepper-item" data-kt-stepper-element="nav" {% if is_edit %}style="display:none"{% endif %}>
                     <!--begin::Wrapper-->
                     <div class="stepper-wrapper">
                         <!--begin::Icon-->
@@ -335,8 +335,9 @@ <h2 class="fw-bold text-gray-900">{% if is_edit %}Save dataset{% else %}Upload d
 </div>
 
 <script>
-    var isEditMode = {{ 'true' if is_edit else 'false' }};
+    window.isEditMode = {{ 'true' if is_edit else 'false' }};
     window.initialDropzoneFiles = {{ preloaded_temp_files | default([], true) | tojson }};
+    window.initialAuthorIndex = {{ dataset.ds_meta_data.authors | length if dataset and dataset.ds_meta_data and dataset.ds_meta_data.authors else 0 }};
 
     /**
      * CORRECCIÓN 1: Prevenir errores de "myDropzone is not defined"
@@ -361,11 +362,19 @@ <h2 class="fw-bold text-gray-900">{% if is_edit %}Save dataset{% else %}Upload d
             if (uvlNavItem) {
                 var observer = new MutationObserver(function () {
                     if (!uvlNavItem.classList.contains('current')) return;
-                    var goingForward = navItems[0].classList.contains('completed');
                     setTimeout(function () {
                         var instance = KTStepper.getInstance(stepperEl);
                         if (!instance) return;
-                        goingForward ? instance.goNext() : instance.goPrevious();
+                        var currentStep = typeof instance.getCurrentStepIndex === 'function'
+                            ? instance.getCurrentStepIndex()
+                            : null;
+                        var previousStep = typeof instance.getPreviousStepIndex === 'function'
+                            ? instance.getPreviousStepIndex()
+                            : null;
+                        var goingForward = previousStep === null || currentStep === null
+                            ? true
+                            : previousStep < currentStep;
+                        goingForward ? instance.goTo(3) : instance.goTo(1);
                     }, 0);
                 });
                 observer.observe(uvlNavItem, { attributes: true, attributeFilter: ['class'] });
@@ -375,6 +384,7 @@ <h2 class="fw-bold text-gray-900">{% if is_edit %}Save dataset{% else %}Upload d
         // ── 2. Interceptar submit para edición ──────────────────────────────
         var submitBtn = document.querySelector('[data-kt-stepper-action="submit"]');
         var continueBtn = document.querySelector('[data-kt-stepper-action="next"]');
+        var previousBtn = document.querySelector('[data-kt-stepper-action="previous"]');
         var errorContainer = document.getElementById('upload-error');
         var datasetId = {{ dataset.id | tojson if dataset else 'null' }};
         var editUrl = {{ url_for('dataset.edit_metadata', dataset_id=dataset.id) | tojson if dataset else 'null' }};
@@ -480,6 +490,36 @@ <h2 class="fw-bold text-gray-900">{% if is_edit %}Save dataset{% else %}Upload d
             return '';
         }
 
+        function getStepperInstance() {
+            return stepperEl ? KTStepper.getInstance(stepperEl) : null;
+        }
+
+        if (continueBtn) {
+            continueBtn.addEventListener('click', function (e) {
+                var stepperInstance = getStepperInstance();
+                var currentStep = stepperInstance ? stepperInstance.getCurrentStepIndex() : null;
+
+                if (stepperInstance && currentStep === 1) {
+                    e.preventDefault();
+                    e.stopImmediatePropagation();
+                    stepperInstance.goTo(3);
+                }
+            }, true);
+        }
+
+        if (previousBtn) {
+            previousBtn.addEventListener('click', function (e) {
+                var stepperInstance = getStepperInstance();
+                var currentStep = stepperInstance ? stepperInstance.getCurrentStepIndex() : null;
+
+                if (stepperInstance && currentStep === 3) {
+                    e.preventDefault();
+                    e.stopImmediatePropagation();
+                    stepperInstance.goTo(1);
+                }
+            }, true);
+        }
+
         if (submitBtn && datasetId) {
             var authorsContainer = document.getElementById('authors-container');
             if (authorsContainer && existingAuthors.length) {
@@ -659,19 +699,19 @@ <h2 class="fw-bold text-gray-900">{% if is_edit %}Save dataset{% else %}Upload d
             <div class="row mb-3">
                 <div class="col-md-6">
                     <label class="form-label">Name *</label>
-                    <input type="text" name="authors[[index]][name]" class="form-control author-name" value="[[name]]" required>
+                    <input type="text" name="[[nameField]]" class="form-control author-name" value="[[name]]" required>
                     <div class="invalid-feedback"></div>
                 </div>
                 <div class="col-md-6">
                     <label class="form-label">Affiliation</label>
-                    <input type="text" name="authors[[index]][affiliation]" class="form-control author-affiliation" value="[[affiliation]]">
+                    <input type="text" name="[[affiliationField]]" class="form-control author-affiliation" value="[[affiliation]]">
                     <div class="invalid-feedback"></div>
                 </div>
             </div>
             <div class="row mb-3">
                 <div class="col-md-12">
                     <label class="form-label">ORCID</label>
-                    <input type="text" name="authors[[index]][orcid]" class="form-control orcid-input" value="[[orcid]]">
+                    <input type="text" name="[[orcidField]]" class="form-control orcid-input" value="[[orcid]]">
                     <div class="invalid-feedback"></div>
                 </div>
             </div>