Merge pull request #165 from metabrainz/yet-more-rate-limiting-yeaaa-haaawwww

Yet more rate limiting improvements by passing the troi auth token

Author: mayhem

tests/musicbrainz/test_recording_lookup.py

@@ -322,7 +322,8 @@ def test_read(self, req):
                                    'recording_mbids':
                                    ['1234a7ae-2af2-4291-aa84-bd0bafe291a1', 'ec5b8aa9-7483-4791-a185-1f599a0cdc35'],
                                    'inc': 'artist release tag'
-                               })
+                               },
+                               headers={})
 
         assert len(entities) == 2
 

troi/listenbrainz/recs.py

@@ -19,9 +19,11 @@ class UserRecordingRecommendationsElement(Element):
 
     MAX_RECORDINGS_TO_FETCH = 2000
 
-    def __init__(self, user_name, artist_type, count=25, offset=0):
+    def __init__(self, user_name, artist_type, count=25, offset=0, auth_token=None):
         super().__init__()
         self.client = liblistenbrainz.ListenBrainz()
+        if auth_token is not None:
+            self.client.set_auth_token(auth_token)
         self.user_name = user_name
         self.count = count
         self.offset = offset

troi/musicbrainz/recording_lookup.py

@@ -17,11 +17,12 @@ class RecordingLookupElement(Element):
     SERVER_URL = "https://api.listenbrainz.org/1/metadata/recording"
     MAX_RECORDINGS = 1000
 
-    def __init__(self, skip_not_found=True, lookup_tags=False, tag_threshold=None):
+    def __init__(self, skip_not_found=True, lookup_tags=False, tag_threshold=None, auth_token=None):
         Element.__init__(self)
         self.skip_not_found = skip_not_found
         self.lookup_tags = lookup_tags
         self.tag_threshold = tag_threshold
+        self.auth_token = auth_token
 
     @staticmethod
     def inputs():
@@ -52,7 +53,8 @@ def read(self, inputs):
             inc += " tag"
 
         while True:
-            r = requests.post(self.SERVER_URL, json={"recording_mbids": recording_mbids, "inc": inc})
+            headers = {"Authorization": f"Token {self.auth_token}"} if self.auth_token else {}
+            r = requests.post(self.SERVER_URL, json={"recording_mbids": recording_mbids, "inc": inc}, headers=headers)
             if r.status_code == 429:
                 sleep(2)
                 continue

troi/patches/periodic_jams.py

@@ -98,7 +98,8 @@ def create(self, inputs):
 
         recs = troi.listenbrainz.recs.UserRecordingRecommendationsElement(user_name,
                                                                           "raw",
-                                                                          count=1000)
+                                                                          count=1000,
+                                                                          auth_token=inputs.get("token"))
 
         recent_listens_lookup = troi.listenbrainz.listens.RecentListensTimestampLookup(user_name,
                                                                                        days=2,
@@ -129,7 +130,7 @@ def create(self, inputs):
         feedback_lookup = troi.listenbrainz.feedback.ListensFeedbackLookup(user_name, auth_token=inputs.get("token"))
         feedback_lookup.set_sources(latest_filter)
 
-        recs_lookup = troi.musicbrainz.recording_lookup.RecordingLookupElement()
+        recs_lookup = troi.musicbrainz.recording_lookup.RecordingLookupElement(auth_token=inputs.get("token"))
         recs_lookup.set_sources(feedback_lookup)
 
         hate_filter = troi.filters.HatedRecordingsFilterElement()