airbyte-source-github 2.1.16.dev202603190200__tar.gz → 2.1.18__tar.gz

{airbyte_source_github-2.1.16.dev202603190200 → airbyte_source_github-2.1.18}/PKG-INFO

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

{airbyte_source_github-2.1.16.dev202603190200 → airbyte_source_github-2.1.18}/pyproject.toml

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

{airbyte_source_github-2.1.16.dev202603190200 → airbyte_source_github-2.1.18}/source_github/source.py

@@ -9,7 +9,6 @@ from urllib.parse import urlparse
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.sources import AbstractSource
 from airbyte_cdk.sources.streams import Stream
-from airbyte_cdk.sources.streams.http.http_client import MessageRepresentationAirbyteTracedErrors
 from airbyte_cdk.sources.streams.http.requests_native_auth import MultipleTokenAuthenticator
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 from source_github.utils import MultipleTokenAuthenticatorWithRateLimiter
@@ -204,7 +203,7 @@ class SourceGithub(AbstractSource):
                 )
             return True, None
 
-        except MessageRepresentationAirbyteTracedErrors as e:
+        except AirbyteTracedException as e:
             user_message = self.user_friendly_error_message(e.message)
             return False, user_message or e.message
         except Exception as e:

{airbyte_source_github-2.1.16.dev202603190200 → airbyte_source_github-2.1.18}/source_github/spec.json

@@ -150,26 +150,17 @@
     "predicate_value": "OAuth Credentials",
     "oauth_config_specification": {
       "oauth_connector_input_specification": {
-        "consent_url": "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": "https://github.com/login/oauth/access_token",
-        "access_token_headers": {
-          "Content-Type": "application/x-www-form-urlencoded"
-        },
-        "access_token_params": {
-          "code": "{{ auth_code_value }}",
-          "client_id": "{{ client_id_value }}",
-          "client_secret": "{{ client_secret_value }}",
-          "redirect_uri": "{{ redirect_uri_value }}"
-        },
         "scopes": [
-          {"scope": "repo"},
-          {"scope": "read:org"},
-          {"scope": "read:repo_hook"},
-          {"scope": "read:user"},
-          {"scope": "read:project"},
-          {"scope": "read:discussion"},
-          {"scope": "workflow"}
+          { "scope": "repo" },
+          { "scope": "read:org" },
+          { "scope": "read:repo_hook" },
+          { "scope": "read:user" },
+          { "scope": "read:project" },
+          { "scope": "read:discussion" },
+          { "scope": "workflow" }
         ],
+        "consent_url": "https://github.com/login/oauth/authorize?{{client_id_param}}&{{redirect_uri_param}}&{{scopes_param}}&{{state_param}}",
+        "access_token_url": "https://github.com/login/oauth/access_token?{{client_id_param}}&{{client_secret_param}}&{{auth_code_param}}&{{redirect_uri_param}}",
         "extract_output": ["access_token"]
       },
       "complete_oauth_output_specification": {

{airbyte_source_github-2.1.16.dev202603190200 → airbyte_source_github-2.1.18}/source_github/streams.py

@@ -3,6 +3,7 @@
 #
 
 import base64
+import binascii
 import re
 import struct
 from abc import ABC, abstractmethod
@@ -22,7 +23,6 @@ from airbyte_cdk.sources.streams.core import CheckpointMixin, Stream
 from airbyte_cdk.sources.streams.http import HttpStream
 from airbyte_cdk.sources.streams.http.error_handlers import ErrorHandler, ErrorResolution, HttpStatusErrorHandler, ResponseAction
 from airbyte_cdk.sources.streams.http.exceptions import DefaultBackoffException, UserDefinedBackoffException
-from airbyte_cdk.sources.streams.http.http_client import MessageRepresentationAirbyteTracedErrors
 from airbyte_cdk.utils import AirbyteTracedException
 from airbyte_cdk.utils.datetime_helpers import ab_datetime_format, ab_datetime_parse
 
@@ -133,12 +133,12 @@ class GithubStreamABC(HttpStream, ABC):
         # Reading records while handling the errors
         try:
             yield from super().read_records(stream_slice=stream_slice, **kwargs)
-        # HTTP Client wraps DefaultBackoffException into MessageRepresentationAirbyteTracedErrors
-        except MessageRepresentationAirbyteTracedErrors as e:
+        # HTTP Client wraps DefaultBackoffException into AirbyteTracedException
+        except AirbyteTracedException as e:
             # This whole try/except situation in `read_records()` isn't good but right now in `self._send_request()`
             # function we have `response.raise_for_status()` so we don't have much choice on how to handle errors.
             # Bocked on https://github.com/airbytehq/airbyte/issues/3514.
-            if not hasattr(e, "_exception") and not hasattr(e._exception, "response"):
+            if not hasattr(e, "_exception") or not hasattr(e._exception, "response"):
                 raise e
             if e._exception.response.status_code == requests.codes.NOT_FOUND:
                 # A lot of streams are not available for repositories owned by a user instead of an organization.
@@ -828,7 +828,7 @@ class Releases(SemiIncrementalMixin, GitHubGraphQLStream):
             decoded = base64.urlsafe_b64decode(encoded + "==")
             if len(decoded) >= 4:
                 return struct.unpack(">I", decoded[-4:])[0]
-        except Exception:
+        except (ValueError, struct.error, binascii.Error):
             return None
         return None
 
@@ -1811,8 +1811,8 @@ class ContributorActivity(GithubStream):
         repository = stream_slice.get("repository", "")
         try:
             yield from super().read_records(stream_slice=stream_slice, **kwargs)
-        # HTTP Client wraps BackoffException into MessageRepresentationAirbyteTracedErrors
-        except MessageRepresentationAirbyteTracedErrors as e:
+        # HTTP Client wraps BackoffException into AirbyteTracedException
+        except AirbyteTracedException as e:
             if hasattr(e, "_exception") and hasattr(e._exception, "response"):
                 if e._exception.response.status_code == requests.codes.ACCEPTED:
                     yield AirbyteMessage(
@@ -1829,6 +1829,8 @@ class ContributorActivity(GithubStream):
                     partition_obj = stream_slice.get("partition")
                     if self.cursor and partition_obj:
                         self.cursor.close_slice(StreamSlice(cursor_slice={}, partition=partition_obj))
+                else:
+                    raise e
             else:
                 raise e