From 2b00e3eb48c641f6c8cd33ac13c092fd31ef1815 Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:15:47 +0100 Subject: [PATCH] Refactor HistoryDetailedList to use AnyHistoryView --- lib/galaxy/schema/schema.py | 8 +------- lib/galaxy/webapps/galaxy/services/histories.py | 10 ++++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py index 741cdd3d3fd..f94061a887c 100644 --- a/lib/galaxy/schema/schema.py +++ b/lib/galaxy/schema/schema.py @@ -1283,6 +1283,7 @@ HistoryStateIds = Dict[DatasetState, List[DecodedDatabaseIdField]] class HistoryDetailed(HistorySummary): # Equivalent to 'dev-detailed' view, which seems the default """History detailed information.""" + contents_url: ContentsUrlField size: int = Field( ..., @@ -1339,13 +1340,6 @@ class HistoryDetailed(HistorySummary): # Equivalent to 'dev-detailed' view, whi ) -class HistoryDetailedList(RootModel): - root: List[HistoryDetailed] = Field( - default=[], - title="List with detailed information of Histories.", - ) - - AnyHistoryView = Union[ HistoryDetailed, HistorySummary, diff --git a/lib/galaxy/webapps/galaxy/services/histories.py b/lib/galaxy/webapps/galaxy/services/histories.py index 81dfff1dce6..ab3fe0e69dc 100644 --- a/lib/galaxy/webapps/galaxy/services/histories.py +++ b/lib/galaxy/webapps/galaxy/services/histories.py @@ -51,9 +51,7 @@ from galaxy.schema import ( SerializationParams, ) from galaxy.schema.fields import DecodedDatabaseIdField -from galaxy.schema.history import ( - HistoryIndexQueryPayload, -) +from galaxy.schema.history import HistoryIndexQueryPayload from galaxy.schema.schema import ( AnyArchivedHistoryView, AnyHistoryView, @@ -65,7 +63,6 @@ from galaxy.schema.schema import ( CustomBuildsMetadataResponse, ExportHistoryArchivePayload, HistoryArchiveExportResult, - HistoryDetailedList, HistoryImportArchiveSourceType, JobExportHistoryArchiveModel, JobIdResponse, @@ -220,15 +217,16 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores): trans, payload: HistoryIndexQueryPayload, include_total_count: bool = False, - ) -> Tuple[HistoryDetailedList, int]: + ) -> Tuple[List[AnyHistoryView], int]: """Return a list of History accessible by the user :rtype: list :returns: dictionaries containing History details """ + serialization_params = SerializationParams(default_view="detailed") entries, total_matches = self.manager.index_query(trans, payload, include_total_count) return ( - HistoryDetailedList(root=[entry.to_dict(view="element") for entry in entries]), + [self._serialize_history(trans, entry, serialization_params) for entry in entries], total_matches, )