sync with pr-1576

Author: EmanAbdelhaleem

openml/_api/resources/base/__init__.py

@@ -1,11 +1,12 @@
 from openml._api.resources.base.base import APIVersion, ResourceAPI, ResourceType
 from openml._api.resources.base.fallback import FallbackProxy
-from openml._api.resources.base.resources import DatasetsAPI, TasksAPI
+from openml._api.resources.base.resources import DatasetsAPI, EstimationProceduresAPI, TasksAPI
 from openml._api.resources.base.versions import ResourceV1, ResourceV2
 
 __all__ = [
     "APIVersion",
     "DatasetsAPI",
+    "EstimationProceduresAPI",
     "FallbackProxy",
     "ResourceAPI",
     "ResourceType",

openml/_api/resources/base/resources.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import builtins
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from typing import TYPE_CHECKING, Any
 
 from openml._api.resources.base import ResourceAPI, ResourceType
@@ -32,7 +32,7 @@ def get(
     ) -> OpenMLTask | tuple[OpenMLTask, Response]: ...
 
 
-class EstimationProceduresAPI(ResourceAPI, ABC):
+class EstimationProceduresAPI(ResourceAPI):
     @abstractmethod
     def list(self) -> list[str]: ...
 

openml/_api/resources/estimation_procedures.py

@@ -6,11 +6,11 @@
 
 import xmltodict
 
-from openml._api.resources.base import EstimationProceduresAPI
+from openml._api.resources.base import EstimationProceduresAPI, ResourceV1, ResourceV2
 from openml.tasks.task import TaskType
 
 
-class EstimationProceduresV1(EstimationProceduresAPI):
+class EstimationProceduresV1(ResourceV1, EstimationProceduresAPI):
     """V1 API implementation for estimation procedures.
 
     Fetches estimation procedures from the v1 XML API endpoint.
@@ -105,7 +105,7 @@ def _get_details(self) -> builtins.list[dict[str, Any]]:
         return procs
 
 
-class EstimationProceduresV2(EstimationProceduresAPI):
+class EstimationProceduresV2(ResourceV2, EstimationProceduresAPI):
     """V2 API implementation for estimation procedures.
 
     Fetches estimation procedures from the v2 JSON API endpoint.

openml/_api/runtime/core.py

@@ -8,9 +8,9 @@
 from openml._api.resources import (
     DatasetsV1,
     DatasetsV2,
-    FallbackProxy,
     EstimationProceduresV1,
     EstimationProceduresV2,
+    FallbackProxy,
     TasksV1,
     TasksV2,
 )
@@ -77,6 +77,9 @@ def build_backend(version: str, *, strict: bool) -> APIBackend:
     return APIBackend(
         datasets=FallbackProxy(DatasetsV2(v2_http_client), DatasetsV1(v1_http_client)),
         tasks=FallbackProxy(TasksV2(v2_http_client), TasksV1(v1_http_client)),
+        estimation_procedures=FallbackProxy(
+            EstimationProceduresV2(v2_http_client), EstimationProceduresV1(v1_http_client)
+        ),
     )
 
 

openml/tasks/functions.py

@@ -12,6 +12,7 @@
 
 import openml._api_calls
 import openml.utils
+from openml._api import api_context
 from openml.datasets import get_dataset
 from openml.exceptions import OpenMLCacheException
 
@@ -80,7 +81,8 @@ def _get_estimation_procedure_list() -> list[dict[str, Any]]:
         a dictionary containing the following information: id, task type id,
         name, type, repeats, folds, stratified.
     """
-    return api_context.backend.estimation_procedures._get_details()
+    result: list[dict[str, Any]] = api_context.backend.estimation_procedures._get_details()
+    return result
 
 
 def list_tasks(  # noqa: PLR0913