Move tours schema to schema directory (to fix package structure)

Discovered in galaxyproject#20868 (comment)

Author: ahmedhamidawan

lib/galaxy/managers/tours.py

@@ -13,14 +13,14 @@
 )
 from galaxy.managers.context import ProvidesAppContext
 from galaxy.schema.schema import GenerateTourResponse
+from galaxy.schema.tours import (
+    TourDetails,
+    TourStep,
+)
 from galaxy.structured_app import StructuredApp
 from galaxy.tool_util.verify.interactor import ToolTestDescription
 from galaxy.tools import Tool
 from galaxy.tools.parameters.grouping import Conditional
-from galaxy.tours import (
-    TourDetails,
-    TourStep,
-)
 from galaxy.util import Params
 
 

lib/galaxy/schema/schema.py

@@ -44,12 +44,12 @@
     literal_to_value,
     ModelClassField,
 )
+from galaxy.schema.tours import TourDetails
 from galaxy.schema.types import (
     OffsetNaiveDatetime,
     RelativeUrl,
 )
 from galaxy.tool_util_models.tool_source import FieldDict
-from galaxy.tours import TourDetails
 from galaxy.util.config_templates import partial_model
 from galaxy.util.hash_util import HashFunctionNameEnum
 from galaxy.util.sanitize_html import sanitize_html

lib/galaxy/tours/_schema.py lib/galaxy/schema/tours.pylib/galaxy/tours/_schema.py renamed to lib/galaxy/schema/tours.py

@@ -1,11 +1,4 @@
 from ._impl import build_tours_registry
 from ._interface import ToursRegistry
-from ._schema import (
-    Tour,
-    TourCore,
-    TourDetails,
-    TourList,
-    TourStep,
-)
 
-__all__ = ["build_tours_registry", "ToursRegistry", "Tour", "TourCore", "TourDetails", "TourList", "TourStep"]
+__all__ = ["build_tours_registry", "ToursRegistry"]

lib/galaxy/tours/__init__.py

@@ -10,10 +10,10 @@
 
 from galaxy.exceptions import ObjectNotFound
 from galaxy.navigation.data import load_root_component
+from galaxy.schema.tours import TourList
 from galaxy.util import config_directories_from_setting
 from galaxy.util.path import StrPath
 from ._interface import ToursRegistry
-from ._schema import TourList
 
 log = logging.getLogger(__name__)
 

lib/galaxy/tours/_impl.py

@@ -3,7 +3,7 @@
     abstractmethod,
 )
 
-from ._schema import (
+from galaxy.schema.tours import (
     TourDetails,
     TourList,
 )

lib/galaxy/tours/_interface.py

@@ -5,12 +5,12 @@
 from pydantic import ValidationError
 
 from galaxy.navigation.data import load_root_component
+from galaxy.schema.tours import TourDetails
 from ._impl import (
     get_tour_id_from_path,
     load_tour_from_path,
     tour_paths,
 )
-from ._schema import TourDetails
 
 DESCRIPTION = "Perform static validation of a tour."
 

lib/galaxy/tours/validate.py

@@ -7,11 +7,11 @@
 from galaxy.managers.context import ProvidesAppContext
 from galaxy.managers.tours import ToursManager
 from galaxy.schema.schema import GenerateTourResponse
-from galaxy.tours import (
+from galaxy.schema.tours import (
     TourDetails,
     TourList,
-    ToursRegistry,
 )
+from galaxy.tours import ToursRegistry
 from galaxy.webapps.galaxy.api import DependsOnTrans
 from . import (
     depends,