Merge branch 'main' into feat/conform-primitive-interpret-string

Author: edgarrmondragon

.github/dependabot.yml

@@ -6,7 +6,6 @@ updates:
     schedule:
       interval: weekly
       time: "12:00"
-    reviewers: [meltano/engineering]
     labels: [Dependencies]
     groups:
       development-dependencies:
@@ -19,7 +18,6 @@ updates:
     schedule:
       interval: weekly
       time: "12:00"
-    reviewers: [meltano/engineering]
     labels: [Dependencies]
     groups:
       ci:
@@ -29,7 +27,6 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
-    reviewers: [meltano/engineering]
     labels: [Dependencies]
     groups:
       actions:

.github/workflows/api-changes.yml

@@ -37,7 +37,7 @@ jobs:
       with:
         python-version: 3.x
 
-    - uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+    - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
 

.github/workflows/codeql-analysis.yml

@@ -45,7 +45,7 @@ jobs:
         persist-credentials: false
 
     # Initializes the CodeQL tools for scanning.
-    - uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+    - uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
       with:
         config-file: .github/codeql-config.yml
         languages: ${{ matrix.language }}
@@ -59,7 +59,7 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+    - uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,4 +71,4 @@ jobs:
     #   echo "Run, Build Application using script"
     #   ./location_of_script_within_repo/buildscript.sh
 
-    - uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+    - uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17

.github/workflows/codspeed.yml

@@ -48,7 +48,7 @@ jobs:
         architecture: x64
 
     - name: Install uv
-      uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+      uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
 

.github/workflows/cookiecutter-e2e.yml

@@ -42,7 +42,7 @@ jobs:
       with:
         fetch-depth: 0
         persist-credentials: false
-    - uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+    - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
     - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
       with:
         name: Packages
         path: dist
-    - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+    - uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
       id: attest
       with:
         subject-path: "./dist/singer_sdk*"

.github/workflows/resources/requirements.txt

@@ -1,4 +1,4 @@
 griffe~=1.7
-nox==2025.2.9
+nox==2025.5.1
 pre-commit==4.2.0
 twine==6.1.0

.github/workflows/test.yml

@@ -75,7 +75,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
 
-    - uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+    - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
 
@@ -125,7 +125,7 @@ jobs:
       with:
         python-version: ${{ env.NOXPYTHON }}
 
-    - uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+    - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
 
@@ -159,7 +159,7 @@ jobs:
         pattern: coverage-data-*
         merge-multiple: true
 
-    - uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+    - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
       with:
         version: ">=0.6,<0.7"
 

.github/workflows/zizmor.yml

@@ -24,15 +24,15 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c7f87aa956e4c323abf06d5dec078e358f6b4d04 # v6.0.0
+        uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
         with:
           version: ">=0.6,<0.7"
 
       - name: Run zizmor 🌈
         run: uvx zizmor --pedantic --format sarif .github > results.sarif
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif
           category: zizmor

docs/implementation/logging.md

@@ -80,18 +80,27 @@ This will send metrics to a `metrics.log`:
 
 ## For package developers
 
-If you're developing a tap or target package and would like to customize its logging configuration, you can put a `default_loggging.yml` file in the package root to set the default logging configuration for your package. This file will be used if the `SINGER_SDK_LOG_CONFIG` environment variable is not set:
+If you're developing a tap or target package and would like to customize its logging, you can call [`logging.config.dictConfig`](inv:python:py:function:#logging.config.dictConfig) with a logging [configuration dictionary](inv:python:std:label:#logging-config-dictschema)
+in the main plugin module:
 
