- remove avg waiting time for github prefetcher

Author: RootLUG

aura/github.py

@@ -62,15 +62,16 @@ def time_to_reset(cls) -> float:
         else:
             return 0.0
 
-    def __get_json(self, url: str) -> Union[dict, list]:
+    @staticmethod
+    def _get_json(url: str) -> Union[dict, list]:
         payload = URLCache.proxy(url=url, tags=["github_api"], session=SESSION)
         return json.loads(payload)
 
     def get_repository_data(self) -> dict:
         url = f"https://api.github.com/repos/{self.owner}/{self.name}"
 
         try:
-            return self.__get_json(url)
+            return self._get_json(url)
         except HTTPError as exc:
             if exc.code == 404:
                 raise NoSuchRepository(f"{self.owner}/{self.name}") from exc
@@ -84,7 +85,7 @@ def get_repository_data(self) -> dict:
 
     def get_contributors(self) -> list:
         url = f"https://api.github.com/repos/{self.owner}/{self.name}/contributors"
-        return self.__get_json(url=url)
+        return self._get_json(url=url)
 
 
 class GitHubPrefetcher:
@@ -109,13 +110,13 @@ def wait_time(self) -> float:
         if (remaining := GitHub.x_api_remaining - self.safety_buffer) <= 0:
             return reset_time
 
-        return reset_time / remaining
+        return 0.0
 
     async def process(self, max_retries=3, backoff=1.0):
         while True:
             api_wait_time = self.wait_time
             if api_wait_time > 3:
-                logger.info(f"Rate limit reached, waiting for {api_wait_time}s")
+                logger.warning(f"Rate limit reached, waiting for {api_wait_time}s")
 
             await asyncio.sleep(api_wait_time)
             item: Optional[str] = await self.queue.get()

tests/test_github.py

@@ -1,6 +1,8 @@
 import json
 import pytest
+import requests
 import responses
+from unittest import mock
 
 from aura import github
 from aura import cache
@@ -37,17 +39,33 @@ def test_invalid_github_repos(url, mock_github):
 @responses.activate
 def test_github_cache(mock_github, mock_cache):
     mock_github(responses)
+    repo_url = "https://api.github.com/repos/psf/requests"
+    contributors_url = "https://api.github.com/repos/psf/requests/contributors"
 
+    real_session = requests.Session()
+    mock_session = mock.Mock(wraps=real_session, spec=True)
     _ = github.GitHub.from_url("https://github.com/psf/requests")
 
-    url1_cached = cache.URLCache(url="https://api.github.com/repos/psf/requests")
+    url1_cached = cache.URLCache(url=repo_url)
     assert url1_cached.is_valid is True
     assert type(json.loads(url1_cached.fetch())) == dict
 
-    url2_cached = cache.URLCache(url="https://api.github.com/repos/psf/requests/contributors")
+    url2_cached = cache.URLCache(url=contributors_url)
     assert url2_cached.is_valid
     assert type(json.loads(url2_cached.fetch())) == list
 
+    responses.reset()
+    # Test that the data is cached and does not fire any requests
+    _ = github.GitHub.from_url("https://github.com/psf/requests")
+
+    output = cache.URLCache.proxy(url=repo_url, session=mock_session)
+    assert mock_session.called is False
+    assert type(json.loads(output)) == dict
+
+    output = cache.URLCache.proxy(url=contributors_url, session=mock_session)
+    assert mock_session.called is False
+    assert type(json.loads(output)) == list
+
 
 @responses.activate
 def test_github_rate_limit_reached():