add back __call__ methods on various awaitable objects

docs/_howto/scripts/sync/p1.py

@@ -15,8 +15,8 @@ async def match_albums_to_remote(albums: Collection[MusifyCollection], factory:
 
     searcher = RemoteItemSearcher(matcher=matcher, object_factory=factory)
     async with searcher:
-        await searcher.search(albums)
+        await searcher(albums)
 
     checker = RemoteItemChecker(matcher=matcher, object_factory=factory)
     async with checker:
-        await checker.check(albums)
+        await checker(albums)

docs/release-history.rst

@@ -88,10 +88,6 @@ Removed
 * Dependency on ``requests-cache`` package in favour of custom cache implementation.
 * ``use_cache`` parameter from all :py:class:`.RemoteAPI` related methods.
   Cache settings now handled by :py:class:`.ResponseCache`
-* Ability to call the following classes directly due to their need to now by asynchronous:
-   * :py:class:`.APIAuthoriser`
-   * :py:class:`.RemoteItemChecker`
-   * :py:class:`.RemoteItemSearcher`
 * ThreadPoolExecutor use on :py:class:`.RemoteItemSearcher`. Now uses asynchronous logic instead.
 
 Documentation

musify/api/authorise.py

@@ -5,7 +5,7 @@
 import logging
 import os
 import socket
-from collections.abc import Callable, Mapping, Sequence, MutableMapping
+from collections.abc import Callable, Mapping, Sequence, MutableMapping, Awaitable
 from datetime import datetime
 from typing import Any
 from urllib.parse import unquote
@@ -204,6 +204,9 @@ def save_token(self) -> None:
         with open(self.token_file_path, "w") as file:
             json.dump(self.token, file, indent=2)
 
+    def __call__(self, force_load: bool = False, force_new: bool = False) -> Awaitable[dict[str, str]]:
+        return self.authorise(force_load=force_load, force_new=force_new)
+
     async def authorise(self, force_load: bool = False, force_new: bool = False) -> dict[str, str]:
         """
         Main method for authorisation which tests/refreshes/reauthorises as needed.

musify/api/request.py

@@ -118,7 +118,7 @@ async def authorise(self, force_load: bool = False, force_new: bool = False) ->
 
         headers = {}
         if self.authoriser is not None:
-            headers = await self.authoriser.authorise(force_load=force_load, force_new=force_new)
+            headers = await self.authoriser(force_load=force_load, force_new=force_new)
             self.session.headers.update(headers)
 
         return headers

musify/libraries/remote/core/processors/check.py

@@ -6,7 +6,7 @@
 """
 import logging
 from collections import Counter
-from collections.abc import Sequence, Collection, Iterator
+from collections.abc import Sequence, Collection, Iterator, Awaitable
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass, field
 from typing import Any, Self
@@ -173,6 +173,11 @@ async def _delete_playlists(self) -> None:
         self._playlist_name_urls.clear()
         self._playlist_name_collection.clear()
 
+    def __call__[T: MusifyItemSettable](
+            self, collections: Collection[MusifyCollection[T]]
+    ) -> Awaitable[ItemCheckResult[T] | None]:
+        return self.check(collections)
+
     async def check[T: MusifyItemSettable](
             self, collections: Collection[MusifyCollection[T]]
     ) -> ItemCheckResult[T] | None:

musify/libraries/remote/core/processors/search.py

@@ -5,7 +5,7 @@
 and assigns the ID of the matched object back to the item.
 """
 import logging
-from collections.abc import Mapping, Sequence, Iterable, Collection
+from collections.abc import Mapping, Sequence, Iterable, Collection, Awaitable
 from dataclasses import dataclass, field
 from typing import Any, Self
 
@@ -193,6 +193,11 @@ def _determine_remote_object_type(obj: MusifyObject) -> RemoteObjectType:
             return obj.kind
         raise MusifyAttributeError(f"Given object does not specify a RemoteObjectType: {obj.__class__.__name__}")
 
+    def __call__[T: MusifyItemSettable](
+            self, collections: Collection[MusifyCollection[T]]
+    ) -> Awaitable[dict[str, ItemSearchResult[T]]]:
+        return self.search(collections)
+
     async def search[T: MusifyItemSettable](
             self, collections: Collection[MusifyCollection[T]]
     ) -> dict[str, ItemSearchResult[T]]:

tests/api/test_authorise.py

@@ -219,7 +219,7 @@ async def test_auth_new_token(self, token: dict[str, Any], token_file_path: str,
         response = {"access_token": "valid token", "expires_in": 3000, "refresh_token": "new_refresh"}
         requests_mock.post(authoriser.auth_args["url"], payload=response)
 
-        await authoriser.authorise()
+        await authoriser()
         expected_header = {"Authorization": "Bearer valid token"}
         assert authoriser.headers == expected_header
         assert authoriser.token["refresh_token"] == "new_refresh"
@@ -235,7 +235,7 @@ async def test_auth_load_and_token_valid(self, token_file_path: str, requests_mo
         requests_mock.get(authoriser.test_args["url"], payload={"test": "valid"})
 
         # loads token, token is valid, no refresh needed
-        await authoriser.authorise()
+        await authoriser()
         expected_header = {"Authorization": f"Bearer {authoriser.token["access_token"]}"}
         assert authoriser.headers == expected_header
 
@@ -273,7 +273,7 @@ async def test_auth_new_token_and_no_refresh(
 
         requests_mock.post(authoriser.auth_args["url"], payload={"1": {"2": {"code": "token"}}})
 
-        await authoriser.authorise()
+        await authoriser()
         expected_header = {"Authorization": "Bearer token"}
         assert authoriser.headers == expected_header
 

tests/libraries/remote/core/processors/check.py

@@ -576,7 +576,7 @@ async def add_collection(self, collection: BasicCollection):
         values = ["", *["ua" for _ in batch_1], "s", *["ua" for _ in batch_2]]
         patch_input(values, mocker=mocker)
 
-        result = await checker.check(collections)
+        result = await checker(collections)
         mocker.stopall()
 
         assert count == len(batch_1) + len(batch_2)  # only 2 batches executed

tests/libraries/remote/core/processors/search.py

@@ -277,7 +277,7 @@ async def test_search(
         search_collection = BasicCollection(name="test", items=search_items + unmatchable_items)
         skip_album = len([item for item in search_album if item.has_uri is not None])
 
-        results = await searcher.search([search_collection, search_album])
+        results = await searcher([search_collection, search_album])
 
         result = results[search_collection.name]
         assert len(result.matched) + len(result.unmatched) + len(result.skipped) == len(search_collection)