chore: Do not ignore jsonschema in mypy checks (#1456)

mypy.ini

@@ -30,9 +30,6 @@ ignore_missing_imports = True
 [mypy-pandas.*]
 ignore_missing_imports = True
 
-[mypy-jsonschema.*]
-ignore_missing_imports = True
-
 [mypy-jsonpath_ng.*]
 ignore_missing_imports = True
 

noxfile.py

@@ -58,9 +58,10 @@ def mypy(session: Session) -> None:
         "pytest",
         "importlib-resources",
         "sqlalchemy2-stubs",
+        "types-jsonschema",
         "types-python-dateutil",
-        "types-requests",
         "types-pytz",
+        "types-requests",
         "types-simplejson",
         "types-PyYAML",
     )

pyproject.toml

@@ -98,7 +98,7 @@ testing = [
     "pytest-durations"
 ]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 # snowflake-connector-python = "2.0.4" # Removed: Too many version conflicts!
 commitizen-version-bump = { git = "https://github.com/meltano/commitizen-version-bump.git", branch = "main" }
 xdoctest = "^1.1.1"
@@ -110,12 +110,14 @@ freezegun = "^1.2.2"
 viztracer = {version = "^0.15.6", optional = true, python = "<3.11"}
 requests-mock = "^1.10.0"
 sqlalchemy2-stubs = {version = "^0.0.2a32", allow-prereleases = true}
+types-jsonschema = "^4.17.0.6"
 types-python-dateutil = "^2.8.19"
 types-pytz = "^2022.7.1.2"
 types-requests = "^2.28.11"
 types-simplejson = "^3.18.0"
 types-PyYAML = "^6.0.12"
 coverage = {extras = ["toml"], version = "^7.2"}
+pytest-snapshot = "^0.9.0"
 
 # Cookiecutter tests
 black = "^23.1"
@@ -124,9 +126,6 @@ flake8 = "^3.9.0"
 flake8-annotations = "^2.9.1"
 flake8-docstrings = "^1.7.0"
 
-[tool.poetry.group.dev.dependencies]
-pytest-snapshot = "^0.9.0"
-
 [tool.black]
 exclude = ".*simpleeval.*"
 

singer_sdk/_singerlib/schema.py

@@ -119,7 +119,7 @@ class _SchemaKey:
 
 def resolve_schema_references(
     schema: dict[str, t.Any],
-    refs: dict[str, dict] | None = None,
+    refs: dict[str, str] | None = None,
 ) -> dict:
     """Resolves and replaces json-schema $refs with the appropriate dict.
 

singer_sdk/plugin_base.py

@@ -12,7 +12,7 @@
 from typing import Any, Callable, Mapping, cast
 
 import click
-from jsonschema import Draft7Validator, SchemaError, ValidationError
+from jsonschema import Draft7Validator
 
 from singer_sdk import metrics
 from singer_sdk.configuration._dict_config import parse_environment_config
@@ -228,19 +228,18 @@ def _validate_config(
         errors: list[str] = []
         log_fn = self.logger.info
         config_jsonschema = self.config_jsonschema
+
         if config_jsonschema:
             self.append_builtin_config(config_jsonschema)
-            try:
-                self.logger.debug(
-                    f"Validating config using jsonschema: {config_jsonschema}"
-                )
-                validator = JSONSchemaValidator(config_jsonschema)
-                validator.validate(self._config)
-            except (ValidationError, SchemaError) as ex:
-                errors.append(str(ex.message))
+            self.logger.debug(
+                f"Validating config using jsonschema: {config_jsonschema}"
+            )
+            validator = JSONSchemaValidator(config_jsonschema)
+            errors = [e.message for e in validator.iter_errors(self._config)]
+
         if errors:
             summary = (
-                f"Config validation failed: {f'; '.join(errors)}\n"
+                f"Config validation failed: {'; '.join(errors)}\n"
                 f"JSONSchema was: {config_jsonschema}"
             )
             if raise_errors:
@@ -251,6 +250,7 @@ def _validate_config(
             summary = f"Config validation passed with {len(warnings)} warnings."
             for warning in warnings:
                 summary += f"\n{warning}"
+
         if warnings_as_errors and raise_errors and warnings:
             raise ConfigValidationError(
                 f"One or more warnings ocurred during validation: {warnings}"

singer_sdk/typing.py

@@ -47,10 +47,20 @@
 
 import json
 import sys
-from typing import Any, Generic, ItemsView, Mapping, TypeVar, Union, cast
+from typing import (
+    Any,
+    Generator,
+    Generic,
+    ItemsView,
+    Mapping,
+    MutableMapping,
+    TypeVar,
+    Union,
+    cast,
+)
 
 import sqlalchemy
-from jsonschema import validators
+from jsonschema import ValidationError, Validator, validators
 
 from singer_sdk.helpers._classproperty import classproperty
 from singer_sdk.helpers._typing import (
@@ -107,18 +117,29 @@
 ]
 
 
-def extend_validator_with_defaults(validator_class):  # noqa
+def extend_validator_with_defaults(validator_class):  # noqa: ANN001, ANN201
     """Fill in defaults, before validating with the provided JSON Schema Validator.
 
     See https://python-jsonschema.readthedocs.io/en/latest/faq/#why-doesn-t-my-schema-s-default-property-set-the-default-on-my-instance  # noqa
     for details.
+
+    Args:
+        validator_class: The JSON Schema Validator class to extend.
+
+    Returns:
+        The extended JSON Schema Validator class.
     """
     validate_properties = validator_class.VALIDATORS["properties"]
 
-    def set_defaults(validator, properties, instance, schema):  # noqa
-        for property, subschema in properties.items():
+    def set_defaults(
+        validator: Validator,
+        properties: Mapping[str, dict],
+        instance: MutableMapping[str, Any],
+        schema: dict,
+    ) -> Generator[ValidationError, None, None]:
+        for prop, subschema in properties.items():
             if "default" in subschema:
-                instance.setdefault(property, subschema["default"])
+                instance.setdefault(prop, subschema["default"])
 
         yield from validate_properties(
             validator,