Moved feedback

Author: penguine-ip

deepeval/feedback/__init__.py

@@ -1 +1 @@
-from .feedback import collect_feedback, a_collect_feedback
+from .feedback import collect_feedback, a_collect_feedback, Feedback

deepeval/feedback/feedback.py

@@ -1,9 +1,16 @@
 from typing import Optional
+from pydantic import BaseModel
 
 from deepeval.confident.api import Api, Endpoints, HttpMethods
 from deepeval.feedback.api import APIFeedback
 
 
+class Feedback(BaseModel):
+    rating: int
+    expected_output: Optional[str] = None
+    explanation: Optional[str] = None
+
+
 def collect_feedback(
     rating: int,
     trace_uuid: Optional[str] = None,

deepeval/feedback/utils.py

@@ -0,0 +1,29 @@
+from typing import Optional
+from deepeval.feedback.feedback import Feedback
+from deepeval.feedback.api import APIFeedback
+
+
+def convert_feedback_to_api_feedback(
+    feedback: Optional[Feedback] = None,
+    trace_uuid: Optional[str] = None,
+    span_uuid: Optional[str] = None,
+) -> Optional[APIFeedback]:
+    if feedback is None:
+        return None
+
+    if trace_uuid is not None:
+        return APIFeedback(
+            traceUuid=trace_uuid,
+            rating=feedback.rating,
+            expectedResponse=feedback.expected_output,
+            explanation=feedback.explanation,
+        )
+    if span_uuid is not None:
+        return APIFeedback(
+            spanUuid=span_uuid,
+            rating=feedback.rating,
+            expectedResponse=feedback.expected_output,
+            explanation=feedback.explanation,
+        )
+    else:
+        return None

deepeval/telemetry.py

@@ -167,7 +167,11 @@ def capture_evaluation_run(type: str):
         # data
         event = f"Ran {type}"
         distinct_id = get_unique_id()
-        feature = Feature.COMPONENT_EVALUATION if event == "Ran traceable evaluate()" else Feature.EVALUATION
+        feature = (
+            Feature.COMPONENT_EVALUATION
+            if event == "Ran traceable evaluate()"
+            else Feature.EVALUATION
+        )
         properties = {
             "logged_in_with": get_logged_in_with(),
             "environment": IS_RUNNING_IN_JUPYTER,
@@ -178,9 +182,13 @@ def capture_evaluation_run(type: str):
             ),
         }
         if feature == Feature.EVALUATION:
-            properties["feature_status.evaluation"] = get_feature_status(feature)
+            properties["feature_status.evaluation"] = get_feature_status(
+                feature
+            )
         elif feature == Feature.COMPONENT_EVALUATION:
-            properties["feature_status.component_evaluation"] = get_feature_status(feature)
+            properties["feature_status.component_evaluation"] = (
+                get_feature_status(feature)
+            )
         set_last_feature(feature)
         # capture posthog
         posthog.capture(

deepeval/tracing/tracing.py

@@ -50,13 +50,13 @@
 )
 from deepeval.tracing.utils import (
     Environment,
-    convert_feedback_to_api_feedback,
     make_json_serializable,
     perf_counter_to_datetime,
     to_zod_compatible_iso,
     validate_environment,
     validate_sampling_rate,
 )
+from deepeval.feedback.utils import convert_feedback_to_api_feedback
 from deepeval.utils import dataclass_to_dict, is_confident
 from deepeval.tracing.context import current_span_context, current_trace_context
 

deepeval/tracing/types.py

@@ -3,6 +3,7 @@
 from typing import Any, Dict, List, Optional, Union
 from rich.progress import Progress
 
+from deepeval.feedback import Feedback
 from deepeval.tracing.attributes import (
     AgentAttributes,
     LlmAttributes,
@@ -13,12 +14,6 @@
 from deepeval.metrics import BaseMetric
 
 
-class Feedback(BaseModel):
-    rating: int
-    expected_output: Optional[str] = None
-    explanation: Optional[str] = None
-
-
 class TraceWorkerStatus(Enum):
     SUCCESS = "success"
     FAILURE = "failure"

deepeval/tracing/utils.py

@@ -1,10 +1,6 @@
 from datetime import datetime, timezone
 from enum import Enum
 from time import perf_counter
-from typing import Optional
-
-from deepeval.feedback.api import APIFeedback
-from deepeval.tracing.types import Feedback
 
 
 class Environment(Enum):
@@ -14,32 +10,6 @@ class Environment(Enum):
     TESTING = "testing"
 
 
-def convert_feedback_to_api_feedback(
-    feedback: Optional[Feedback] = None,
-    trace_uuid: Optional[str] = None,
-    span_uuid: Optional[str] = None,
-) -> Optional[APIFeedback]:
-    if feedback is None:
-        return None
-
-    if trace_uuid is not None:
-        return APIFeedback(
-            traceUuid=trace_uuid,
-            rating=feedback.rating,
-            expectedResponse=feedback.expected_output,
-            explanation=feedback.explanation,
-        )
-    if span_uuid is not None:
-        return APIFeedback(
-            spanUuid=span_uuid,
-            rating=feedback.rating,
-            expectedResponse=feedback.expected_output,
-            explanation=feedback.explanation,
-        )
-    else:
-        return None
-
-
 def validate_environment(environment: str):
     if environment not in [env.value for env in Environment]:
         valid_values = ", ".join(f'"{env.value}"' for env in Environment)