Refactor credentials management to improve type annotations and conso…

…lidate imports

lib/galaxy/managers/credentials.py

@@ -2,6 +2,7 @@
     List,
     Optional,
     Tuple,
+    Union,
 )
 
 from sqlalchemy import select
@@ -16,12 +17,11 @@
 )
 from galaxy.model.base import transaction
 from galaxy.model.scoped_session import galaxy_scoped_session
-from galaxy.schema.credentials import (
-    CredentialsModelList,
-    SOURCE_TYPE,
-)
+from galaxy.schema.credentials import SOURCE_TYPE
 from galaxy.schema.fields import DecodedDatabaseIdField
 
+CredentialsModelList = List[Union[UserCredentials, CredentialsGroup, Variable, Secret]]
+
 
 class CredentialsManager:
     """Manager object shared by controllers for interacting with credentials."""

lib/galaxy/schema/credentials.py

@@ -2,27 +2,17 @@
     Dict,
     List,
     Optional,
-    Union,
 )
 
 from pydantic import RootModel
 from typing_extensions import Literal
 
-from galaxy.model import (
-    CredentialsGroup,
-    Secret,
-    UserCredentials,
-    Variable,
-)
 from galaxy.schema.fields import EncodedDatabaseIdField
 from galaxy.schema.schema import Model
 
 SOURCE_TYPE = Literal["tool"]
 
 
-CredentialsModelList = List[Union[UserCredentials, CredentialsGroup, Variable, Secret]]
-
-
 class CredentialResponse(Model):
     id: EncodedDatabaseIdField
     name: str

lib/galaxy/webapps/galaxy/services/credentials.py

@@ -13,14 +13,16 @@
     RequestParameterInvalidException,
 )
 from galaxy.managers.context import ProvidesUserContext
-from galaxy.managers.credentials import CredentialsManager
+from galaxy.managers.credentials import (
+    CredentialsManager,
+    CredentialsModelList,
+)
 from galaxy.model import (
     CredentialsGroup,
     UserCredentials,
 )
 from galaxy.schema.credentials import (
     CreateSourceCredentialsPayload,
-    CredentialsModelList,
     SOURCE_TYPE,
     UserCredentialsListResponse,
     UserCredentialsResponse,