-```
-.
-├── README.md
-├── pyproject.toml
-├── uv.lock
-└── tap_example
-    ├── __init__.py
-    ├── __main__.py
-    ├── default_logging.yml  # <-- This file will be used if SINGER_SDK_LOG_CONFIG is not set
-    ├── client.py
-    ├── streams.py
-    └── tap.py
+```python
+# tap_example/tap.py
+
+import logging.config
+
+logging.config.dictConfig(
+    {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "loggers": {
+            "some_package.some_module": {
+                "level": "WARNING",
+            },
+        },
+    },
+)
+
+
+class MyTap(Tap):
+    ...
 ```

pyproject.toml

@@ -261,6 +261,8 @@ DEP002 = [
     "paramiko",
     "fs-s3fs",
     "s3fs",
+    # Legacy dependencies
+    "importlib-resources",
 ]
 DEP004 = [
     # TODO: Make pytest a runtime dependency?

singer_sdk/about.py

@@ -6,7 +6,6 @@
 import dataclasses
 import json
 import typing as t
-from collections import OrderedDict
 from textwrap import dedent
 
 from packaging.specifiers import SpecifierSet
@@ -164,17 +163,15 @@ def format_about(self, about_info: AboutInfo) -> str:
         Returns:
             A formatted string.
         """
-        data = OrderedDict(
-            [
-                ("name", about_info.name),
-                ("description", about_info.description),
-                ("version", about_info.version),
-                ("sdk_version", about_info.sdk_version),
-                ("supported_python_versions", about_info.supported_python_versions),
-                ("capabilities", [c.value for c in about_info.capabilities]),
-                ("settings", about_info.settings),
-            ],
-        )
+        data = {
+            "name": about_info.name,
+            "description": about_info.description,
+            "version": about_info.version,
+            "sdk_version": about_info.sdk_version,
+            "supported_python_versions": about_info.supported_python_versions,
+            "capabilities": [c.value for c in about_info.capabilities],
+            "settings": about_info.settings,
+        }
         return json.dumps(data, indent=self.indent, default=self.default)
 
 

singer_sdk/default_logging.yml

@@ -45,7 +45,10 @@ def to_json_compatible(val: t.Any) -> t.Any:  # noqa: ANN401
     """Return as string if datetime. JSON does not support proper datetime types."""
     if isinstance(val, (datetime.datetime,)):
         # Make naive datetimes UTC
-        return (val.replace(tzinfo=UTC) if val.tzinfo is None else val).isoformat("T")
+        return (val.replace(tzinfo=UTC) if val.tzinfo is None else val).isoformat(
+            "T",
+            timespec="microseconds",
+        )
     if isinstance(val, (uuid.UUID,)):
         return str(val)
     return val

singer_sdk/helpers/_resources.py

@@ -8,15 +8,12 @@
 import logging
 import logging.config
 import os
+import sys
 import typing as t
 from dataclasses import dataclass, field
 from pathlib import Path
 from time import time
 
-import yaml
-
-from singer_sdk.helpers._resources import get_package_files
-
 if t.TYPE_CHECKING:
     from types import TracebackType
 
@@ -388,7 +385,7 @@ def sync_timer(stream: str, **tags: t.Any) -> Timer:
     return Timer(Metric.SYNC_DURATION, tags)
 
 
-def _load_yaml_logging_config(path: Traversable | Path) -> t.Any:  # noqa: ANN401
+def _load_yaml_logging_config(path: Traversable | Path) -> t.Any:  # noqa: ANN401 # pragma: no cover
     """Load the logging config from the YAML file.
 
     Args:
@@ -397,33 +394,42 @@ def _load_yaml_logging_config(path: Traversable | Path) -> t.Any:  # noqa: ANN40
     Returns:
         The logging config.
     """
+    import yaml  # noqa: PLC0415
+
     with path.open() as f:
         return yaml.safe_load(f)
 
 
-def _get_default_config_path(package: str) -> Traversable:
-    """Get a logging configuration.
-
-    Args:
-        package: The package name to get the logging configuration for.
-
-    Returns:
-        A logging configuration.
-    """
-    filename = "default_logging.yml"
-    path = get_package_files(package) / filename
-    return path if path.is_file() else get_package_files("singer_sdk") / filename
-
-
-def _setup_logging(config: t.Mapping[str, t.Any], *, package: str) -> None:
+def _setup_logging(config: t.Mapping[str, t.Any]) -> None:
     """Setup logging.
 
     Args:
         package: The package name to get the logging configuration for.
         config: A plugin configuration dictionary.
     """
-    path = _get_default_config_path(package)
-    logging.config.dictConfig(_load_yaml_logging_config(path))
+    logging.config.dictConfig(
+        {
+            "version": 1,
+            "disable_existing_loggers": False,
+            "formatters": {
+                "console": {
+                    "format": "{asctime:23s} | {levelname:8s} | {name:20s} | {message}",
+                    "style": "{",
+                }
+            },
+            "handlers": {
+                "default": {
+                    "()": logging.StreamHandler,
+                    "formatter": "console",
+                    "stream": sys.stderr,
+                },
+            },
+            "root": {
+                "level": logging.INFO,
+                "handlers": ["default"],
+            },
+        },
+    )
 
     config = config or {}
     metrics_log_level = config.get(METRICS_LOG_LEVEL_SETTING, "INFO").upper()

singer_sdk/helpers/_typing.py

@@ -93,6 +93,20 @@ def __repr__(self) -> str:
         """
         return str(self)
 
+    def continue_if_empty(self, response: requests.Response) -> bool:  # noqa: ARG002, PLR6301
+        """Check if pagination should continue even if the response is empty.
+
+        Override this method to keep the pagination going even if the page retrieved
+        from the API is empty but the next one may have records.
+
+        Args:
+            response: API response object.
+
+        Returns:
+            Boolean flag used to indicate if the endpoint has more pages.
+        """
+        return False
+
     def advance(self, response: requests.Response) -> None:
         """Get a new page value and advance the current one.
 

singer_sdk/metrics.py

@@ -208,10 +208,7 @@ def __init__(
             if self._is_secret_config(k):
                 config_dict[k] = SecretString(v)
         self._config = config_dict
-        metrics._setup_logging(  # noqa: SLF001
-            self.config,
-            package=self.__module__.split(".", maxsplit=1)[0],
-        )
+        metrics._setup_logging(self.config)  # noqa: SLF001
         self.metrics_logger = metrics.get_metrics_logger()
 
         self._validate_config(raise_errors=validate_config)