Move UnprivilegedToolResponse into api

lib/galaxy/tool_util_models/dynamic_tool_models.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import (
     Optional,
     Union,
@@ -7,7 +6,6 @@ from typing import (
 from pydantic import BaseModel
 from typing_extensions import Literal
 
-from galaxy.schema.fields import EncodedDatabaseIdField
 from galaxy.tool_util_models import (
     DynamicToolSources,
     UserToolSource,
@@ -40,15 +38,4 @@ class PathBasedDynamicToolCreatePayload(BaseDynamicToolCreatePayload):
     allow_load: bool = True
 
 
-class UnprivilegedToolResponse(BaseModel):
-    id: EncodedDatabaseIdField
-    uuid: str
-    active: bool
-    hidden: bool
-    tool_id: Optional[str]
-    tool_format: Optional[str]
-    create_time: datetime
-    representation: UserToolSource
-
-
 DynamicToolPayload = Union[DynamicToolCreatePayload, PathBasedDynamicToolCreatePayload]

lib/galaxy/webapps/galaxy/api/dynamic_tools.py

@@ -1,9 +1,13 @@
 import logging
+from datetime import datetime
 from typing import (
     List,
+    Optional,
     Union,
 )
 
+from pydantic import BaseModel
+
 from galaxy.exceptions import ObjectNotFound
 from galaxy.managers.context import (
     ProvidesHistoryContext,
@@ -14,14 +18,17 @@ from galaxy.managers.tools import (
     tool_payload_to_tool,
 )
 from galaxy.model import User
-from galaxy.schema.fields import DecodedDatabaseIdField
+from galaxy.schema.fields import (
+    DecodedDatabaseIdField,
+    EncodedDatabaseIdField,
+)
 from galaxy.tool_util.parameters import input_models_for_tool_source
 from galaxy.tool_util.parameters.convert import cwl_runtime_model
 from galaxy.tool_util.parser.yaml import YamlToolSource
 from galaxy.tool_util_models.dynamic_tool_models import (
     DynamicToolPayload,
     DynamicUnprivilegedToolCreatePayload,
-    UnprivilegedToolResponse,
+    UserToolSource,
 )
 from galaxy.webapps.galaxy.api import (
     depends,
@@ -37,6 +44,17 @@ router = Router(tags=["dynamic_tools"])
 DatabaseIdOrUUID = Union[DecodedDatabaseIdField, str]
 
 
+class UnprivilegedToolResponse(BaseModel):
+    id: EncodedDatabaseIdField
+    uuid: str
+    active: bool
+    hidden: bool
+    tool_id: Optional[str]
+    tool_format: Optional[str]
+    create_time: datetime
+    representation: UserToolSource
+
+
 @router.cbv
 class UnprivilegedToolsApi:
     # Almost identical to dynamic tools api, but operates with tool ids