diff --git a/lib/galaxy/managers/datasets.py b/lib/galaxy/managers/datasets.py index d82cd463cf4f..59c2283deb1e 100644 --- a/lib/galaxy/managers/datasets.py +++ b/lib/galaxy/managers/datasets.py @@ -52,7 +52,6 @@ class DatasetManager(base.ModelManager[Dataset], secured.AccessibleManagerMixin, Manipulate datasets: the components contained in DatasetAssociations/DatasetInstances/HDAs/LDDAs """ - model_class = Dataset foreign_key_name = "dataset" app: MinimalManagerApp diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py index a1103f45ff0f..432699ee643c 100644 --- a/lib/galaxy/managers/hdas.py +++ b/lib/galaxy/managers/hdas.py @@ -90,7 +90,6 @@ class HDAManager( Interface/service object for interacting with HDAs. """ - model_class = HistoryDatasetAssociation foreign_key_name = "history_dataset_association" tag_assoc = model.HistoryDatasetAssociationTagAssociation diff --git a/lib/galaxy/managers/hdcas.py b/lib/galaxy/managers/hdcas.py index 76d5ef10cdab..65e0c2db3871 100644 --- a/lib/galaxy/managers/hdcas.py +++ b/lib/galaxy/managers/hdcas.py @@ -59,7 +59,7 @@ def set_collection_attributes(dataset_element, *payload): # TODO: to DatasetCollectionInstanceManager class HDCAManager( - base.ModelManager, + base.ModelManager[model.HistoryDatasetCollectionAssociation], secured.AccessibleManagerMixin, secured.OwnableManagerMixin, deletable.PurgableManagerMixin, @@ -69,7 +69,6 @@ class HDCAManager( Interface/service object for interacting with HDCAs. """ - model_class = model.HistoryDatasetCollectionAssociation foreign_key_name = "history_dataset_collection_association" tag_assoc = model.HistoryDatasetCollectionTagAssociation diff --git a/lib/galaxy/managers/lddas.py b/lib/galaxy/managers/lddas.py index 2b6018cb1a55..923e2f3ec01c 100644 --- a/lib/galaxy/managers/lddas.py +++ b/lib/galaxy/managers/lddas.py @@ -13,8 +13,6 @@ class LDDAManager(DatasetAssociationManager[LibraryDatasetDatasetAssociation]): A fairly sparse manager for LDDAs. """ - model_class = LibraryDatasetDatasetAssociation - def __init__(self, app: MinimalManagerApp): """ Set up and initialize other managers needed by lddas. diff --git a/lib/galaxy/managers/library_datasets.py b/lib/galaxy/managers/library_datasets.py index 29005f42c651..c01251af7090 100644 --- a/lib/galaxy/managers/library_datasets.py +++ b/lib/galaxy/managers/library_datasets.py @@ -33,8 +33,6 @@ class LibraryDatasetsManager(ModelManager[LibraryDataset]): """Interface/service object for interacting with library datasets.""" - model_class = LibraryDataset - def __init__(self, app: MinimalManagerApp): super().__init__(app) self.ldda_manager = LDDAManager(app) diff --git a/lib/galaxy/managers/roles.py b/lib/galaxy/managers/roles.py index 02448c1a4fbc..3c6ab434640d 100644 --- a/lib/galaxy/managers/roles.py +++ b/lib/galaxy/managers/roles.py @@ -37,7 +37,6 @@ class RoleManager(base.ModelManager[model.Role]): Business logic for roles. """ - model_class = model.Role foreign_key_name = "role" user_assoc = model.UserRoleAssociation diff --git a/lib/galaxy/managers/tools.py b/lib/galaxy/managers/tools.py index c6dbe471dc84..054149cf24e2 100644 --- a/lib/galaxy/managers/tools.py +++ b/lib/galaxy/managers/tools.py @@ -30,11 +30,9 @@ from galaxy.managers.base import OrmFilterParsersType -class DynamicToolManager(ModelManager): +class DynamicToolManager(ModelManager[model.DynamicTool]): """Manages dynamic tools stored in Galaxy's database.""" - model_class = model.DynamicTool - def get_tool_by_uuid(self, uuid: Optional[Union[UUID, str]]): stmt = select(DynamicTool).where(DynamicTool.uuid == uuid) return self.session().scalars(stmt).one_or_none()