Skip to content

Commit d524416

Browse files
committed
fix: correct index column reference in validation function
1 parent ac7612a commit d524416

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/mavedb/lib/validation/dataframe/calibration.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def validate_and_standardize_calibration_classes_dataframe(
8080
validate_data_column(standardized_classes_df[c], force_numeric=False)
8181
validate_calibration_classes(calibration, standardized_classes_df[c])
8282

83-
if c == index_column:
83+
if column_mapping[c] == index_column:
8484
validate_index_existence_in_score_set(
8585
db, score_set, standardized_classes_df[column_mapping[c]], column_mapping[c]
8686
)
@@ -150,9 +150,6 @@ def validate_index_existence_in_score_set(
150150
Returns:
151151
None: Function returns nothing if validation passes.
152152
"""
153-
print(index_column.tolist())
154-
print(index_column_name)
155-
156153
if index_column_name.lower() == calibration_variant_column_name:
157154
existing_resources = set(
158155
db.scalars(

tests/validation/dataframe/test_calibration.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ def test_validate_and_standardize_calibration_classes_dataframe_drops_null_class
185185

186186
assert result.equals(expected_df)
187187

188-
def test_validate_and_standardize_calibration_classes_dataframe_invalid_variants(self, mock_dependencies):
188+
def test_validate_and_standardize_calibration_classes_dataframe_propagates_nonexistent_variants(
189+
self, mock_dependencies
190+
):
189191
"""Test ValidationError when variant URN validation fails."""
190192
mock_db = Mock()
191193
mock_score_set = Mock()
@@ -204,6 +206,14 @@ def test_validate_and_standardize_calibration_classes_dataframe_invalid_variants
204206
mock_scalars.all.return_value = []
205207
mock_db.scalars.return_value = mock_scalars
206208

209+
mock_classification1 = Mock()
210+
mock_classification1.class_ = "A"
211+
mock_calibration.functional_classifications = [mock_classification1]
212+
213+
mock_dependencies["validate_index_existence_in_score_set"].side_effect = ValidationError(
214+
"The following resources do not exist in the score set: var1"
215+
)
216+
207217
with pytest.raises(ValidationError, match="The following resources do not exist in the score set: var1"):
208218
validate_and_standardize_calibration_classes_dataframe(mock_db, mock_score_set, mock_calibration, input_df)
209219

0 commit comments

Comments
 (0)