Skip to content

Commit 8075698

Browse files
hannexhannex
committed
Reason models renamed to force tool_calls response
1 parent ebcab36 commit 8075698

48 files changed

Lines changed: 128 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deepeval/metrics/answer_relevancy/answer_relevancy.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ async def _a_generate_reason(self, input: str) -> str:
140140
score=format(self.score, ".2f"),
141141
)
142142
if self.using_native_model:
143-
res, cost = await self.model.a_generate(prompt, schema=Reason)
143+
res, cost = await self.model.a_generate(prompt, schema=AnswerRelevancyScoreReason)
144144
self.evaluation_cost += cost
145145
return res.reason
146146
else:
147147
try:
148-
res: Reason = await self.model.a_generate(
149-
prompt=prompt, schema=Reason
148+
res: AnswerRelevancyScoreReason = await self.model.a_generate(
149+
prompt=prompt, schema=AnswerRelevancyScoreReason
150150
)
151151
return res.reason
152152
except TypeError:
@@ -170,12 +170,12 @@ def _generate_reason(self, input: str) -> str:
170170
)
171171

172172
if self.using_native_model:
173-
res, cost = self.model.generate(prompt, schema=Reason)
173+
res, cost = self.model.generate(prompt, schema=AnswerRelevancyScoreReason)
174174
self.evaluation_cost += cost
175175
return res.reason
176176
else:
177177
try:
178-
res: Reason = self.model.generate(prompt=prompt, schema=Reason)
178+
res: AnswerRelevancyScoreReason = self.model.generate(prompt=prompt, schema=AnswerRelevancyScoreReason)
179179
return res.reason
180180
except TypeError:
181181
res = self.model.generate(prompt)

‎deepeval/metrics/answer_relevancy/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Verdicts(BaseModel):
1515
verdicts: List[AnswerRelevancyVerdict]
1616

1717

18-
class Reason(BaseModel):
18+
class AnswerRelevancyScoreReason(BaseModel):
1919
reason: str

‎deepeval/metrics/bias/bias.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ async def _a_generate_reason(self) -> str:
134134
)
135135

136136
if self.using_native_model:
137-
res, cost = await self.model.a_generate(prompt, schema=Reason)
137+
res, cost = await self.model.a_generate(prompt, schema=BiasScoreReason)
138138
self.evaluation_cost += cost
139139
return res.reason
140140
else:
141141
try:
142-
res: Reason = await self.model.a_generate(prompt, schema=Reason)
142+
res: BiasScoreReason = await self.model.a_generate(prompt, schema=BiasScoreReason)
143143
return res.reason
144144
except TypeError:
145145
res = await self.model.a_generate(prompt)
@@ -161,12 +161,12 @@ def _generate_reason(self) -> str:
161161
)
162162

163163
if self.using_native_model:
164-
res, cost = self.model.generate(prompt, schema=Reason)
164+
res, cost = self.model.generate(prompt, schema=BiasScoreReason)
165165
self.evaluation_cost += cost
166166
return res.reason
167167
else:
168168
try:
169-
res: Reason = self.model.generate(prompt, schema=Reason)
169+
res: BiasScoreReason = self.model.generate(prompt, schema=BiasScoreReason)
170170
return res.reason
171171
except TypeError:
172172
res = self.model.generate(prompt)

‎deepeval/metrics/bias/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ class Verdicts(BaseModel):
1616
verdicts: List[BiasVerdict]
1717

1818

19-
class Reason(BaseModel):
19+
class BiasScoreReason(BaseModel):
2020
reason: str

‎deepeval/metrics/contextual_precision/contextual_precision.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ async def _a_generate_reason(self, input: str):
144144
)
145145

146146
if self.using_native_model:
147-
res, cost = await self.model.a_generate(prompt, schema=Reason)
147+
res, cost = await self.model.a_generate(prompt, schema=ContextualPrecisionScoreReason)
148148
self.evaluation_cost += cost
149149
return res.reason
150150
else:
151151
try:
152-
res: Reason = await self.model.a_generate(prompt, schema=Reason)
152+
res: ContextualPrecisionScoreReason = await self.model.a_generate(prompt, schema=ContextualPrecisionScoreReason)
153153
return res.reason
154154
except TypeError:
155155
res = await self.model.a_generate(prompt)
@@ -171,12 +171,12 @@ def _generate_reason(self, input: str):
171171
)
172172

