Merge remote-tracking branch 'geetu040/migration' into tasks

Author: satvshr

openml/config.py

@@ -534,7 +534,7 @@ def _sync_api_config() -> None:
 
     p = urlparse(server)
     v1_server = f"{p.scheme}://{p.netloc}/"
-    v1_base_url = p.path.lstrip("/")
+    v1_base_url = p.path.rstrip("/") + "/"  # requirement for urllib.parse.urljoin
     connection_retry_policy = RetryPolicy.HUMAN if retry_policy == "human" else RetryPolicy.ROBOT
     cache_dir = str(_root_cache_directory)
 

openml/testing.py

@@ -281,54 +281,42 @@ def _check_fold_timing_evaluations(  # noqa: PLR0913
                         assert evaluation <= max_val
 
 
-class TestAPIBase(unittest.TestCase):
-    retries: int
-    retry_policy: RetryPolicy
-    ttl: int
-    cache_dir: Path
+class TestAPIBase(TestBase):
     cache: HTTPCache
     http_clients: dict[APIVersion, HTTPClient]
     minio_client: MinIOClient
-    current_api_version: APIVersion | None
 
-    def setUp(self) -> None:
-        config = openml._backend.get_config()
-
-        self.retries = config.connection.retries
-        self.retry_policy = config.connection.retry_policy
-        self.ttl = config.cache.ttl
-        self.current_api_version = None
+    def setUp(self, n_levels: int = 1, tmpdir_suffix: str = "") -> None:
+        super().setUp(n_levels=n_levels, tmpdir_suffix=tmpdir_suffix)
 
-        abspath_this_file = Path(inspect.getfile(self.__class__)).absolute()
-        self.cache_dir = abspath_this_file.parent.parent / "files"
-        if not self.cache_dir.is_dir():
-            raise ValueError(
-                f"Cannot find test cache dir, expected it to be {self.cache_dir}!",
-            )
+        retries = self.connection_n_retries
+        retry_policy = RetryPolicy.HUMAN if self.retry_policy == "human" else RetryPolicy.ROBOT
+        ttl = openml._backend.get_config_value("cache.ttl")
+        cache_dir = self.static_cache_dir
 
         self.cache = HTTPCache(
-            path=self.cache_dir,
-            ttl=self.ttl,
+            path=cache_dir,
+            ttl=ttl,
         )
         self.http_clients = {
             APIVersion.V1: HTTPClient(
                 server="https://test.openml.org/",
                 base_url="api/v1/xml/",
                 api_key="normaluser",
-                retries=self.retries,
-                retry_policy=self.retry_policy,
+                retries=retries,
+                retry_policy=retry_policy,
                 cache=self.cache,
             ),
             APIVersion.V2: HTTPClient(
                 server="http://localhost:8002/",
                 base_url="",
                 api_key="",
-                retries=self.retries,
-                retry_policy=self.retry_policy,
+                retries=retries,
+                retry_policy=retry_policy,
                 cache=self.cache,
             ),
         }
-        self.minio_client = MinIOClient(path=self.cache_dir)
+        self.minio_client = MinIOClient(path=cache_dir)
 
 
 def check_task_existence(

tests/test_api/test_http.py

@@ -6,9 +6,12 @@
 import os
 from urllib.parse import urljoin
 from openml.enums import APIVersion
+from openml._api import HTTPClient
 
 
 class TestHTTPClient(TestAPIBase):
+    http_client: HTTPClient
+
     def setUp(self):
         super().setUp()
         self.http_client = self.http_clients[APIVersion.V1]

tests/test_api/test_versions.py

@@ -1,13 +1,15 @@
 from time import time
 import pytest
 from openml.testing import TestAPIBase
-from openml._api import ResourceV1API, ResourceV2API, FallbackProxy
+from openml._api import ResourceV1API, ResourceV2API, FallbackProxy, ResourceAPI
 from openml.enums import ResourceType, APIVersion
 from openml.exceptions import OpenMLNotSupportedError
 
 
 @pytest.mark.uses_test_server()
 class TestResourceAPIBase(TestAPIBase):
+    resource: ResourceAPI | FallbackProxy
+
     def _publish_and_delete(self):
         task_xml = """
         <oml:task_inputs xmlns:oml="http://openml.org/openml">