chore: move CandidateResult, Event, Message, SessionInput and sub-fields to types/evals.py

tests/unit/vertexai/genai/replays/test_get_evaluation_run.py

@@ -251,10 +251,10 @@ def check_run_5133048044039700480_evaluation_item_results(
     assert universal_metric_result.explanation is None
     # Check the first rubric verdict.
     rubric_verdict_0 = universal_metric_result.rubric_verdicts[0]
-    assert isinstance(rubric_verdict_0, types.RubricVerdict)
-    assert rubric_verdict_0.evaluated_rubric == types.Rubric(
-        content=types.RubricContent(
-            property=types.RubricContentProperty(
+    assert isinstance(rubric_verdict_0, types.evals.RubricVerdict)
+    assert rubric_verdict_0.evaluated_rubric == types.evals.Rubric(
+        content=types.evals.RubricContent(
+            property=types.evals.RubricContentProperty(
                 description="The response is in English."
             )
         ),

tests/unit/vertexai/genai/replays/test_public_generate_rubrics.py

@@ -173,7 +173,7 @@ def test_public_method_generate_rubrics(client):
     assert "text_quality_rubrics" in first_rubric_group
     assert isinstance(first_rubric_group["text_quality_rubrics"], list)
     assert first_rubric_group["text_quality_rubrics"]
-    assert isinstance(first_rubric_group["text_quality_rubrics"][0], types.Rubric)
+    assert isinstance(first_rubric_group["text_quality_rubrics"][0], types.evals.Rubric)
 
 
 pytestmark = pytest_helper.setup(

tests/unit/vertexai/genai/test_evals.py

@@ -2314,7 +2314,7 @@ def test_convert_with_intermediate_events_as_event_objects(self):
                 "response": ["Hi"],
                 "intermediate_events": [
                     [
-                        vertexai_genai_types.Event(
+                        vertexai_genai_types.evals.Event(
                             event_id="event1",
                             content=genai_types.Content(
                                 parts=[genai_types.Part(text="intermediate event")]
@@ -2577,14 +2577,14 @@ def test_convert_with_conversation_history(self):
         )
 
         assert len(eval_case.conversation_history) == 2
-        assert eval_case.conversation_history[0] == vertexai_genai_types.Message(
+        assert eval_case.conversation_history[0] == vertexai_genai_types.evals.Message(
             content=genai_types.Content(
                 parts=[genai_types.Part(text="Hello")], role="user"
             ),
             turn_id="0",
             author="user",
         )
-        assert eval_case.conversation_history[1] == vertexai_genai_types.Message(
+        assert eval_case.conversation_history[1] == vertexai_genai_types.evals.Message(
             content=genai_types.Content(
                 parts=[genai_types.Part(text="Hi")], role="system"
             ),
@@ -2786,7 +2786,7 @@ class TestEvent:
     """Unit tests for the Event class."""
 
     def test_event_creation(self):
-        event = vertexai_genai_types.Event(
+        event = vertexai_genai_types.evals.Event(
             event_id="event1",
             content=genai_types.Content(
                 parts=[genai_types.Part(text="intermediate event")]
@@ -2820,7 +2820,7 @@ def test_eval_case_with_agent_eval_fields(self):
             tool_declarations=[tool],
         )
         intermediate_events = [
-            vertexai_genai_types.Event(
+            vertexai_genai_types.evals.Event(
                 event_id="event1",
                 content=genai_types.Content(
                     parts=[genai_types.Part(text="intermediate event")]
@@ -2846,7 +2846,7 @@ class TestSessionInput:
     """Unit tests for the SessionInput class."""
 
     def test_session_input_creation(self):
-        session_input = vertexai_genai_types.SessionInput(
+        session_input = vertexai_genai_types.evals.SessionInput(
             user_id="user1",
             state={"key": "value"},
         )
@@ -3692,7 +3692,7 @@ def test_eval_case_to_agent_data(self):
             tool_declarations=[tool],
         )
         intermediate_events = [
-            vertexai_genai_types.Event(
+            vertexai_genai_types.evals.Event(
                 event_id="event1",
                 content=genai_types.Content(
                     parts=[genai_types.Part(text="intermediate event")]
@@ -3722,7 +3722,7 @@ def test_eval_case_to_agent_data(self):
 
     def test_eval_case_to_agent_data_events_only(self):
         intermediate_events = [
-            vertexai_genai_types.Event(
+            vertexai_genai_types.evals.Event(
                 event_id="event1",
                 content=genai_types.Content(
                     parts=[genai_types.Part(text="intermediate event")]
@@ -3751,7 +3751,7 @@ def test_eval_case_to_agent_data_events_only(self):
 
     def test_eval_case_to_agent_data_empty_event_content(self):
         intermediate_events = [
-            vertexai_genai_types.Event(
+            vertexai_genai_types.evals.Event(
                 event_id="event1",
                 content=None,
             )
@@ -3933,12 +3933,12 @@ def test_build_request_payload_various_field_types(self):
                 )
             ],
             conversation_history=[
-                vertexai_genai_types.Message(
+                vertexai_genai_types.evals.Message(
                     content=genai_types.Content(
                         parts=[genai_types.Part(text="Turn 1 user")], role="user"
                     )
                 ),
-                vertexai_genai_types.Message(
+                vertexai_genai_types.evals.Message(
                     content=genai_types.Content(
                         parts=[genai_types.Part(text="Turn 1 model")], role="model"
                     )

vertexai/_genai/_evals_common.py

@@ -1271,16 +1271,19 @@ def _execute_agent_run_with_retry(
     """Executes agent run for a single prompt."""
     try:
         if isinstance(row["session_inputs"], str):
-            session_inputs = types.SessionInput.model_validate(
+            session_inputs = types.evals.SessionInput.model_validate(
                 json.loads(row["session_inputs"])
             )
         elif isinstance(row["session_inputs"], dict):
-            session_inputs = types.SessionInput.model_validate(row["session_inputs"])
-        elif isinstance(row["session_inputs"], types.SessionInput):
+            session_inputs = types.evals.SessionInput.model_validate(
+                row["session_inputs"]
+            )
+        elif isinstance(row["session_inputs"], types.evals.SessionInput):
             session_inputs = row["session_inputs"]
         else:
             raise TypeError(
-                f"Unsupported session_inputs type: {type(row['session_inputs'])}. Expecting string or dict in types.SessionInput format."
+                f"Unsupported session_inputs type: {type(row['session_inputs'])}. "
+                "Expecting string or dict in types.evals.SessionInput format."
             )
         user_id = session_inputs.user_id
         session_state = session_inputs.state