Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support other content-types in REST streams #2762

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@ def http_headers(self) -> dict:
Returns:
A dictionary of HTTP headers.
"""
headers = {}
if "user_agent" in self.config:
headers["User-Agent"] = self.config.get("user_agent")
{%- if cookiecutter.auth_method not in ("OAuth2", "JWT") %}
# If not using an authenticator, you may also provide inline auth headers:
# headers["Private-Token"] = self.config.get("auth_token")
{%- endif %}
return headers
return {}

def parse_response(self, response: requests.Response) -> t.Iterable[dict]:
"""Parse the response and return an iterator of result records.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,11 @@ def http_headers(self) -> dict:
Returns:
A dictionary of HTTP headers.
"""
headers = {}
if "user_agent" in self.config:
headers["User-Agent"] = self.config.get("user_agent")
{%- if cookiecutter.auth_method not in ("OAuth2", "JWT") %}
# If not using an authenticator, you may also provide inline auth headers:
# headers["Private-Token"] = self.config.get("auth_token") # noqa: ERA001
{%- endif %}
return headers
return {}

def get_new_paginator(self) -> BaseAPIPaginator:
"""Create a new pagination helper instance.
Expand Down
10 changes: 10 additions & 0 deletions docs/_templates/stream_class.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{{ fullname }}
{{ "=" * fullname|length }}

.. currentmodule:: {{ module }}

.. autoclass:: {{ name }}
:members:
:show-inheritance:
:inherited-members: Stream
:special-members: __init__
4 changes: 3 additions & 1 deletion docs/classes/singer_sdk.GraphQLStream.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

.. autoclass:: GraphQLStream
:members:
:special-members: __init__, __call__
:show-inheritance:
:inherited-members: Stream
:special-members: __init__
4 changes: 3 additions & 1 deletion docs/classes/singer_sdk.RESTStream.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

.. autoclass:: RESTStream
:members:
:special-members: __init__, __call__
:show-inheritance:
:inherited-members: Stream
:special-members: __init__
4 changes: 3 additions & 1 deletion docs/classes/singer_sdk.SQLStream.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

.. autoclass:: SQLStream
:members:
:special-members: __init__, __call__
:show-inheritance:
:inherited-members: Stream
:special-members: __init__
4 changes: 3 additions & 1 deletion docs/classes/singer_sdk.Stream.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

.. autoclass:: Stream
:members:
:special-members: __init__, __call__
:show-inheritance:
:inherited-members: Stream
:special-members: __init__
2 changes: 1 addition & 1 deletion docs/reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Stream Classes

.. autosummary::
:toctree: classes
:template: class.rst
:template: stream_class.rst

Stream
RESTStream
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ filterwarnings = [
# https://github.com/meltano/sdk/issues/1354
"ignore:The function singer_sdk.testing.get_standard_tap_tests is deprecated:DeprecationWarning",
# https://github.com/meltano/sdk/issues/2744
"ignore::singer_sdk.helpers._compat.SingerSDKDeprecationWarning",
"default::singer_sdk.helpers._compat.SingerSDKDeprecationWarning",
# TODO: Address this SQLite warning in Python 3.13+
"ignore::ResourceWarning",
]
Expand Down
20 changes: 10 additions & 10 deletions singer_sdk/authenticators.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
if t.TYPE_CHECKING:
import logging

from singer_sdk.streams.rest import RESTStream
from singer_sdk.streams.rest import _HTTPStream


def _add_parameters(initial_url: str, extra_parameters: dict) -> str:
Expand Down Expand Up @@ -91,7 +91,7 @@ class APIAuthenticatorBase:
auth_params: URL query parameters for authentication.
"""

def __init__(self, stream: RESTStream) -> None:
def __init__(self, stream: _HTTPStream) -> None:
"""Init authenticator.
Args:
Expand Down Expand Up @@ -156,7 +156,7 @@ class SimpleAuthenticator(APIAuthenticatorBase):

def __init__(
self,
stream: RESTStream,
stream: _HTTPStream,
auth_headers: dict | None = None,
) -> None:
"""Create a new authenticator.
Expand Down Expand Up @@ -186,7 +186,7 @@ class APIKeyAuthenticator(APIAuthenticatorBase):

def __init__(
self,
stream: RESTStream,
stream: _HTTPStream,
key: str,
value: str,
location: str = "header",
Expand Down Expand Up @@ -221,7 +221,7 @@ def __init__(
@classmethod
def create_for_stream(
cls: type[APIKeyAuthenticator],
stream: RESTStream,
stream: _HTTPStream,
key: str,
value: str,
location: str,
Expand Down Expand Up @@ -249,7 +249,7 @@ class BearerTokenAuthenticator(APIAuthenticatorBase):
'Bearer '. The token will be merged with HTTP headers on the stream.
"""

def __init__(self, stream: RESTStream, token: str) -> None:
def __init__(self, stream: _HTTPStream, token: str) -> None:
"""Create a new authenticator.
Args:
Expand All @@ -266,7 +266,7 @@ def __init__(self, stream: RESTStream, token: str) -> None:
@classmethod
def create_for_stream(
cls: type[BearerTokenAuthenticator],
stream: RESTStream,
stream: _HTTPStream,
token: str,
) -> BearerTokenAuthenticator:
"""Create an Authenticator object specific to the Stream class.
Expand Down Expand Up @@ -299,7 +299,7 @@ class BasicAuthenticator(APIAuthenticatorBase):

def __init__(
self,
stream: RESTStream,
stream: _HTTPStream,
username: str,
password: str,
) -> None:
Expand All @@ -323,7 +323,7 @@ def __init__(
@classmethod
def create_for_stream(
cls: type[BasicAuthenticator],
stream: RESTStream,
stream: _HTTPStream,
username: str,
password: str,
) -> BasicAuthenticator:
Expand All @@ -346,7 +346,7 @@ class OAuthAuthenticator(APIAuthenticatorBase):

def __init__(
self,
stream: RESTStream,
stream: _HTTPStream,
auth_endpoint: str | None = None,
oauth_scopes: str | None = None,
default_expiration: int | None = None,
Expand Down
Loading
Loading