Move getters and setters

Author: penguine-ip

deepeval/metrics/answer_relevancy/answer_relevancy.py

@@ -31,6 +31,21 @@ class AnswerRelvancyVerdict(BaseModel):
 
 
 class AnswerRelevancyMetric(BaseMetric):
+    @property
+    def statements(self) -> Optional[List[str]]:
+        return self._statements.get()
+
+    @statements.setter
+    def statements(self, value: Optional[List[str]]):
+        self._statements.set(value)
+
+    @property
+    def verdicts(self) -> Optional[List[AnswerRelvancyVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[AnswerRelvancyVerdict]]):
+        self._verdicts.set(value)
 
     def __init__(
         self,
@@ -54,22 +69,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def statements(self) -> Optional[List[str]]:
-        return self._statements.get()
-
-    @statements.setter
-    def statements(self, value: Optional[List[str]]):
-        self._statements.set(value)
-
-    @property
-    def verdicts(self) -> Optional[List[AnswerRelvancyVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[AnswerRelvancyVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/bias/bias.py

@@ -33,6 +33,21 @@ class BiasVerdict(BaseModel):
 
 
 class BiasMetric(BaseMetric):
+    @property
+    def opinions(self) -> Optional[List[str]]:
+        return self._opinions.get()
+
+    @opinions.setter
+    def opinions(self, value: Optional[List[str]]):
+        self._opinions.set(value)
+
+    @property
+    def verdicts(self) -> Optional[List[BiasVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[BiasVerdict]]):
+        self._verdicts.set(value)
 
     def __init__(
         self,
@@ -56,22 +71,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def opinions(self) -> Optional[List[str]]:
-        return self._opinions.get()
-
-    @opinions.setter
-    def opinions(self, value: Optional[List[str]]):
-        self._opinions.set(value)
-
-    @property
-    def verdicts(self) -> Optional[List[BiasVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[BiasVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/contextual_precision/contextual_precision.py

@@ -36,6 +36,13 @@ class ContextualPrecisionVerdict(BaseModel):
 
 
 class ContextualPrecisionMetric(BaseMetric):
+    @property
+    def verdicts(self) -> Optional[List[ContextualPrecisionVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[ContextualPrecisionVerdict]]):
+        self._verdicts.set(value)
 
     def __init__(
         self,
@@ -56,14 +63,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def verdicts(self) -> Optional[List[ContextualPrecisionVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[ContextualPrecisionVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/contextual_recall/contextual_recall.py

@@ -33,6 +33,13 @@ class ContextualRecallVerdict(BaseModel):
 
 
 class ContextualRecallMetric(BaseMetric):
+    @property
+    def verdicts(self) -> Optional[List[ContextualRecallVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[ContextualRecallVerdict]]):
+        self._verdicts.set(value)
 
     def __init__(
         self,
@@ -53,14 +60,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def verdicts(self) -> Optional[List[ContextualRecallVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[ContextualRecallVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/contextual_relevancy/contextual_relevancy.py

@@ -35,6 +35,13 @@ class ContextualRelevancyVerdict(BaseModel):
 
 
 class ContextualRelevancyMetric(BaseMetric):
+    @property
+    def verdicts(self) -> Optional[List[ContextualRelevancyVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[ContextualRelevancyVerdict]]):
+        self._verdicts.set(value)
 
     def __init__(
         self,
@@ -55,14 +62,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def verdicts(self) -> Optional[List[ContextualRelevancyVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[ContextualRelevancyVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/faithfulness/faithfulness.py

@@ -34,6 +34,30 @@ class FaithfulnessVerdict(BaseModel):
 
 class FaithfulnessMetric(BaseMetric):
 
+    @property
+    def truths(self) -> Optional[List[str]]:
+        return self._truths.get()
+
+    @truths.setter
+    def truths(self, value: Optional[List[str]]):
+        self._truths.set(value)
+
+    @property
+    def claims(self) -> Optional[List[str]]:
+        return self._claims.get()
+
+    @claims.setter
+    def claims(self, value: Optional[List[str]]):
+        self._claims.set(value)
+
+    @property
+    def verdicts(self) -> Optional[List[FaithfulnessVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[FaithfulnessVerdict]]):
+        self._verdicts.set(value)
+
     def __init__(
         self,
         threshold: float = 0.5,
@@ -59,30 +83,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def truths(self) -> Optional[List[str]]:
-        return self._truths.get()
-
-    @truths.setter
-    def truths(self, value: Optional[List[str]]):
-        self._truths.set(value)
-
-    @property
-    def claims(self) -> Optional[List[str]]:
-        return self._claims.get()
-
-    @claims.setter
-    def claims(self, value: Optional[List[str]]):
-        self._claims.set(value)
-
-    @property
-    def verdicts(self) -> Optional[List[FaithfulnessVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[FaithfulnessVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/g_eval/g_eval.py

@@ -55,6 +55,14 @@ class GEvalResponse(BaseModel):
 
 class GEval(BaseMetric):
 
+    @property
+    def evaluation_steps(self) -> Optional[List[str]]:
+        return self._evaluation_steps.get()
+
+    @evaluation_steps.setter
+    def evaluation_steps(self, value: Optional[List[str]]):
+        self._evaluation_steps.set(value)
+
     def __init__(
         self,
         name: str,
@@ -92,19 +100,11 @@ def __init__(
         self.criteria = criteria
         self.model, self.using_native_model = initialize_model(model)
         self.evaluation_model = self.model.get_model_name()
-        self._evaluation_steps.set(evaluation_steps)
+        self.evaluation_steps = evaluation_steps
         self.threshold = 1 if strict_mode else threshold
         self.strict_mode = strict_mode
         self.async_mode = async_mode
 
-    @property
-    def evaluation_steps(self) -> Optional[List[str]]:
-        return self._evaluation_steps.get()
-
-    @evaluation_steps.setter
-    def evaluation_steps(self, value: Optional[List[str]]):
-        self._evaluation_steps.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/hallucination/hallucination.py

@@ -33,6 +33,14 @@ class HallucinationVerdict(BaseModel):
 
 class HallucinationMetric(BaseMetric):
 
+    @property
+    def verdicts(self) -> Optional[List[HallucinationVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[HallucinationVerdict]]):
+        self._verdicts.set(value)
+
     def __init__(
         self,
         threshold: float = 0.5,
@@ -52,14 +60,6 @@ def __init__(
         self.async_mode = async_mode
         self.strict_mode = strict_mode
 
-    @property
-    def verdicts(self) -> Optional[List[HallucinationVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[HallucinationVerdict]]):
-        self._verdicts.set(value)
-
     def measure(
         self,
         test_case: Union[LLMTestCase, ConversationalTestCase],

deepeval/metrics/knowledge_retention/knowledge_retention.py

@@ -28,6 +28,22 @@ class KnowledgeRetentionVerdict(BaseModel):
 
 
 class KnowledgeRetentionMetric(BaseConversationalMetric):
+    @property
+    def knowledges(self) -> Optional[List[Knowledge]]:
+        return self._knowledges.get()
+
+    @knowledges.setter
+    def claims(self, value: Optional[List[Knowledge]]):
+        self._claims.set(value)
+
+    @property
+    def verdicts(self) -> Optional[List[KnowledgeRetentionVerdict]]:
+        return self._verdicts.get()
+
+    @verdicts.setter
+    def verdicts(self, value: Optional[List[KnowledgeRetentionVerdict]]):
+        self._verdicts.set(value)
+
     def __init__(
         self,
         threshold: float = 0.5,
@@ -48,22 +64,6 @@ def __init__(
         self.include_reason = include_reason
         self.strict_mode = strict_mode
 
-    @property
-    def knowledges(self) -> Optional[List[Knowledge]]:
-        return self._knowledges.get()
-
-    @knowledges.setter
-    def claims(self, value: Optional[List[Knowledge]]):
-        self._claims.set(value)
-
-    @property
-    def verdicts(self) -> Optional[List[KnowledgeRetentionVerdict]]:
-        return self._verdicts.get()
-
-    @verdicts.setter
-    def verdicts(self, value: Optional[List[KnowledgeRetentionVerdict]]):
-        self._verdicts.set(value)
-
     def measure(self, test_case: ConversationalTestCase, verbose: bool = True):
         validate_conversational_test_case(test_case, self)
         with metric_progress_indicator(self):