google-adk 1.2.1__py3-none-any.whl → 1.4.1__py3-none-any.whl

google/adk/code_executors/vertex_ai_code_executor.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import datetime
+from __future__ import annotations
+
+import logging
 import mimetypes
 import os
 from typing import Any
@@ -27,6 +29,8 @@ from .code_execution_utils import CodeExecutionInput
 from .code_execution_utils import CodeExecutionResult
 from .code_execution_utils import File
 
+logger = logging.getLogger('google_adk.' + __name__)
+
 _SUPPORTED_IMAGE_TYPES = ['png', 'jpg', 'jpeg']
 _SUPPORTED_DATA_FILE_TYPES = ['csv']
 
@@ -89,7 +93,9 @@ def _get_code_interpreter_extension(resource_name: str = None):
   if resource_name:
     new_code_interpreter = Extension(resource_name)
   else:
-    print('No CODE_INTERPRETER_ID found in the environment. Create a new one.')
+    logger.info(
+        'No CODE_INTERPRETER_ID found in the environment. Create a new one.'
+    )
     new_code_interpreter = Extension.from_hub('code_interpreter')
     os.environ['CODE_INTERPRETER_EXTENSION_NAME'] = (
         new_code_interpreter.gca_resource.name

google/adk/evaluation/_eval_set_results_manager_utils.py

@@ -0,0 +1,44 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import time
+
+from .eval_result import EvalCaseResult
+from .eval_result import EvalSetResult
+
+
+def _sanitize_eval_set_result_name(eval_set_result_name: str) -> str:
+  """Sanitizes the eval set result name."""
+  return eval_set_result_name.replace("/", "_")
+
+
+def create_eval_set_result(
+    app_name: str,
+    eval_set_id: str,
+    eval_case_results: list[EvalCaseResult],
+) -> EvalSetResult:
+  """Creates a new EvalSetResult given eval_case_results."""
+  timestamp = time.time()
+  eval_set_result_id = f"{app_name}_{eval_set_id}_{timestamp}"
+  eval_set_result_name = _sanitize_eval_set_result_name(eval_set_result_id)
+  eval_set_result = EvalSetResult(
+      eval_set_result_id=eval_set_result_id,
+      eval_set_result_name=eval_set_result_name,
+      eval_set_id=eval_set_id,
+      eval_case_results=eval_case_results,
+      creation_timestamp=timestamp,
+  )
+  return eval_set_result

google/adk/evaluation/_eval_sets_manager_utils.py

@@ -0,0 +1,108 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import logging
+from typing import Optional
+
+from ..errors.not_found_error import NotFoundError
+from .eval_case import EvalCase
+from .eval_set import EvalSet
+from .eval_sets_manager import EvalSetsManager
+
+logger = logging.getLogger("google_adk." + __name__)
+
+
+def get_eval_set_from_app_and_id(
+    eval_sets_manager: EvalSetsManager, app_name: str, eval_set_id: str
+) -> EvalSet:
+  """Returns an EvalSet if found, otherwise raises NotFoundError."""
+  eval_set = eval_sets_manager.get_eval_set(app_name, eval_set_id)
+  if not eval_set:
+    raise NotFoundError(f"Eval set `{eval_set_id}` not found.")
+  return eval_set
+
+
+def get_eval_case_from_eval_set(
+    eval_set: EvalSet, eval_case_id: str
+) -> Optional[EvalCase]:
+  """Returns an EvalCase if found, otherwise None."""
+  eval_case_to_find = None
+
+  # Look up the eval case by eval_case_id
+  for eval_case in eval_set.eval_cases:
+    if eval_case.eval_id == eval_case_id:
+      eval_case_to_find = eval_case
+      break
+
+  return eval_case_to_find
+
+
+def add_eval_case_to_eval_set(
+    eval_set: EvalSet, eval_case: EvalCase
+) -> EvalSet:
+  """Adds an eval case to an eval set and returns the updated eval set."""
+  eval_case_id = eval_case.eval_id
+
+  if [x for x in eval_set.eval_cases if x.eval_id == eval_case_id]:
+    raise ValueError(
+        f"Eval id `{eval_case_id}` already exists in `{eval_set.eval_set_id}`"
+        " eval set.",
+    )
+
+  eval_set.eval_cases.append(eval_case)
+  return eval_set
+
+
+def update_eval_case_in_eval_set(
+    eval_set: EvalSet, updated_eval_case: EvalCase
+) -> EvalSet:
+  """Updates an eval case in an eval set and returns the updated eval set."""
+  # Find the eval case to be updated.
+  eval_case_id = updated_eval_case.eval_id
+  eval_case_to_update = get_eval_case_from_eval_set(eval_set, eval_case_id)
+
+  if not eval_case_to_update:
+    raise NotFoundError(
+        f"Eval case `{eval_case_id}` not found in eval set"
+        f" `{eval_set.eval_set_id}`."
+    )
+
+  # Remove the existing eval case and add the updated eval case.
+  eval_set.eval_cases.remove(eval_case_to_update)
+  eval_set.eval_cases.append(updated_eval_case)
+  return eval_set
+
+
+def delete_eval_case_from_eval_set(
+    eval_set: EvalSet, eval_case_id: str
+) -> EvalSet:
+  """Deletes an eval case from an eval set and returns the updated eval set."""
+  # Find the eval case to be deleted.
+  eval_case_to_delete = get_eval_case_from_eval_set(eval_set, eval_case_id)
+
+  if not eval_case_to_delete:
+    raise NotFoundError(
+        f"Eval case `{eval_case_id}` not found in eval set"
+        f" `{eval_set.eval_set_id}`."
+    )
+
+  # Remove the existing eval case.
+  logger.info(
+      "EvalCase`%s` was found in the eval set. It will be removed permanently.",
+      eval_case_id,
+  )
+  eval_set.eval_cases.remove(eval_case_to_delete)
+  return eval_set

google/adk/evaluation/eval_metrics.py

@@ -32,11 +32,6 @@ class EvalMetric(BaseModel):
       populate_by_name=True,
   )
 
