Merge branch 'main' into edgarrmondragon/break/crypto-deps-optional

cookiecutter/tap-template/{{cookiecutter.tap_id}}/{{cookiecutter.library_name}}/graphql-client.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import TYPE_CHECKING, Iterable
 
 import requests  # noqa: TCH002
 from singer_sdk.streams import {{ cookiecutter.stream_type }}Stream
@@ -12,6 +12,9 @@
 from {{ cookiecutter.library_name }}.auth import {{ cookiecutter.source_name }}Authenticator
 {%- endif %}
 
+if TYPE_CHECKING:
+    from singer_sdk.helpers.types import Context
+
 
 class {{ cookiecutter.source_name }}Stream({{ cookiecutter.stream_type }}Stream):
     """{{ cookiecutter.source_name }} stream class."""
@@ -67,7 +70,7 @@ def parse_response(self, response: requests.Response) -> Iterable[dict]:
     def post_process(
         self,
         row: dict,
-        context: dict | None = None,  # noqa: ARG002
+        context: Context | None = None,  # noqa: ARG002
     ) -> dict | None:
         """As needed, append or transform raw data to match expected structure.
 

cookiecutter/tap-template/{{cookiecutter.tap_id}}/{{cookiecutter.library_name}}/other-client.py

@@ -2,17 +2,20 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import TYPE_CHECKING, Iterable
 
 from singer_sdk.streams import Stream
 
+if TYPE_CHECKING:
+    from singer_sdk.helpers.types import Context
+
 
 class {{ cookiecutter.source_name }}Stream(Stream):
     """Stream class for {{ cookiecutter.source_name }} streams."""
 
     def get_records(
         self,
-        context: dict | None,  # noqa: ARG002
+        context: Context | None,  # noqa: ARG002
     ) -> Iterable[dict]:
         """Return a generator of record-type dictionary objects.
 

cookiecutter/tap-template/{{cookiecutter.tap_id}}/{{cookiecutter.library_name}}/rest-client.py

@@ -6,7 +6,7 @@
 {%- if cookiecutter.auth_method in ("OAuth2", "JWT") %}
 from functools import cached_property
 {%- endif %}
-from typing import Any, Callable, Iterable
+from typing import TYPE_CHECKING, Any, Callable, Iterable
 
 import requests
 {% if cookiecutter.auth_method  == "API Key" -%}
@@ -46,6 +46,10 @@
 else:
     import importlib_resources
 
+if TYPE_CHECKING:
+    from singer_sdk.helpers.types import Context
+
+
 _Auth = Callable[[requests.PreparedRequest], requests.PreparedRequest]
 
 # TODO: Delete this is if not using json files for schema definition
@@ -55,17 +59,18 @@
 class {{ cookiecutter.source_name }}Stream({{ cookiecutter.stream_type }}Stream):
     """{{ cookiecutter.source_name }} stream class."""
 
+    # Update this value if necessary or override `parse_response`.
+    records_jsonpath = "$[*]"
+
+    # Update this value if necessary or override `get_new_paginator`.
+    next_page_token_jsonpath = "$.next_page"  # noqa: S105
+
     @property
     def url_base(self) -> str:
         """Return the API URL root, configurable via tap settings."""
         # TODO: hardcode a value here, or retrieve it from self.config
         return "https://api.mysample.com"
 
-    records_jsonpath = "$[*]"  # Or override `parse_response`.
-
-    # Set this value or override `get_new_paginator`.
-    next_page_token_jsonpath = "$.next_page"  # noqa: S105
-
 {%- if cookiecutter.auth_method in ("OAuth2", "JWT") %}
 
     @cached_property
@@ -156,7 +161,7 @@ def get_new_paginator(self) -> BaseAPIPaginator:
 
     def get_url_params(
         self,
-        context: dict | None,  # noqa: ARG002
+        context: Context | None,  # noqa: ARG002
         next_page_token: Any | None,  # noqa: ANN401
     ) -> dict[str, Any]:
         """Return a dictionary of values to be used in URL parameterization.
@@ -178,7 +183,7 @@ def get_url_params(
 
     def prepare_request_payload(
         self,
-        context: dict | None,  # noqa: ARG002
+        context: Context | None,  # noqa: ARG002
         next_page_token: Any | None,  # noqa: ARG002, ANN401
     ) -> dict | None:
         """Prepare the data payload for the REST API request.
