Move dynamic_tool_models to tool_util_models

lib/galaxy/managers/tools.py

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

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

@@ -15,14 +15,14 @@ from galaxy.managers.tools import (
 )
 from galaxy.model import User
 from galaxy.schema.fields import DecodedDatabaseIdField
-from galaxy.tool_util.dynamic_tool_models import (
+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,
 )
-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.webapps.galaxy.api import (
     depends,
     DependsOnTrans,

lib/galaxy/workflow/modules.py

@@ -54,13 +54,13 @@ from galaxy.schema.invocation import (
     InvocationFailureWorkflowParameterInvalid,
 )
 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,
     ToolOutput,
     ToolOutputCollection,
 )
+from galaxy.tool_util_models.dynamic_tool_models import DynamicToolCreatePayload
 from galaxy.tools import (
     DatabaseOperationTool,
     DefaultToolState,

lib/galaxy_test/base/populators.py

@@ -102,7 +102,6 @@ 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,
@@ -110,6 +109,7 @@ from galaxy.tool_util.verify.wait import (
     wait_on as tool_util_wait_on,
 )
 from galaxy.tool_util_models import UserToolSource
+from galaxy.tool_util_models.dynamic_tool_models import DynamicUnprivilegedToolCreatePayload
 from galaxy.util import (
     DEFAULT_SOCKET_TIMEOUT,
     galaxy_root_path,