diff --git a/agentplatform/_genai/_evals_common.py b/agentplatform/_genai/_evals_common.py index f33ceb7497..88c61441cd 100644 --- a/agentplatform/_genai/_evals_common.py +++ b/agentplatform/_genai/_evals_common.py @@ -484,10 +484,10 @@ def _get_default_prompt_template( and eval_item.evaluation_request.prompt and eval_item.evaluation_request.prompt.prompt_template_data ): - if ( - "prompt" - in eval_item.evaluation_request.prompt.prompt_template_data.values - ): + template_values = ( + eval_item.evaluation_request.prompt.prompt_template_data.values + ) + if template_values and "prompt" in template_values: return "{prompt}" except Exception as e: logger.warning("Failed to get prompt template from evaluation set: %s", e) diff --git a/vertexai/_genai/_evals_common.py b/vertexai/_genai/_evals_common.py index 4936a60a96..4d406b7b10 100644 --- a/vertexai/_genai/_evals_common.py +++ b/vertexai/_genai/_evals_common.py @@ -469,10 +469,10 @@ def _get_default_prompt_template( and eval_item.evaluation_request.prompt and eval_item.evaluation_request.prompt.prompt_template_data ): - if ( - "prompt" - in eval_item.evaluation_request.prompt.prompt_template_data.values - ): + template_values = ( + eval_item.evaluation_request.prompt.prompt_template_data.values + ) + if template_values and "prompt" in template_values: return "{prompt}" except Exception as e: logger.warning("Failed to get prompt template from evaluation set: %s", e)