requested changes

Author: satvshr

openml/_api/resources/base/resources.py

@@ -43,6 +43,11 @@ def get(
         """
         ...
 
+    @abstractmethod
+    def supports_download_splits(self) -> bool:
+        """Return whether the task API implementation supports split downloads."""
+        ...
+
     # Task listing (V1 only)
     @abstractmethod
     def list(

openml/_api/resources/task.py

@@ -200,6 +200,9 @@ def get(self, task_id: int) -> OpenMLTask:
         response = self._http.get(f"task/{task_id}", enable_cache=True)
         return _create_task_from_xml(response.text)
 
+    def supports_download_splits(self) -> bool:
+        return True
+
     def list(
         self,
         limit: int,
@@ -401,3 +404,6 @@ def list(
         **kwargs: Any,  # noqa: ARG002
     ) -> pd.DataFrame:
         raise self._not_supported(method="list")
+
+    def supports_download_splits(self) -> bool:
+        return False

openml/tasks/functions.py

@@ -134,7 +134,11 @@ def get_tasks(
     tasks = []
     for task_id in task_ids:
         tasks.append(
-            get_task(task_id, download_data=download_data, download_qualities=download_qualities)
+            get_task(
+                task_id,
+                download_data=download_data,
+                download_qualities=download_qualities,
+            )
         )
     return tasks
 
@@ -166,8 +170,6 @@ def get_task(
     -------
     task: OpenMLTask
     """
-    from openml._api.resources.task import TaskV1API, TaskV2API
-
     if not isinstance(task_id, int):
         raise TypeError(f"Task id should be integer, is {type(task_id)}")
 
@@ -180,17 +182,14 @@ def get_task(
     ):
         task.class_labels = dataset.retrieve_class_labels(task.target_name)
 
-    if (
-        download_splits
-        and isinstance(task, OpenMLSupervisedTask)
-        and isinstance(openml._backend.task, TaskV1API)
-    ):
-        task.download_split()
-    elif download_splits and isinstance(openml._backend.task, TaskV2API):
-        warnings.warn(
-            "`download_splits` is not yet supported in the v2 API and will be ignored.",
-            stacklevel=2,
-        )
+    if download_splits and isinstance(task, OpenMLSupervisedTask):
+        if openml._backend.task.supports_download_splits():
+            task.download_split()
+        else:
+            warnings.warn(
+                "`download_splits` is not yet supported in the v2 API and will be ignored.",
+                stacklevel=2,
+            )
 
     return task
 

tests/test_tasks/test_task_functions.py

@@ -14,7 +14,7 @@
     OpenMLNotAuthorizedError,
     OpenMLServerException,
 )
-from openml.tasks import TaskType
+from openml.tasks import TaskType, task
 from openml.testing import TestBase, create_request_response
 
 
@@ -29,7 +29,7 @@ def tearDown(self):
 
     @pytest.mark.test_server()
     def test__get_estimation_procedure_list(self):
-        estimation_procedures = openml.tasks.functions._get_estimation_procedure_list()
+        estimation_procedures = openml._api.resources.task._get_estimation_procedure_list()
         assert isinstance(estimation_procedures, list)
         assert isinstance(estimation_procedures[0], dict)
         assert estimation_procedures[0]["task_type_id"] == TaskType.SUPERVISED_CLASSIFICATION
@@ -116,6 +116,13 @@ def test_list_tasks_per_type_paginate(self):
                     assert j == task["ttid"]
                     self._check_task(task)
 
+    @pytest.mark.test_server()
+    def test__get_task(self):
+        openml.config.set_root_cache_directory(self.static_cache_dir)
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            openml.tasks.get_task(1882)
+            mock_request.assert_not_called()
+
     @unittest.skip(
         "Please await outcome of discussion: https://github.com/openml/OpenML/issues/776",
     )
@@ -126,13 +133,18 @@ def test__get_task_live(self):
         # https://github.com/openml/openml-python/issues/378
         openml.tasks.get_task(34536)
 
-    @pytest.mark.skipif(
-        os.getenv("OPENML_USE_LOCAL_SERVICES") == "true",
-        reason="Pending resolution of #1657",
-    )
+    @pytest.mark.test_server()
+    def test_get_task(self):
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            openml.tasks.get_task(1)
+            mock_request.assert_not_called()
+
     @pytest.mark.test_server()
     def test_get_task_lazy(self):
-        task = openml.tasks.get_task(2, download_data=False)  # anneal; crossvalidation
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            task = openml.tasks.get_task(2, download_data=False)  # anneal; crossvalidation
+            mock_request.assert_not_called()
+
         assert isinstance(task, OpenMLTask)
         assert os.path.exists(
             os.path.join(openml.config.get_cache_directory(), "tasks", "2", "task.xml")
@@ -151,7 +163,10 @@ def test_get_task_lazy(self):
             )
         )
 
-        task.download_split()
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            task.download_split()
+            mock_request.assert_not_called()        
+            
         assert os.path.exists(
             os.path.join(
                 openml.config.get_cache_directory(), "tasks", "2", "datasplits.arff"
@@ -177,6 +192,15 @@ def assert_and_raise(*args, **kwargs):
         # Now the file should no longer exist
         assert not os.path.exists(os.path.join(os.getcwd(), "tasks", "1", "tasks.xml"))
 
+    @pytest.mark.test_server()
+    def test_get_task_with_cache(self):
+        openml.config.set_root_cache_directory(self.static_cache_dir)
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            task = openml.tasks.get_task(1)
+            mock_request.assert_not_called()
+
+        assert isinstance(task, OpenMLTask)
+
     @pytest.mark.production_server()
     def test_get_task_different_types(self):
         self.use_production_server()
@@ -189,8 +213,10 @@ def test_get_task_different_types(self):
 
     @pytest.mark.test_server()
     def test_download_split(self):
-        task = openml.tasks.get_task(1)  # anneal; crossvalidation
-        split = task.download_split()
+        with unittest.mock.patch("requests.sessions.Session.request") as mock_request:
+            task = openml.tasks.get_task(1)  # anneal; crossvalidation
+            split = task.download_split()
+            mock_request.assert_not_called()
         assert type(split) == OpenMLSplit
         assert os.path.exists(
             os.path.join(