feat: GenAI SDK client(evals) - add rubric-based evaluation types

PiperOrigin-RevId: 783059072

Author: jsondai

vertexai/_genai/evals.py

@@ -649,6 +649,13 @@ def _EvaluateInstancesRequestParameters_to_vertex(
             ),
         )
 
+    if getv(from_object, ["rubric_based_metric_input"]) is not None:
+        setv(
+            to_object,
+            ["rubricBasedMetricInput"],
+            getv(from_object, ["rubric_based_metric_input"]),
+        )
+
     if getv(from_object, ["autorater_config"]) is not None:
         setv(
             to_object,
@@ -729,6 +736,13 @@ def _EvaluateInstancesResponse_from_vertex(
 ) -> dict[str, Any]:
     to_object: dict[str, Any] = {}
 
+    if getv(from_object, ["rubricBasedMetricResult"]) is not None:
+        setv(
+            to_object,
+            ["rubric_based_metric_result"],
+            getv(from_object, ["rubricBasedMetricResult"]),
+        )
+
     if getv(from_object, ["bleuResults"]) is not None:
         setv(to_object, ["bleu_results"], getv(from_object, ["bleuResults"]))
 
@@ -762,20 +776,6 @@ def _EvaluateInstancesResponse_from_vertex(
     if getv(from_object, ["rougeResults"]) is not None:
         setv(to_object, ["rouge_results"], getv(from_object, ["rougeResults"]))
 
-    if getv(from_object, ["rubricBasedInstructionFollowingResult"]) is not None:
-        setv(
-            to_object,
-            ["rubric_based_instruction_following_result"],
-            getv(from_object, ["rubricBasedInstructionFollowingResult"]),
-        )
-
-    if getv(from_object, ["summarizationVerbosityResult"]) is not None:
-        setv(
-            to_object,
-            ["summarization_verbosity_result"],
-            getv(from_object, ["summarizationVerbosityResult"]),
-        )
-
     if getv(from_object, ["toolCallValidResults"]) is not None:
         setv(
             to_object,
@@ -804,48 +804,58 @@ def _EvaluateInstancesResponse_from_vertex(
             getv(from_object, ["toolParameterKvMatchResults"]),
         )
 
-    if getv(from_object, ["trajectoryAnyOrderMatchResults"]) is not None:
-        setv(
-            to_object,
-            ["trajectory_any_order_match_results"],
-            getv(from_object, ["trajectoryAnyOrderMatchResults"]),
-        )
+    return to_object
 
-    if getv(from_object, ["trajectoryExactMatchResults"]) is not None:
-        setv(
-            to_object,
-            ["trajectory_exact_match_results"],
-            getv(from_object, ["trajectoryExactMatchResults"]),
-        )
 
-    if getv(from_object, ["trajectoryInOrderMatchResults"]) is not None:
-        setv(
-            to_object,
-            ["trajectory_in_order_match_results"],
-            getv(from_object, ["trajectoryInOrderMatchResults"]),
-        )
+def _RubricContentProperty_from_vertex(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+    to_object: dict[str, Any] = {}
+    if getv(from_object, ["description"]) is not None:
+        setv(to_object, ["description"], getv(from_object, ["description"]))
+
+    return to_object
 
-    if getv(from_object, ["trajectoryPrecisionResults"]) is not None:
-        setv(
-            to_object,
-            ["trajectory_precision_results"],
-            getv(from_object, ["trajectoryPrecisionResults"]),
-        )
 
-    if getv(from_object, ["trajectoryRecallResults"]) is not None:
+def _RubricContent_from_vertex(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+    to_object: dict[str, Any] = {}
+    if getv(from_object, ["property"]) is not None:
         setv(
             to_object,
-            ["trajectory_recall_results"],
-            getv(from_object, ["trajectoryRecallResults"]),
+            ["property"],
+            _RubricContentProperty_from_vertex(
+                getv(from_object, ["property"]), to_object
+            ),
         )
 
-    if getv(from_object, ["trajectorySingleToolUseResults"]) is not None:
+    return to_object
+
+
+def _Rubric_from_vertex(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+    to_object: dict[str, Any] = {}
+    if getv(from_object, ["rubricId"]) is not None:
+        setv(to_object, ["rubric_id"], getv(from_object, ["rubricId"]))
+
+    if getv(from_object, ["content"]) is not None:
         setv(
             to_object,
-            ["trajectory_single_tool_use_results"],
-            getv(from_object, ["trajectorySingleToolUseResults"]),
+            ["content"],
+            _RubricContent_from_vertex(getv(from_object, ["content"]), to_object),
         )
 
+    if getv(from_object, ["type"]) is not None:
+        setv(to_object, ["type"], getv(from_object, ["type"]))
+
+    if getv(from_object, ["importance"]) is not None:
+        setv(to_object, ["importance"], getv(from_object, ["importance"]))
+
     return to_object
 
 
@@ -858,7 +868,10 @@ def _GenerateInstanceRubricsResponse_from_vertex(
         setv(
             to_object,
             ["generated_rubrics"],
-            getv(from_object, ["generatedRubrics"]),
+            [
+                _Rubric_from_vertex(item, to_object)
+                for item in getv(from_object, ["generatedRubrics"])
+            ],
         )
 
     return to_object
@@ -881,6 +894,7 @@ def _evaluate_instances(
         tool_parameter_kv_match_input: Optional[
             types.ToolParameterKVMatchInputOrDict
         ] = None,
+        rubric_based_metric_input: Optional[types.RubricBasedMetricInputOrDict] = None,
         autorater_config: Optional[types.AutoraterConfigOrDict] = None,
         config: Optional[types.EvaluateInstancesConfigOrDict] = None,
     ) -> types.EvaluateInstancesResponse:
@@ -896,6 +910,7 @@ def _evaluate_instances(
             tool_name_match_input=tool_name_match_input,
             tool_parameter_key_match_input=tool_parameter_key_match_input,
             tool_parameter_kv_match_input=tool_parameter_kv_match_input,
+            rubric_based_metric_input=rubric_based_metric_input,
             autorater_config=autorater_config,
             config=config,
         )
@@ -1199,6 +1214,7 @@ async def _evaluate_instances(
         tool_parameter_kv_match_input: Optional[
             types.ToolParameterKVMatchInputOrDict
         ] = None,
+        rubric_based_metric_input: Optional[types.RubricBasedMetricInputOrDict] = None,
         autorater_config: Optional[types.AutoraterConfigOrDict] = None,
         config: Optional[types.EvaluateInstancesConfigOrDict] = None,
     ) -> types.EvaluateInstancesResponse:
@@ -1214,6 +1230,7 @@ async def _evaluate_instances(
             tool_name_match_input=tool_name_match_input,
             tool_parameter_key_match_input=tool_parameter_key_match_input,
             tool_parameter_kv_match_input=tool_parameter_kv_match_input,
+            rubric_based_metric_input=rubric_based_metric_input,
             autorater_config=autorater_config,
             config=config,
         )