Merge branch 'main' into estimation-procedures-mig

Author: geetu040

openml/_api/resources/base/resources.py

@@ -29,6 +29,9 @@ class EvaluationMeasureAPI(ResourceAPI):
 
     resource_type: ResourceType = ResourceType.EVALUATION_MEASURE
 
+    @abstractmethod
+    def list(self) -> list[str]: ...
+
 
 class EstimationProcedureAPI(ResourceAPI):
     """Abstract API interface for estimation procedure resources."""

openml/_api/resources/evaluation_measure.py

@@ -1,11 +1,60 @@
 from __future__ import annotations
 
+import xmltodict
+
 from .base import EvaluationMeasureAPI, ResourceV1API, ResourceV2API
 
 
 class EvaluationMeasureV1API(ResourceV1API, EvaluationMeasureAPI):
-    """Version 1 API implementation for evaluation measure resources."""
+    """V1 API implementation for evaluation measures.
+
+    Fetches evaluation measures from the v1 XML API endpoint.
+    """
+
+    def list(self) -> list[str]:
+        """List all evaluation measures available on OpenML.
+
+        Returns
+        -------
+        list[str]
+            A list of evaluation measure names.
+        """
+        path = "evaluationmeasure/list"
+        response = self._http.get(path)
+        xml_content = response.text
+
+        qualities = xmltodict.parse(xml_content, force_list=("oml:measures"))
+        # Minimalistic check if the XML is useful
+        if "oml:evaluation_measures" not in qualities:
+            raise ValueError('Error in return XML, does not contain "oml:evaluation_measures"')
+
+        if not isinstance(
+            qualities["oml:evaluation_measures"]["oml:measures"][0]["oml:measure"], list
+        ):
+            raise TypeError('Error in return XML, does not contain "oml:measure" as a list')
+
+        return qualities["oml:evaluation_measures"]["oml:measures"][0]["oml:measure"]
 
 
 class EvaluationMeasureV2API(ResourceV2API, EvaluationMeasureAPI):
-    """Version 2 API implementation for evaluation measure resources."""
+    """V2 API implementation for evaluation measures.
+
+    Fetches evaluation measures from the v2 JSON API endpoint.
+    """
+
+    def list(self) -> list[str]:
+        """List all evaluation measures available on OpenML.
+
+        Returns
+        -------
+        list[str]
+            A list of evaluation measure names.
+        """
+        path = "evaluationmeasure/list"
+        response = self._http.get(path)
+        data = response.json()
+
+        if not isinstance(data, list):
+            raise ValueError(f"Expected list, got {type(data)}")
+
+        return data

openml/evaluations/functions.py

@@ -153,17 +153,7 @@ def list_evaluation_measures() -> list[str]:
     list
 
     """
-    api_call = "evaluationmeasure/list"
-    xml_string = openml._api_calls._perform_api_call(api_call, "get")
-    qualities = xmltodict.parse(xml_string, force_list=("oml:measures"))
-    # Minimalistic check if the XML is useful
-    if "oml:evaluation_measures" not in qualities:
-        raise ValueError('Error in return XML, does not contain "oml:evaluation_measures"')
-
-    if not isinstance(qualities["oml:evaluation_measures"]["oml:measures"][0]["oml:measure"], list):
-        raise TypeError('Error in return XML, does not contain "oml:measure" as a list')
-
-    return qualities["oml:evaluation_measures"]["oml:measures"][0]["oml:measure"]
+    return openml._backend.evaluation_measure.list()
 
 
 def list_estimation_procedures() -> list[str]:

tests/test_api/test_evaluation_measure.py

@@ -0,0 +1,38 @@
+# License: BSD 3-Clause  
+from __future__ import annotations  
+  
+import pytest    
+from openml._api import EvaluationMeasureV1API, EvaluationMeasureV2API
+
+
+@pytest.fixture
+def evaluation_measure_v1(http_client_v1, minio_client) -> EvaluationMeasureV1API:
+    return EvaluationMeasureV1API(http=http_client_v1, minio=minio_client)
+
+
+@pytest.fixture
+def evaluation_measure_v2(http_client_v2, minio_client) -> EvaluationMeasureV2API:
+    return EvaluationMeasureV2API(http=http_client_v2, minio=minio_client)
+
+
+@pytest.mark.test_server()
+def test_v1_list(evaluation_measure_v1):
+    measures = evaluation_measure_v1.list()   
+    assert isinstance(measures, list)
+    assert all(isinstance(s, str) for s in measures)
+
+
+@pytest.mark.test_server()
+def test_v2_list(evaluation_measure_v2):
+    measures = evaluation_measure_v2.list()   
+    assert isinstance(measures, list)
+    assert all(isinstance(s, str) for s in measures)
+
+
+@pytest.mark.test_server()
+def test_list_matches(evaluation_measure_v1,evaluation_measure_v2):
+    output_v1 = evaluation_measure_v1.list()
+    output_v2 = evaluation_measure_v2.list()
+
+    assert type(output_v1) == type(output_v2)
+    assert output_v1 == output_v2