@@ -210,7 +215,7 @@ def parse_response(self, response: requests.Response) -> Iterable[dict]:
     def post_process(
         self,
         row: dict,
-        context: dict | None = None,  # noqa: ARG002
+        context: Context | None = None,  # noqa: ARG002
     ) -> dict | None:
         """As needed, append or transform raw data to match expected structure.
 

docs/conf.py

@@ -15,6 +15,7 @@
 from __future__ import annotations
 
 import sys
+from datetime import datetime
 from pathlib import Path
 
 sys.path.insert(0, str(Path("..").resolve()))
@@ -23,7 +24,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "Meltano Singer SDK"
-copyright = "2021, Meltano Core Team and Contributors"  # noqa: A001
+copyright = f"{datetime.now().year}, Arch Data, Inc and Contributors"  # noqa: A001, DTZ005
 author = "Meltano Core Team and Contributors"
 
 # The full version, including alpha/beta/rc tags

pyproject.toml

@@ -211,6 +211,7 @@ omit = [
     "tests/*",
     "samples/*",
     "singer_sdk/helpers/_compat.py",
+    "singer_sdk/helpers/types.py",
 ]
 
 [tool.coverage.report]

singer_sdk/helpers/_state.py

@@ -11,6 +11,8 @@
 if t.TYPE_CHECKING:
     import datetime
 
+    from singer_sdk.helpers import types
+
     _T = t.TypeVar("_T", datetime.datetime, str, int, float)
 
 PROGRESS_MARKERS = "progress_markers"
@@ -70,7 +72,7 @@ def get_state_partitions_list(tap_state: dict, tap_stream_id: str) -> list[dict]
 
 def _find_in_partitions_list(
     partitions: list[dict],
-    state_partition_context: dict,
+    state_partition_context: types.Context,
 ) -> dict | None:
     found = [
         partition_state
@@ -88,7 +90,7 @@ def _find_in_partitions_list(
 
 def _create_in_partitions_list(
     partitions: list[dict],
-    state_partition_context: dict,
+    state_partition_context: types.Context,
 ) -> dict:
     # Existing partition not found. Creating new state entry in partitions list...
     new_partition_state = {"context": state_partition_context}
@@ -99,7 +101,7 @@ def _create_in_partitions_list(
 def get_writeable_state_dict(
     tap_state: dict,
     tap_stream_id: str,
-    state_partition_context: dict | None = None,
+    state_partition_context: types.Context | None = None,
 ) -> dict:
     """Return the stream or partition state, creating a new one if it does not exist.
 
@@ -283,8 +285,8 @@ def log_sort_error(
     ex: Exception,
     log_fn: t.Callable,
     stream_name: str,
-    current_context: dict | None,
-    state_partition_context: dict | None,
+    current_context: types.Context | None,
+    state_partition_context: types.Context | None,
     record_count: int,
     partition_record_count: int,
 ) -> None:

singer_sdk/helpers/types.py

@@ -0,0 +1,24 @@
+"""Type aliases for use in the SDK."""
+
+from __future__ import annotations
+
+import sys
+import typing as t
+
+if sys.version_info < (3, 9):
+    from typing import Mapping  # noqa: ICN003
+else:
+    from collections.abc import Mapping
+
+if sys.version_info < (3, 10):
+    from typing_extensions import TypeAlias
+else:
+    from typing import TypeAlias  # noqa: ICN003
+
+__all__ = [
+    "Context",
+    "Record",
+]
+
+Context: TypeAlias = Mapping
+Record: TypeAlias = t.Dict[str, t.Any]

singer_sdk/metrics.py

@@ -20,8 +20,10 @@
 if t.TYPE_CHECKING:
     from types import TracebackType
 
+    from singer_sdk.helpers import types
     from singer_sdk.helpers._compat import Traversable
 
+
 DEFAULT_LOG_INTERVAL = 60.0
 METRICS_LOGGER_NAME = __name__
 METRICS_LOG_LEVEL_SETTING = "metrics_log_level"
@@ -117,7 +119,7 @@ def __init__(self, metric: Metric, tags: dict | None = None) -> None:
         self.logger = get_metrics_logger()
 
     @property
-    def context(self) -> dict | None:
+    def context(self) -> types.Context | None:
         """Get the context for this meter.
 
         Returns:
@@ -126,7 +128,7 @@ def context(self) -> dict | None:
         return self.tags.get(Tag.CONTEXT)
 
     @context.setter
-    def context(self, value: dict | None) -> None:
+    def context(self, value: types.Context | None) -> None:
         """Set the context for this meter.
 
         Args: