Skip to content

Commit 6542b4f

Browse files
authored
Fix invalid value types for item_schema (#43926)
* Fix invalid value types for item_schema * Fix linter issues
1 parent 07cbf94 commit 6542b4f

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_evaluate/_evaluate_aoai.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,12 @@ def _begin_single_aoai_evaluation(
217217

218218

219219
def _combine_item_schemas(data_source_config: Dict[str, Any], kwargs: Dict[str, Any]) -> None:
220-
if "item_schema" not in kwargs or "properties" not in kwargs["item_schema"]:
220+
if (
221+
not kwargs
222+
or not kwargs.get("item_schema")
223+
or not isinstance(kwargs["item_schema"], dict)
224+
or "properties" not in kwargs["item_schema"]
225+
):
221226
return
222227

223228
if "item_schema" in data_source_config:

sdk/evaluation/azure-ai-evaluation/tests/unittests/test_evaluate_aoai.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ def test_combine_item_schemas_without_item_schema(self, default_data_source_conf
6060
assert data_source_config["item_schema"]["properties"] == expected_properties
6161
assert data_source_config["item_schema"]["required"] == expected_required
6262

63+
# "item_schema" as None in kwargs
64+
kwargs = {"item_schema": None}
65+
_combine_item_schemas(data_source_config, kwargs)
66+
assert data_source_config["item_schema"]["properties"] == expected_properties
67+
assert data_source_config["item_schema"]["required"] == expected_required
68+
69+
# "item_schema" is a wrong value in kwargs
70+
kwargs = {"item_schema": 12345}
71+
_combine_item_schemas(data_source_config, kwargs)
72+
assert data_source_config["item_schema"]["properties"] == expected_properties
73+
assert data_source_config["item_schema"]["required"] == expected_required
74+
6375
# "item_schema" without "properties" in kwargs
6476
kwargs = {"item_schema": {}}
6577
_combine_item_schemas(data_source_config, kwargs)

0 commit comments

Comments
 (0)