Merge branch 'pnilan/feat/implement-validators' into pnilan/feat/extend-spec-class-for-config-migrations

Author: pnilan

airbyte_cdk/sources/declarative/validators/dpath_validator.py

@@ -47,19 +47,13 @@ def validate(self, input_data: dict[str, Any]) -> None:
         if "*" in path:
             try:
                 values = dpath.values(input_data, path)
-            except KeyError as e:
-                raise KeyError(f"Error validating path '{self.field_path}': {e}")
-            for value in values:
-                try:
+                for value in values:
                     self.strategy.validate(value)
-                except Exception as e:
-                    raise ValueError(f"Error validating value '{value}': {e}")
+            except KeyError as e:
+                raise ValueError(f"Error validating path '{self.field_path}': {e}")
         else:
             try:
                 value = dpath.get(input_data, path)
-            except KeyError as e:
-                raise KeyError(f"Error validating path '{self.field_path}': {e}")
-            try:
                 self.strategy.validate(value)
-            except Exception as e:
-                raise ValueError(f"Error validating value '{value}': {e}")
+            except KeyError as e:
+                raise ValueError(f"Error validating path '{self.field_path}': {e}")

unit_tests/sources/declarative/validators/test_dpath_validator.py

@@ -38,10 +38,11 @@ def test_given_invalid_path_when_validate_then_raise_key_error(self):
 
         test_data = {"user": {"profile": {"email": "[email protected]"}}}
 
-        with pytest.raises(KeyError) as context:
+        with pytest.raises(ValueError) as context:
             validator.validate(test_data)
-            assert "Error validating path" in str(context.exception)
-            assert not strategy.validate_called
+
+        assert "Error validating path" in str(context.value)
+        assert not strategy.validate_called
 
     def test_given_strategy_fails_when_validate_then_raise_value_error(self):
         error_message = "Invalid email format"
@@ -53,10 +54,8 @@ def test_given_strategy_fails_when_validate_then_raise_value_error(self):
         with pytest.raises(ValueError) as context:
             validator.validate(test_data)
 
-            assert "Error validating value" in str(context.exception)
-            assert error_message in str(context.exception)
-            assert strategy.validate_called
-            assert strategy.validated_value == "invalid-email"
+        assert strategy.validate_called
+        assert strategy.validated_value == "invalid-email"
 
     def test_given_empty_path_list_when_validate_then_validate_raises_exception(self):
         strategy = MockValidationStrategy()
@@ -72,7 +71,7 @@ def test_given_empty_input_data_when_validate_then_validate_raises_exception(sel
 
         test_data = {}
 
-        with pytest.raises(KeyError):
+        with pytest.raises(ValueError):
             validator.validate(test_data)
 
     def test_path_with_wildcard_when_validate_then_validate_is_successful(self):

unit_tests/sources/declarative/validators/test_predicate_validator.py

@@ -40,9 +40,9 @@ def test_given_invalid_input_when_validate_then_raise_value_error(self):
         with pytest.raises(ValueError) as context:
             validator.validate()
 
-            assert error_message in str(context.exception)
-            assert strategy.validate_called
-            assert strategy.validated_value == test_value
+        assert error_message in str(context.value)
+        assert strategy.validate_called
+        assert strategy.validated_value == test_value
 
     def test_given_complex_object_when_validate_then_successful(self):
         strategy = MockValidationStrategy()