Set metadata states on dataset association, not dataset

galaxyproject · Feb 14, 2024 · 6d02125 · 6d02125
1 parent 51c5705
commit 6d02125
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/galaxy/model/store/__init__.py b/lib/galaxy/model/store/__init__.py
@@ -708,7 +708,7 @@ def handle_dataset_object_edit(dataset_instance, dataset_attrs):
                                         dataset_instance.datatype.set_meta(dataset_instance)
                                 except Exception:
                                     log.debug(f"Metadata setting failed on {dataset_instance}", exc_info=True)
-                                    dataset_instance.dataset.state = dataset_instance.dataset.states.FAILED_METADATA
+                                    dataset_instance._state = dataset_instance.dataset.states.FAILED_METADATA
 
                 if model_class == "HistoryDatasetAssociation":
                     if not isinstance(dataset_instance, model.HistoryDatasetAssociation):

diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py
@@ -260,7 +260,7 @@ def set_datasets_metadata(datasets, datasets_attributes=None):
                     primary_data.set_meta()
             except Exception:
                 if primary_data.state == galaxy.model.HistoryDatasetAssociation.states.OK:
-                    primary_data.state = galaxy.model.HistoryDatasetAssociation.states.FAILED_METADATA
+                    primary_data._state = galaxy.model.HistoryDatasetAssociation.states.FAILED_METADATA
                 log.exception("Exception occured while setting metdata")
 
             try:

diff --git a/lib/galaxy/webapps/galaxy/services/history_contents.py b/lib/galaxy/webapps/galaxy/services/history_contents.py
@@ -1477,7 +1477,7 @@ def _change_item_datatype(
         self.hda_manager.ensure_can_change_datatype(item)
         self.hda_manager.ensure_can_set_metadata(item)
         is_deferred = item.has_deferred_data
-        item.dataset.state = item.dataset.states.SETTING_METADATA
+        item._state = item.dataset.states.SETTING_METADATA
         if is_deferred:
             if params.datatype == "auto":  # if `auto` just keep the original guessed datatype
                 item.update()  # TODO: remove this `update` when we can properly track the operation results to notify the history