airbyte-source-github 1.8.35__tar.gz → 1.8.36.dev202507211247__tar.gz

{airbyte_source_github-1.8.35 → airbyte_source_github-1.8.36.dev202507211247}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: airbyte-source-github
-Version: 1.8.35
+Version: 1.8.36.dev202507211247
 Summary: Source implementation for GitHub.
 License: MIT
 Author: Airbyte

{airbyte_source_github-1.8.35 → airbyte_source_github-1.8.36.dev202507211247}/pyproject.toml

@@ -5,7 +5,7 @@ requires = [
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "1.8.35"
+version = "1.8.36.dev202507211247"
 name = "airbyte-source-github"
 description = "Source implementation for GitHub."
 authors = [

{airbyte_source_github-1.8.35 → airbyte_source_github-1.8.36.dev202507211247}/source_github/backoff_strategies.py

@@ -12,6 +12,10 @@ from airbyte_cdk.sources.streams.http import HttpStream
 
 
 class GithubStreamABCBackoffStrategy(BackoffStrategy):
+    min_backoff_time = 60.0
+    # https://docs.github.com/en/rest/using-the-rest-api/troubleshooting-the-rest-api?apiVersion=2022-11-28
+    RATE_LIMITS_STATUS_CODES = [403, 429]
+
     def __init__(self, stream: HttpStream, **kwargs):  # type: ignore # noqa
         self.stream = stream
         super().__init__(**kwargs)
@@ -23,23 +27,30 @@ class GithubStreamABCBackoffStrategy(BackoffStrategy):
         # `X-RateLimit-Reset` header which contains time when this hour will be finished and limits will be reset so
         # we again could have 5000 per another hour.
         if isinstance(response_or_exception, requests.Response):
-            min_backoff_time = 60.0
             retry_after = response_or_exception.headers.get("Retry-After")
             if retry_after is not None:
-                backoff_time_in_seconds = max(float(retry_after), min_backoff_time)
-                return self.get_waiting_time(backoff_time_in_seconds)
+                backoff_time_in_seconds = max(float(retry_after), self.min_backoff_time)
+                return self.get_waiting_time(backoff_time_in_seconds, response_or_exception)
 
             reset_time = response_or_exception.headers.get("X-RateLimit-Reset")
             if reset_time:
-                backoff_time_in_seconds = max(float(reset_time) - time.time(), min_backoff_time)
-                return self.get_waiting_time(backoff_time_in_seconds)
+                backoff_time_in_seconds = max(float(reset_time) - time.time(), self.min_backoff_time)
+                return self.get_waiting_time(backoff_time_in_seconds, response_or_exception)
         return None
 
-    def get_waiting_time(self, backoff_time_in_seconds: Optional[float]) -> Optional[float]:
+    def get_waiting_time(self, backoff_time_in_seconds: float, response: requests.Response) -> Optional[float]:
         if backoff_time_in_seconds < 60 * 10:  # type: ignore[operator]
             return backoff_time_in_seconds
         else:
-            self.stream._http_client._session.auth.update_token()  # New token will be used in next request
+            # New token will be used in the next request or fail if all tokens are exhausted
+            if response.status_code in self.RATE_LIMITS_STATUS_CODES:
+                self.stream._http_client._session.auth.find_available_token(response.request)
+            else:
+                self.stream._http_client._session.auth.update_token()
+
+            # update headers in the request itself so the next request will use new token
+            response.request.headers.update(self.stream._http_client._session.auth.get_auth_header())
+
             return 1
 
 

{airbyte_source_github-1.8.35 → airbyte_source_github-1.8.36.dev202507211247}/source_github/utils.py

@@ -76,8 +76,14 @@ class MultipleTokenAuthenticatorWithRateLimiter(AbstractHeaderAuthenticator):
             return {self.auth_header: self.token}
         return {}
 
-    def __call__(self, request):
-        """Attach the HTTP headers required to authenticate on the HTTP request"""
+    def find_available_token(self, request: requests.Request):
+        """
+        Iterates over each provided token and check their availability.
+        If no tokens are available or reset time is more than 10 minutes, an error is raised.
+        Method process_token() returns True is current token is available,
+        otherwise goes to the next token and sets it as current and checks for availability.
+        """
+
         while True:
             current_token = self._tokens[self.current_active_token]
             if "graphql" in request.path_url:
@@ -87,6 +93,11 @@ class MultipleTokenAuthenticatorWithRateLimiter(AbstractHeaderAuthenticator):
                 if self.process_token(current_token, "count_rest", "reset_at_rest"):
                     break
 
+    def __call__(self, request):
+        """Attach the HTTP headers required to authenticate on the HTTP request"""
+
+        self.find_available_token(request)
+
         request.headers.update(self.get_auth_header())
 
         return request