-  model_config = ConfigDict(
-      alias_generator=alias_generators.to_camel,
-      populate_by_name=True,
-  )
-
   metric_name: str
   """The name of the metric."""
 

google/adk/evaluation/eval_result.py

@@ -36,8 +36,9 @@ class EvalCaseResult(BaseModel):
       populate_by_name=True,
   )
 
-  eval_set_file: str = Field(
+  eval_set_file: Optional[str] = Field(
       deprecated=True,
+      default=None,
       description="This field is deprecated, use eval_set_id instead.",
   )
   eval_set_id: str = ""
@@ -49,11 +50,15 @@ class EvalCaseResult(BaseModel):
   final_eval_status: EvalStatus
   """Final eval status for this eval case."""
 
-  eval_metric_results: list[tuple[EvalMetric, EvalMetricResult]] = Field(
-      deprecated=True,
-      description=(
-          "This field is deprecated, use overall_eval_metric_results instead."
-      ),
+  eval_metric_results: Optional[list[tuple[EvalMetric, EvalMetricResult]]] = (
+      Field(
+          deprecated=True,
+          default=None,
+          description=(
+              "This field is deprecated, use overall_eval_metric_results"
+              " instead."
+          ),
+      )
   )
 
   overall_eval_metric_results: list[EvalMetricResult]
@@ -80,7 +85,7 @@ class EvalSetResult(BaseModel):
       populate_by_name=True,
   )
   eval_set_result_id: str
-  eval_set_result_name: str
+  eval_set_result_name: Optional[str] = None
   eval_set_id: str
   eval_case_results: list[EvalCaseResult] = Field(default_factory=list)
   creation_timestamp: float = 0.0

google/adk/evaluation/eval_set_results_manager.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 
 from abc import ABC
 from abc import abstractmethod
+from typing import Optional
 
 from .eval_result import EvalCaseResult
 from .eval_result import EvalSetResult
@@ -38,7 +39,11 @@ class EvalSetResultsManager(ABC):
   def get_eval_set_result(
       self, app_name: str, eval_set_result_id: str
   ) -> EvalSetResult:
-    """Returns an EvalSetResult identified by app_name and eval_set_result_id."""
+    """Returns the EvalSetResult from app_name and eval_set_result_id.
+
+    Raises:
+      NotFoundError: If the EvalSetResult is not found.
+    """
     raise NotImplementedError()
 
   @abstractmethod

google/adk/evaluation/gcs_eval_set_results_manager.py

@@ -0,0 +1,121 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import logging
+
+from google.cloud import exceptions as cloud_exceptions
+from google.cloud import storage
+from typing_extensions import override
+
+from ..errors.not_found_error import NotFoundError
+from ._eval_set_results_manager_utils import create_eval_set_result
+from .eval_result import EvalCaseResult
+from .eval_result import EvalSetResult
+from .eval_set_results_manager import EvalSetResultsManager
+
+logger = logging.getLogger("google_adk." + __name__)
+
+_EVAL_HISTORY_DIR = "evals/eval_history"
+_EVAL_SET_RESULT_FILE_EXTENSION = ".evalset_result.json"
+
+
+class GcsEvalSetResultsManager(EvalSetResultsManager):
+  """An EvalSetResultsManager that stores eval results in a GCS bucket."""
+
+  def __init__(self, bucket_name: str, **kwargs):
+    """Initializes the GcsEvalSetsManager.
+
+    Args:
+        bucket_name: The name of the bucket to use.
+        **kwargs: Keyword arguments to pass to the Google Cloud Storage client.
+    """
+    self.bucket_name = bucket_name
+    self.storage_client = storage.Client(**kwargs)
+    self.bucket = self.storage_client.bucket(self.bucket_name)
+    # Check if the bucket exists.
+    if not self.bucket.exists():
+      raise ValueError(
+          f"Bucket `{self.bucket_name}` does not exist. Please create it before"
+          " using the GcsEvalSetsManager."
+      )
+
+  def _get_eval_history_dir(self, app_name: str) -> str:
+    return f"{app_name}/{_EVAL_HISTORY_DIR}"
+
+  def _get_eval_set_result_blob_name(
+      self, app_name: str, eval_set_result_id: str
+  ) -> str:
+    eval_history_dir = self._get_eval_history_dir(app_name)
+    return f"{eval_history_dir}/{eval_set_result_id}{_EVAL_SET_RESULT_FILE_EXTENSION}"
+
+  def _write_eval_set_result(
+      self, blob_name: str, eval_set_result: EvalSetResult
+  ):
+    """Writes an EvalSetResult to GCS."""
+    blob = self.bucket.blob(blob_name)
+    blob.upload_from_string(
+        eval_set_result.model_dump_json(indent=2),
+        content_type="application/json",
+    )
+
+  @override
+  def save_eval_set_result(
+      self,
+      app_name: str,
+      eval_set_id: str,
+      eval_case_results: list[EvalCaseResult],
+  ) -> None:
+    """Creates and saves a new EvalSetResult given eval_case_results."""
+    eval_set_result = create_eval_set_result(
+        app_name, eval_set_id, eval_case_results
+    )
+
+    eval_set_result_blob_name = self._get_eval_set_result_blob_name(
+        app_name, eval_set_result.eval_set_result_id
+    )
+    logger.info("Writing eval result to blob: %s", eval_set_result_blob_name)
+    self._write_eval_set_result(eval_set_result_blob_name, eval_set_result)
+
+  @override
+  def get_eval_set_result(
+      self, app_name: str, eval_set_result_id: str
+  ) -> EvalSetResult:
+    """Returns an EvalSetResult from app_name and eval_set_result_id."""
+    eval_set_result_blob_name = self._get_eval_set_result_blob_name(
+        app_name, eval_set_result_id
+    )
+    blob = self.bucket.blob(eval_set_result_blob_name)
+    if not blob.exists():
+      raise NotFoundError(f"Eval set result `{eval_set_result_id}` not found.")
+    eval_set_result_data = blob.download_as_text()
+    return EvalSetResult.model_validate_json(eval_set_result_data)
+
+  @override
+  def list_eval_set_results(self, app_name: str) -> list[str]:
+    """Returns the eval result ids that belong to the given app_name."""
+    eval_history_dir = self._get_eval_history_dir(app_name)
+    eval_set_results = []
+    try:
+      for blob in self.bucket.list_blobs(prefix=eval_history_dir):
+        eval_set_result_id = blob.name.split("/")[-1].removesuffix(
+            _EVAL_SET_RESULT_FILE_EXTENSION
+        )
+        eval_set_results.append(eval_set_result_id)
+      return sorted(eval_set_results)
+    except cloud_exceptions.NotFound as e:
+      raise ValueError(
+          f"App `{app_name}` not found in GCS bucket `{self.bucket_name}`."
+      ) from e

google/adk/evaluation/gcs_eval_sets_manager.py

@@ -0,0 +1,196 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import logging
+import re
+import time
+from typing import Optional
+
+from google.cloud import exceptions as cloud_exceptions
+from google.cloud import storage
+from typing_extensions import override
+
+from ._eval_sets_manager_utils import add_eval_case_to_eval_set
+from ._eval_sets_manager_utils import delete_eval_case_from_eval_set
+from ._eval_sets_manager_utils import get_eval_case_from_eval_set
+from ._eval_sets_manager_utils import get_eval_set_from_app_and_id
+from ._eval_sets_manager_utils import update_eval_case_in_eval_set
+from .eval_case import EvalCase
+from .eval_set import EvalSet
+from .eval_sets_manager import EvalSetsManager
+
+logger = logging.getLogger("google_adk." + __name__)
+
+_EVAL_SETS_DIR = "evals/eval_sets"
+_EVAL_SET_FILE_EXTENSION = ".evalset.json"
+
+
+class GcsEvalSetsManager(EvalSetsManager):
+  """An EvalSetsManager that stores eval sets in a GCS bucket."""
+
+  def __init__(self, bucket_name: str, **kwargs):
+    """Initializes the GcsEvalSetsManager.
+
+    Args:
+      bucket_name: The name of the bucket to use.
+      **kwargs: Keyword arguments to pass to the Google Cloud Storage client.
+    """
+    self.bucket_name = bucket_name
+    self.storage_client = storage.Client(**kwargs)
+    self.bucket = self.storage_client.bucket(self.bucket_name)
+    # Check if the bucket exists.
+    if not self.bucket.exists():
+      raise ValueError(
+          f"Bucket `{self.bucket_name}` does not exist. Please create it "
+          "before using the GcsEvalSetsManager."
+      )
+
+  def _get_eval_sets_dir(self, app_name: str) -> str:
+    return f"{app_name}/{_EVAL_SETS_DIR}"
+
+  def _get_eval_set_blob_name(self, app_name: str, eval_set_id: str) -> str:
+    eval_sets_dir = self._get_eval_sets_dir(app_name)
+    return f"{eval_sets_dir}/{eval_set_id}{_EVAL_SET_FILE_EXTENSION}"
+
+  def _validate_id(self, id_name: str, id_value: str):
+    pattern = r"^[a-zA-Z0-9_]+$"
+    if not bool(re.fullmatch(pattern, id_value)):
+      raise ValueError(
+          f"Invalid {id_name}. {id_name} should have the `{pattern}` format",
+      )
+
+  def _write_eval_set_to_blob(self, blob_name: str, eval_set: EvalSet):
+    """Writes an EvalSet to GCS."""
+    blob = self.bucket.blob(blob_name)
+    blob.upload_from_string(
+        eval_set.model_dump_json(indent=2),
+        content_type="application/json",
+    )
+
+  def _save_eval_set(self, app_name: str, eval_set_id: str, eval_set: EvalSet):
+    eval_set_blob_name = self._get_eval_set_blob_name(app_name, eval_set_id)
+    self._write_eval_set_to_blob(eval_set_blob_name, eval_set)
+
+  @override
+  def get_eval_set(self, app_name: str, eval_set_id: str) -> Optional[EvalSet]:
+    """Returns an EvalSet identified by an app_name and eval_set_id."""
+    eval_set_blob_name = self._get_eval_set_blob_name(app_name, eval_set_id)
+    blob = self.bucket.blob(eval_set_blob_name)
+    if not blob.exists():
+      return None
+    eval_set_data = blob.download_as_text()
+    return EvalSet.model_validate_json(eval_set_data)
+
+  @override
+  def create_eval_set(self, app_name: str, eval_set_id: str):
+    """Creates an empty EvalSet and saves it to GCS."""
+    self._validate_id(id_name="Eval Set Id", id_value=eval_set_id)
+    new_eval_set_blob_name = self._get_eval_set_blob_name(app_name, eval_set_id)
+    if self.bucket.blob(new_eval_set_blob_name).exists():
+      raise ValueError(
+          f"Eval set `{eval_set_id}` already exists for app `{app_name}`."
+      )
+    logger.info("Creating eval set blob: `%s`", new_eval_set_blob_name)
+    new_eval_set = EvalSet(
+        eval_set_id=eval_set_id,
+        name=eval_set_id,
+        eval_cases=[],
+        creation_timestamp=time.time(),
+    )
+    self._write_eval_set_to_blob(new_eval_set_blob_name, new_eval_set)
+
+  @override
+  def list_eval_sets(self, app_name: str) -> list[str]:
+    """Returns a list of EvalSet ids that belong to the given app_name."""
+    eval_sets_dir = self._get_eval_sets_dir(app_name)
+    eval_sets = []
+    try:
+      for blob in self.bucket.list_blobs(prefix=eval_sets_dir):
+        if not blob.name.endswith(_EVAL_SET_FILE_EXTENSION):
+          continue
+        eval_set_id = blob.name.split("/")[-1].removesuffix(
+            _EVAL_SET_FILE_EXTENSION
+        )
+        eval_sets.append(eval_set_id)
+      return sorted(eval_sets)
+    except cloud_exceptions.NotFound as e:
+      raise ValueError(
+          f"App `{app_name}` not found in GCS bucket `{self.bucket_name}`."
+      ) from e
+
+  @override
+  def get_eval_case(
+      self, app_name: str, eval_set_id: str, eval_case_id: str
+  ) -> Optional[EvalCase]:
+    """Returns an EvalCase identified by an app_name, eval_set_id and eval_case_id."""
+    eval_set = self.get_eval_set(app_name, eval_set_id)
+    if not eval_set:
+      return None
+    return get_eval_case_from_eval_set(eval_set, eval_case_id)
+
+  @override
+  def add_eval_case(self, app_name: str, eval_set_id: str, eval_case: EvalCase):
+    """Adds the given EvalCase to an existing EvalSet.
+
+    Args:
+      app_name: The name of the app.
+      eval_set_id: The id of the eval set containing the eval case to update.
+      eval_case: The EvalCase to add.
+
+    Raises:
+      NotFoundError: If the eval set is not found.
+      ValueError: If the eval case already exists in the eval set.
+    """
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = add_eval_case_to_eval_set(eval_set, eval_case)
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)
+
+  @override
+  def update_eval_case(
+      self, app_name: str, eval_set_id: str, updated_eval_case: EvalCase
+  ):
+    """Updates an existing EvalCase.
+
+    Args:
+      app_name: The name of the app.
+      eval_set_id: The id of the eval set containing the eval case to update.
+      updated_eval_case: The updated EvalCase. Overwrites the existing EvalCase
+        using the eval_id field.
+
+    Raises:
+      NotFoundError: If the eval set or the eval case is not found.
+    """
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = update_eval_case_in_eval_set(eval_set, updated_eval_case)
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)
+
+  @override
+  def delete_eval_case(
+      self, app_name: str, eval_set_id: str, eval_case_id: str
+  ):
+    """Deletes the EvalCase with the given eval_case_id from the given EvalSet.
+
+    Args:
+      app_name: The name of the app.
+      eval_set_id: The id of the eval set containing the eval case to delete.
+      eval_case_id: The id of the eval case to delete.
+
+    Raises:
+      NotFoundError: If the eval set or the eval case to delete is not found.
+    """
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = delete_eval_case_from_eval_set(eval_set, eval_case_id)
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)

