airbyte-source-github 2.1.15.dev202603131159__tar.gz → 2.1.15.dev202603182232__tar.gz

{airbyte_source_github-2.1.15.dev202603131159 → airbyte_source_github-2.1.15.dev202603182232}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-source-github
-Version: 2.1.15.dev202603131159
+Version: 2.1.15.dev202603182232
 Summary: Source implementation for GitHub.
 Home-page: https://airbyte.com
 License: ELv2

{airbyte_source_github-2.1.15.dev202603131159 → airbyte_source_github-2.1.15.dev202603182232}/pyproject.toml

@@ -3,7 +3,7 @@ requires = [ "poetry-core>=1.0.0",]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "2.1.15.dev.202603131159"
+version = "2.1.15.dev.202603182232"
 name = "airbyte-source-github"
 description = "Source implementation for GitHub."
 authors = [ "Airbyte <contact@airbyte.io>",]

{airbyte_source_github-2.1.15.dev202603131159 → airbyte_source_github-2.1.15.dev202603182232}/source_github/spec.json

@@ -149,6 +149,36 @@
     "predicate_key": ["credentials", "option_title"],
     "predicate_value": "OAuth Credentials",
     "oauth_config_specification": {
+      "oauth_connector_input_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "consent_url": {
+            "type": "string",
+            "const": "https://github.com/login/oauth/authorize?client_id={{client_id_value}}&redirect_uri={{redirect_uri_value}}&state={{state_value}}&scope={{scopes_value | urlencode}}"
+          },
+          "access_token_url": {
+            "type": "string",
+            "const": "https://github.com/login/oauth/access_token"
+          },
+          "scopes": {
+            "type": "array",
+            "const": [
+              {"scope": "repo"},
+              {"scope": "read:org"},
+              {"scope": "read:repo_hook"},
+              {"scope": "read:user"},
+              {"scope": "read:project"},
+              {"scope": "read:discussion"},
+              {"scope": "workflow"}
+            ]
+          },
+          "extract_output": {
+            "type": "array",
+            "const": ["access_token"]
+          }
+        }
+      },
       "complete_oauth_output_specification": {
         "type": "object",
         "additionalProperties": false,

{airbyte_source_github-2.1.15.dev202603131159 → airbyte_source_github-2.1.15.dev202603182232}/source_github/streams.py

@@ -190,11 +190,11 @@ class GithubStreamABC(HttpStream, ABC):
 
             self.logger.warning(error_msg)
         except GitHubAPILimitException as e:
-            internal_message = f"Stream: `{self.name}`, slice: `{stream_slice}`. {e}"
-            message = "Rate limit exceeded for all configured GitHub API tokens."
-            raise AirbyteTracedException(
-                internal_message=internal_message, message=message, failure_type=FailureType.transient_error
-            ) from e
+            internal_message = (
+                f"Stream: `{self.name}`, slice: `{stream_slice}`. Limits for all provided tokens are reached, please try again later"
+            )
+            message = "Rate Limits for all provided tokens are reached. For more information please refer to documentation: https://docs.airbyte.com/integrations/sources/github#limitations--troubleshooting"
+            raise AirbyteTracedException(internal_message=internal_message, message=message, failure_type=FailureType.config_error) from e
 
 
 class GithubStream(GithubStreamABC):

{airbyte_source_github-2.1.15.dev202603131159 → airbyte_source_github-2.1.15.dev202603182232}/source_github/utils.py

@@ -170,10 +170,6 @@ class MultipleTokenAuthenticatorWithRateLimiter(AbstractHeaderAuthenticator):
         for token in self._tokens:
             self._check_token_limits(token)
 
-    # Maximum duration for a single sleep interval when waiting for rate limit reset.
-    # Kept short to allow the platform's heartbeat mechanism to detect the connector is still alive.
-    SLEEP_INTERVAL_SECONDS = 60
-
     def process_token(self, current_token, count_attr, reset_attr):
         if getattr(current_token, count_attr) > 0:
             setattr(current_token, count_attr, getattr(current_token, count_attr) - 1)
@@ -181,30 +177,10 @@ class MultipleTokenAuthenticatorWithRateLimiter(AbstractHeaderAuthenticator):
         elif all(getattr(x, count_attr) == 0 for x in self._tokens.values()):
             min_time_to_wait = min((getattr(x, reset_attr) - ab_datetime_now()).total_seconds() for x in self._tokens.values())
             if min_time_to_wait < self.max_time:
-                wait_time = max(min_time_to_wait, 0)
-                self._sleep_with_heartbeat(wait_time, count_attr)
+                time.sleep(min_time_to_wait if min_time_to_wait > 0 else 0)
                 self.check_all_tokens()
             else:
                 raise GitHubAPILimitException(f"Rate limits for all tokens ({count_attr}) were reached")
         else:
             self.update_token()
         return False
-
-    def _sleep_with_heartbeat(self, total_wait: float, count_attr: str) -> None:
-        """Sleep in small intervals, logging periodically so the platform heartbeat sees activity."""
-        remaining = total_wait
-        self._logger.info(
-            "Rate limit reached for all tokens (%s). Waiting %.0f seconds for reset.",
-            count_attr,
-            total_wait,
-        )
-        while remaining > 0:
-            interval = min(remaining, self.SLEEP_INTERVAL_SECONDS)
-            time.sleep(interval)
-            remaining -= interval
-            if remaining > 0:
-                self._logger.info(
-                    "Still waiting for rate limit reset (%s). %.0f seconds remaining.",
-                    count_attr,
-                    remaining,
-                )