Add Distance and current_metadata to autotag.__init__ for backward compat

Author: snejus

beets/autotag/__init__.py

@@ -19,10 +19,12 @@
 from typing import TYPE_CHECKING, Union
 
 from beets import config, logging
+from beets.util import get_most_common_tags as current_metadata
 
 # Parts of external interface.
 from beets.util import unique_list
 
+from .distance import Distance
 from .hooks import AlbumInfo, AlbumMatch, TrackInfo, TrackMatch
 from .match import Proposal, Recommendation, tag_album, tag_item
 
@@ -34,13 +36,15 @@
 __all__ = [
     "AlbumInfo",
     "AlbumMatch",
-    "TrackInfo",
-    "TrackMatch",
+    "Distance",  # for backwards compatibility
     "Proposal",
     "Recommendation",
+    "TrackInfo",
+    "TrackMatch",
     "apply_album_metadata",
     "apply_item_metadata",
     "apply_metadata",
+    "current_metadata",  # for backwards compatibility
     "tag_album",
     "tag_item",
 ]

beets/plugins.py

@@ -37,7 +37,6 @@
 
 import beets
 from beets import logging
-from beets.autotag.distance import Distance
 from beets.util.id_extractors import extract_release_id
 
 if TYPE_CHECKING:
@@ -55,6 +54,7 @@
     from confuse import ConfigView
 
     from beets.autotag import AlbumInfo, TrackInfo
+    from beets.autotag.distance import Distance
     from beets.dbcore import Query
     from beets.dbcore.db import FieldQueryType
     from beets.dbcore.types import Type
@@ -225,6 +225,8 @@ def track_distance(
         """Should return a Distance object to be added to the
         distance for every track comparison.
         """
+        from beets.autotag.distance import Distance
+
         return Distance()
 
     def album_distance(
@@ -236,6 +238,8 @@ def album_distance(
         """Should return a Distance object to be added to the
         distance for every album-level comparison.
         """
+        from beets.autotag.distance import Distance
+
         return Distance()
 
     def candidates(
@@ -455,6 +459,8 @@ def track_distance(item: Item, info: TrackInfo) -> Distance:
     """Gets the track distance calculated by all loaded plugins.
     Returns a Distance object.
     """
+    from beets.autotag.distance import Distance
+
     dist = Distance()
     for plugin in find_plugins():
         dist.update(plugin.track_distance(item, info))
@@ -467,6 +473,8 @@ def album_distance(
     mapping: dict[Item, TrackInfo],
 ) -> Distance:
     """Returns the album distance calculated by plugins."""
+    from beets.autotag.distance import Distance
+
     dist = Distance()
     for plugin in find_plugins():
         dist.update(plugin.album_distance(items, album_info, mapping))
@@ -653,6 +661,8 @@ def get_distance(
     """Returns the ``data_source`` weight and the maximum source weight
     for albums or individual tracks.
     """
+    from beets.autotag.distance import Distance
+
     dist = Distance()
     if info.data_source == data_source:
         dist.add("source", config["source_weight"].as_number())