google/adk/evaluation/local_eval_set_results_manager.py

@@ -17,10 +17,11 @@ from __future__ import annotations
 import json
 import logging
 import os
-import time
 
 from typing_extensions import override
 
+from ..errors.not_found_error import NotFoundError
+from ._eval_set_results_manager_utils import create_eval_set_result
 from .eval_result import EvalCaseResult
 from .eval_result import EvalSetResult
 from .eval_set_results_manager import EvalSetResultsManager
@@ -31,10 +32,6 @@ _ADK_EVAL_HISTORY_DIR = ".adk/eval_history"
 _EVAL_SET_RESULT_FILE_EXTENSION = ".evalset_result.json"
 
 
-def _sanitize_eval_set_result_name(eval_set_result_name: str) -> str:
-  return eval_set_result_name.replace("/", "_")
-
-
 class LocalEvalSetResultsManager(EvalSetResultsManager):
   """An EvalSetResult manager that stores eval set results locally on disk."""
 
@@ -49,15 +46,8 @@ class LocalEvalSetResultsManager(EvalSetResultsManager):
       eval_case_results: list[EvalCaseResult],
   ) -> None:
     """Creates and saves a new EvalSetResult given eval_case_results."""
-    timestamp = time.time()
-    eval_set_result_id = app_name + "_" + eval_set_id + "_" + str(timestamp)
-    eval_set_result_name = _sanitize_eval_set_result_name(eval_set_result_id)
-    eval_set_result = EvalSetResult(
-        eval_set_result_id=eval_set_result_id,
-        eval_set_result_name=eval_set_result_name,
-        eval_set_id=eval_set_id,
-        eval_case_results=eval_case_results,
-        creation_timestamp=timestamp,
+    eval_set_result = create_eval_set_result(
+        app_name, eval_set_id, eval_case_results
     )
     # Write eval result file, with eval_set_result_name.
     app_eval_history_dir = self._get_eval_history_dir(app_name)
@@ -67,7 +57,7 @@ class LocalEvalSetResultsManager(EvalSetResultsManager):
     eval_set_result_json = eval_set_result.model_dump_json()
     eval_set_result_file_path = os.path.join(
         app_eval_history_dir,
-        eval_set_result_name + _EVAL_SET_RESULT_FILE_EXTENSION,
+        eval_set_result.eval_set_result_name + _EVAL_SET_RESULT_FILE_EXTENSION,
     )
     logger.info("Writing eval result to file: %s", eval_set_result_file_path)
     with open(eval_set_result_file_path, "w") as f:
@@ -87,9 +77,7 @@ class LocalEvalSetResultsManager(EvalSetResultsManager):
         + _EVAL_SET_RESULT_FILE_EXTENSION
     )
     if not os.path.exists(maybe_eval_result_file_path):
-      raise ValueError(
-          f"Eval set result `{eval_set_result_id}` does not exist."
-      )
+      raise NotFoundError(f"Eval set result `{eval_set_result_id}` not found.")
     with open(maybe_eval_result_file_path, "r") as file:
       eval_result_data = json.load(file)
     return EvalSetResult.model_validate_json(eval_result_data)