Skip to content

Commit bd62a45

Browse files
account for OAI breaking changes (Azure#40984)
* fix oai version * remove oai from dev requirements * rerecord * adding new asset --------- Co-authored-by: Waqas Javed <[email protected]>
1 parent d6612d0 commit bd62a45

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

sdk/evaluation/azure-ai-evaluation/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/evaluation/azure-ai-evaluation",
5-
"Tag": "python/evaluation/azure-ai-evaluation_2b7d360048"
5+
"Tag": "python/evaluation/azure-ai-evaluation_64eea0ea34"
66
}

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/label_grader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import Any, Dict, Union, List
55

66
from azure.ai.evaluation._model_configurations import AzureOpenAIModelConfiguration, OpenAIModelConfiguration
7-
from openai.types.eval_create_params import TestingCriterionLabelModel
7+
from openai.types.graders import LabelModelGrader
88
from azure.ai.evaluation._common._experimental import experimental
99

1010
from .aoai_grader import AzureOpenAIGrader
@@ -55,7 +55,7 @@ def __init__(
5555
passing_labels: List[str],
5656
**kwargs: Any
5757
):
58-
grader = TestingCriterionLabelModel(
58+
grader = LabelModelGrader(
5959
input=input,
6060
labels=labels,
6161
model=model,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/string_check_grader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing_extensions import Literal
66

77
from azure.ai.evaluation._model_configurations import AzureOpenAIModelConfiguration, OpenAIModelConfiguration
8-
from openai.types.eval_string_check_grader import EvalStringCheckGrader
8+
from openai.types.graders import StringCheckGrader
99
from azure.ai.evaluation._common._experimental import experimental
1010

1111
from .aoai_grader import AzureOpenAIGrader
@@ -55,7 +55,7 @@ def __init__(
5555
reference: str,
5656
**kwargs: Any
5757
):
58-
grader = EvalStringCheckGrader(
58+
grader = StringCheckGrader(
5959
input=input,
6060
name=name,
6161
operation=operation,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/text_similarity_grader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing_extensions import Literal
66

77
from azure.ai.evaluation._model_configurations import AzureOpenAIModelConfiguration, OpenAIModelConfiguration
8-
from openai.types.eval_text_similarity_grader import EvalTextSimilarityGrader
8+
from openai.types.graders import TextSimilarityGrader
99
from azure.ai.evaluation._common._experimental import experimental
1010

1111
from .aoai_grader import AzureOpenAIGrader
@@ -76,7 +76,7 @@ def __init__(
7676
name: str,
7777
**kwargs: Any
7878
):
79-
grader = EvalTextSimilarityGrader(
79+
grader = TextSimilarityGrader(
8080
evaluation_metric=evaluation_metric,
8181
input=input,
8282
pass_threshold=pass_threshold,

sdk/evaluation/azure-ai-evaluation/dev_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ pytest-xdist
99
azure-ai-inference>=1.0.0b4
1010
azure-ai-projects
1111
aiohttp
12-
openai>=1.73.0
1312
-e ../azure-ai-evaluation

sdk/evaluation/azure-ai-evaluation/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"httpx>=0.25.1",
7878
# Dependencies added since Promptflow will soon be made optional
7979
"pandas>=2.1.2,<3.0.0",
80-
"openai>=1.73.0",
80+
"openai>=1.78.0",
8181
"ruamel.yaml>=0.17.10,<1.0.0",
8282
"msrest>=0.6.21",
8383
"Jinja2>=3.1.6",

sdk/evaluation/azure-ai-evaluation/tests/e2etests/test_aoai_graders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import pytest
88
from devtools_testutils import is_live
99

10-
from openai.types.eval_string_check_grader import EvalStringCheckGrader
10+
from openai.types.graders import StringCheckGrader
1111
from azure.ai.evaluation import (
1212
F1ScoreEvaluator,
1313
evaluate,
@@ -66,7 +66,7 @@ def test_evaluate_all_aoai_graders(self, model_config, data_file):
6666
# ---- General Grader Initialization ----
6767

6868
# Define an string check grader config directly using the OAI SDK
69-
oai_string_check_grader = EvalStringCheckGrader(
69+
oai_string_check_grader = StringCheckGrader(
7070
input="{{item.query}}",
7171
name="contains hello",
7272
operation="like",

0 commit comments

Comments
 (0)