173173
if self.using_native_model:
174-
res, cost = self.model.generate(prompt, schema=Reason)
174+
res, cost = self.model.generate(prompt, schema=ContextualPrecisionScoreReason)
175175
self.evaluation_cost += cost
176176
return res.reason
177177
else:
178178
try:
179-
res: Reason = self.model.generate(prompt, schema=Reason)
179+
res: ContextualPrecisionScoreReason = self.model.generate(prompt, schema=ContextualPrecisionScoreReason)
180180
return res.reason
181181
except TypeError:
182182
res = self.model.generate(prompt)

‎deepeval/metrics/contextual_precision/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ class Verdicts(BaseModel):
1111
verdicts: List[ContextualPrecisionVerdict]
1212

1313

14-
class Reason(BaseModel):
14+
class ContextualPrecisionScoreReason(BaseModel):
1515
reason: str

‎deepeval/metrics/contextual_recall/contextual_recall.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ async def _a_generate_reason(self, expected_output: str):
146146
)
147147

148148
if self.using_native_model:
149-
res, cost = await self.model.a_generate(prompt, schema=Reason)
149+
res, cost = await self.model.a_generate(prompt, schema=ContextualRecallScoreReason)
150150
self.evaluation_cost += cost
151151
return res.reason
152152
else:
153153
try:
154-
res: Reason = await self.model.a_generate(prompt, schema=Reason)
154+
res: ContextualRecallScoreReason = await self.model.a_generate(prompt, schema=ContextualRecallScoreReason)
155155
return res.reason
156156
except TypeError:
157157
res = await self.model.a_generate(prompt)
@@ -178,12 +178,12 @@ def _generate_reason(self, expected_output: str):
178178
)
179179

180180
if self.using_native_model:
181-
res, cost = self.model.generate(prompt, schema=Reason)
181+
res, cost = self.model.generate(prompt, schema=ContextualRecallScoreReason)
182182
self.evaluation_cost += cost
183183
return res.reason
184184
else:
185185
try:
186-
res: Reason = self.model.generate(prompt, schema=Reason)
186+
res: ContextualRecallScoreReason = self.model.generate(prompt, schema=ContextualRecallScoreReason)
187187
return res.reason
188188
except TypeError:
189189
res = self.model.generate(prompt)

‎deepeval/metrics/contextual_recall/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ class Verdicts(BaseModel):
1111
verdicts: List[ContextualRecallVerdict]
1212

1313

14-
class Reason(BaseModel):
14+
class ContextualRecallScoreReason(BaseModel):
1515
reason: str

‎deepeval/metrics/contextual_relevancy/contextual_relevancy.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ async def _a_generate_reason(self, input: str):
147147
score=format(self.score, ".2f"),
148148
)
149149
if self.using_native_model:
150-
res, cost = await self.model.a_generate(prompt, schema=Reason)
150+
res, cost = await self.model.a_generate(prompt, schema=ContextualRelevancyScoreReason)
151151
self.evaluation_cost += cost
152152
return res.reason
153153
else:
154154
try:
155-
res: Reason = await self.model.a_generate(prompt, schema=Reason)
155+
res: ContextualRelevancyScoreReason = await self.model.a_generate(prompt, schema=ContextualRelevancyScoreReason)
156156
return res.reason
157157
except TypeError:
158158
res = await self.model.a_generate(prompt)
@@ -179,12 +179,12 @@ def _generate_reason(self, input: str):
179179
score=format(self.score, ".2f"),
180180
)
181181
if self.using_native_model:
182-
res, cost = self.model.generate(prompt, schema=Reason)
182+
res, cost = self.model.generate(prompt, schema=ContextualRelevancyScoreReason)
183183
self.evaluation_cost += cost
184184
return res.reason
185185
else:
186186
try:
187-
res: Reason = self.model.generate(prompt, schema=Reason)
187+
res: ContextualRelevancyScoreReason = self.model.generate(prompt, schema=ContextualRelevancyScoreReason)
188188
return res.reason
189189
except TypeError:
190190
res = self.model.generate(prompt)

‎deepeval/metrics/contextual_relevancy/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ class ContextualRelevancyVerdicts(BaseModel):
1212
verdicts: List[ContextualRelevancyVerdict]
1313

1414

15-
class Reason(BaseModel):
15+
class ContextualRelevancyScoreReason(BaseModel):
1616
reason: str

0 commit comments

Comments
 (0)