Enhance UUID handling during import: clarify regeneration conditions and update related messages

Author: PierreRaybaut

datalab/gui/main.py

@@ -1658,23 +1658,32 @@ def open_h5_files(
             else:
                 reset_all = Conf.io.h5_clear_workspace.get()
                 if Conf.io.h5_clear_workspace_ask.get():
+                    # Build message with optional note for native workspace import
+                    msg = _(
+                        "Do you want to clear current workspace "
+                        "(signals and images) before importing data from "
+                        "HDF5 files?"
+                    )
+                    # Only show the UUID conflict note when importing native DataLab
+                    # workspace files (import_all=True), not when using HDF5 browser
+                    if import_all:
+                        msg += "<br><br>" + _(
+                            "<u>Note:</u> If you choose <i>No</i>, when importing "
+                            "DataLab workspace files, objects with conflicting "
+                            "identifiers will have their processing history lost "
+                            "(features like 'Show source' and 'Recompute' will not "
+                            "work for those objects). Non-conflicting objects will "
+                            "preserve their processing history."
+                        )
+                    msg += "<br><br>" + _(
+                        "Choosing to ignore this message will prevent it "
+                        "from being displayed again, and will use the "
+                        "current setting (%s)."
+                    ) % (_("Yes") if reset_all else _("No"))
                     answer = QW.QMessageBox.question(
                         self,
                         _("Warning"),
-                        _(
-                            "Do you want to clear current workspace "
-                            "(signals and images) before importing data from "
-                            "HDF5 files?<br><br>"
-                            "<b>Note:</b> If you choose <b>No</b>, the imported "
-                            "objects' processing history will be lost "
-                            "(features like 'Show source' and 'Recompute' will not "
-                            "work) because object identifiers will be regenerated "
-                            "to avoid conflicts.<br><br>"
-                            "Choosing to ignore this message will prevent it "
-                            "from being displayed again, and will use the "
-                            "current setting (%s)."
-                        )
-                        % (_("Yes") if reset_all else _("No")),
+                        msg,
                         QW.QMessageBox.Yes | QW.QMessageBox.No | QW.QMessageBox.Ignore,
                     )
                     if answer == QW.QMessageBox.Yes:

datalab/gui/panel/base.py

@@ -927,8 +927,10 @@ def deserialize_object_from_hdf5(
             # When reopening a workspace (reset_all=True), preserve original UUIDs
             # so that processing parameter references (source_uuid, source_uuids)
             # remain valid and features like "Show source" and "Recompute" work.
+            # When importing, only regenerate UUID if it conflicts with an existing one.
             if not reset_all and isinstance(obj, (SignalObj, ImageObj, ObjectGroup)):
-                set_uuid(obj)
+                if self.objmodel.has_uuid(get_uuid(obj)):
+                    set_uuid(obj)
         return obj
 
     @abc.abstractmethod

datalab/gui/settings.py

@@ -112,9 +112,10 @@ class IOSettings(gds.DataSet):
         help=_(
             "If enabled, the current workspace will be cleared before loading a "
             "new HDF5 file.\n"
-            "If disabled, imported objects' processing history will "
-            "be lost (features like 'Show source' and 'Recompute' will not work) "
-            "because object identifiers will be regenerated to avoid conflicts."
+            "If disabled, when importing DataLab workspace files, only objects with "
+            "conflicting identifiers will have their processing history lost "
+            "(features like 'Show source' and 'Recompute' will not work for those "
+            "objects). Non-conflicting objects will preserve their processing history."
         ),
     )
     h5_clear_workspace_ask = gds.BoolItem("", _("Ask before clearing workspace"))

datalab/locale/fr/LC_MESSAGES/datalab.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  datalab\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-11-15 17:20+0100\n"
+"POT-Creation-Date: 2025-11-15 17:56+0100\n"
 "PO-Revision-Date: 2025-05-22 15:46+0200\n"
 "Last-Translator: Christophe Debonnel <[email protected]>\n"
 "Language: fr\n"
@@ -936,9 +936,15 @@ msgstr "Êtes-vous sûr de vouloir désactiver le rafraîchissement automatique
 msgid "Save"
 msgstr "Enregistrer"
 
+msgid "Do you want to clear current workspace (signals and images) before importing data from HDF5 files?"
+msgstr "Souhaitez-vous vider l'espace de travail actuel (signaux et images) avant d'importer des données depuis des fichiers HDF5 ?"
+
+msgid "<u>Note:</u> If you choose <i>No</i>, when importing DataLab workspace files, objects with conflicting identifiers will have their processing history lost (features like 'Show source' and 'Recompute' will not work for those objects). Non-conflicting objects will preserve their processing history."
+msgstr "<u>Note :</u> Si vous choisissez <i>Non</i>, lors de l'importation de fichiers d'espace de travail DataLab, les objets ayant des identifiants en conflit perdront leur historique de traitement (les fonctionnalités telles que 'Afficher la source' et 'Retraiter' ne fonctionneront pas pour ces objets). Les objets sans conflit conserveront leur historique de traitement."
+
 #, python-format
-msgid "Do you want to clear current workspace (signals and images) before importing data from HDF5 files?<br><br><b>Note:</b> If you choose <b>No</b>, the imported objects' processing history will be lost (features like 'Show source' and 'Recompute' will not work) because object identifiers will be regenerated to avoid conflicts.<br><br>Choosing to ignore this message will prevent it from being displayed again, and will use the current setting (%s)."
-msgstr "Souhaitez-vous effacer l'espace de travail actuel (signaux et images) avant d'importer des données depuis des fichiers HDF5 ?<br><br><b>Remarque :</b> Si vous choisissez <b>Non</b>, l'historique de traitement des objets importés sera perdu (des fonctionnalités telles que 'Afficher la source' et 'Recalculer' ne fonctionneront pas) car les identifiants d'objet seront régénérés pour éviter les conflits.<br><br>Choisir d'ignorer ce message empêchera son affichage ultérieur et utilisera le réglage actuel (%s)."
+msgid "Choosing to ignore this message will prevent it from being displayed again, and will use the current setting (%s)."
+msgstr "Ignorer ce message empêchera son affichage ultérieur et utilisera le réglage actuel (%s)."
 
 msgid "Yes"
 msgstr "Oui"
@@ -2222,10 +2228,10 @@ msgstr "Effacer l'espace de travail avant de charger un fichier HDF5"
 
 msgid ""
 "If enabled, the current workspace will be cleared before loading a new HDF5 file.\n"
-"If disabled, imported objects' processing history will be lost (features like 'Show source' and 'Recompute' will not work) because object identifiers will be regenerated to avoid conflicts."
+"If disabled, when importing DataLab workspace files, only objects with conflicting identifiers will have their processing history lost (features like 'Show source' and 'Recompute' will not work for those objects). Non-conflicting objects will preserve their processing history."
 msgstr ""
 "Si activé, l'espace de travail actuel sera effacé avant de charger un nouveau fichier HDF5.\n"
-"Si désactivé, l'historique de traitement des objets importés sera perdu (des fonctionnalités telles que 'Afficher la source' et 'Recalculer' ne fonctionneront pas) car les identifiants d'objet seront régénérés pour éviter les conflits."
+"Si désactivé, lors de l'importation de fichiers de l'espace de travail DataLab, seuls les objets avec des identifiants en conflit perdront leur historique de traitement (les fonctionnalités telles que 'Afficher la source' et 'Retraiter' ne fonctionneront pas pour ces objets). Les objets non conflictuels conserveront leur historique de traitement."
 
 msgid "Ask before clearing workspace"
 msgstr "Demander avant d'effacer l'espace de travail"

datalab/objectmodel.py

@@ -247,6 +247,17 @@ def __contains__(self, obj: SignalObj | ImageObj) -> bool:
         """Return True if obj is in model"""
         return get_uuid(obj) in self._objects
 
+    def has_uuid(self, uuid: str) -> bool:
+        """Check if an object with the given UUID exists in the model
+
+        Args:
+            uuid: UUID string to check
+
+        Returns:
+            True if an object with this UUID exists, False otherwise
+        """
+        return uuid in self._objects
+
     def clear(self) -> None:
         """Clear model"""
         self._objects.clear()

datalab/tests/features/common/uuid_preservation_test.py

@@ -163,7 +163,7 @@ def test_uuid_preservation_images():
 
 
 def test_uuid_regeneration_on_import():
-    """Test that UUIDs are regenerated when importing (not resetting workspace)"""
+    """Test that UUIDs are regenerated only when conflicts exist during import"""
     with qt_app_context():
         with helpers.WorkdirRestoringTempDir() as tmpdir:
             with datalab_test_app_context(console=False) as win:
@@ -178,7 +178,7 @@ def test_uuid_regeneration_on_import():
                 win.save_to_h5_file(fname)
 
                 # Step 2: Import the same file (reset_all=False, import_all=True)
-                # This should regenerate UUIDs to avoid conflicts
+                # This should regenerate UUID only for the conflicting object
                 win.open_h5_files([fname], import_all=True, reset_all=False)
 
                 # Step 3: Verify we now have 2 signals with different UUIDs