Move dynamic tool models to tool_util

lib/galaxy/managers/tools.py

@@ -24,11 +24,11 @@ from galaxy.model import (
     DynamicTool,
     UserDynamicToolAssociation,
 )
-from galaxy.schema.tools import (
+from galaxy.tool_util.cwl import tool_proxy
+from galaxy.tool_util.dynamic_tool_models import (
     DynamicToolPayload,
     DynamicUnprivilegedToolCreatePayload,
 )
-from galaxy.tool_util.cwl import tool_proxy
 from galaxy.tool_util.parser.yaml import YamlToolSource
 from galaxy.tools import (
     create_tool_from_source,

lib/galaxy/tool_util/dynamic_tool_models.py

@@ -1,11 +1,11 @@
 from datetime import datetime
 from typing import (
-    Literal,
     Optional,
     Union,
 )
 
 from pydantic import BaseModel
+from typing_extensions import Literal
 
 from galaxy.schema.fields import EncodedDatabaseIdField
 from galaxy.tool_util.models import (

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

@@ -15,7 +15,7 @@ from galaxy.managers.tools import (
 )
 from galaxy.model import User
 from galaxy.schema.fields import DecodedDatabaseIdField
-from galaxy.schema.tools import (
+from galaxy.tool_util.dynamic_tool_models import (
     DynamicToolPayload,
     DynamicUnprivilegedToolCreatePayload,
     UnprivilegedToolResponse,

lib/galaxy/workflow/modules.py

@@ -53,8 +53,8 @@ from galaxy.schema.invocation import (
     InvocationFailureWhenNotBoolean,
     InvocationFailureWorkflowParameterInvalid,
 )
-from galaxy.schema.tools import DynamicToolCreatePayload
 from galaxy.tool_util.cwl.util import set_basename_and_derived_properties
+from galaxy.tool_util.dynamic_tool_models import DynamicToolCreatePayload
 from galaxy.tool_util.parser import get_input_source
 from galaxy.tool_util.parser.output_objects import (
     ToolExpressionOutput,

lib/galaxy_test/base/populators.py

@@ -93,7 +93,6 @@ from galaxy.schema.schema import (
     ToolLandingRequest,
     WorkflowLandingRequest,
 )
-from galaxy.schema.tools import DynamicUnprivilegedToolCreatePayload
 from galaxy.tool_util.client.staging import InteractorStaging
 from galaxy.tool_util.cwl.util import (
     download_output,
@@ -103,6 +102,7 @@ from galaxy.tool_util.cwl.util import (
     output_to_cwl_json,
     tool_response_to_output,
 )
+from galaxy.tool_util.dynamic_tool_models import DynamicUnprivilegedToolCreatePayload
 from galaxy.tool_util.verify.test_data import TestDataResolver
 from galaxy.tool_util.verify.wait import (
     timeout_type,