merge

Author: Omswastik-11

openml/_config.py

@@ -27,7 +27,7 @@
 openml_logger = logging.getLogger("openml")
 
 
-SERVERS_REGISTRY: dict[str, dict[APIVersion, dict[str, str | None]]] = {
+_SERVERS_REGISTRY: dict[str, dict[APIVersion, dict[str, str | None]]] = {
     "production": {
         APIVersion.V1: {
             "server": "https://www.openml.org/api/v1/xml/",
@@ -50,12 +50,12 @@
     },
     "local": {
         APIVersion.V1: {
-            "server": "http://localhost:8000/api/v1/xml/",
+            "server": "http://localhost:8080/api/v1/xml/",
             "apikey": "normaluser",
         },
         APIVersion.V2: {
-            "server": "http://localhost:8002/api/v1/xml/",
-            "apikey": "normaluser",
+            "server": "http://localhost:8082/",
+            "apikey": "AD000000000000000000000000000000",
         },
     },
 }
@@ -97,7 +97,7 @@ class OpenMLConfig:
     """Dataclass storing the OpenML configuration."""
 
     servers: dict[APIVersion, dict[str, str | None]] = field(
-        default_factory=lambda: deepcopy(SERVERS_REGISTRY["production"])
+        default_factory=lambda: deepcopy(_SERVERS_REGISTRY["production"])
     )
     api_version: APIVersion = APIVersion.V1
     fallback_api_version: APIVersion | None = None
@@ -137,15 +137,10 @@ def __init__(self) -> None:
         self.console_handler: logging.StreamHandler | None = None
         self.file_handler: logging.handlers.RotatingFileHandler | None = None
 
-        server_test_v1_apikey = self.get_servers("test")[APIVersion.V1]["apikey"]
-        server_test_v1_server = self.get_servers("test")[APIVersion.V1]["server"]
-
         self.OPENML_CACHE_DIR_ENV_VAR = "OPENML_CACHE_DIR"
         self.OPENML_SKIP_PARQUET_ENV_VAR = "OPENML_SKIP_PARQUET"
-        self._TEST_SERVER_NORMAL_USER_KEY = server_test_v1_apikey
-        self._HEADERS: dict[str, str] = {"user-agent": f"openml-python/{__version__}"}
         self.OPENML_TEST_SERVER_ADMIN_KEY_ENV_VAR = "OPENML_TEST_SERVER_ADMIN_KEY"
-        self.TEST_SERVER_URL = cast("str", server_test_v1_server).split("/api/v1/xml")[0]
+        self._HEADERS: dict[str, str] = {"user-agent": f"openml-python/{__version__}"}
 
         self._config: OpenMLConfig = OpenMLConfig()
         # for legacy test `test_non_writable_home`
@@ -178,7 +173,6 @@ def __setattr__(self, name: str, value: Any) -> None:
             "_examples",
             "OPENML_CACHE_DIR_ENV_VAR",
             "OPENML_SKIP_PARQUET_ENV_VAR",
-            "_TEST_SERVER_NORMAL_USER_KEY",
             "_HEADERS",
         }:
             return object.__setattr__(self, name, value)
@@ -258,11 +252,11 @@ def get_server_base_url(self) -> str:
         return domain.replace("api", "www")
 
     def get_servers(self, mode: str) -> dict[APIVersion, dict[str, str | None]]:
-        if mode not in SERVERS_REGISTRY:
+        if mode not in _SERVERS_REGISTRY:
             raise ValueError(
-                f'invalid mode="{mode}" allowed modes: {", ".join(list(SERVERS_REGISTRY.keys()))}'
+                f'invalid mode="{mode}" allowed modes: {", ".join(list(_SERVERS_REGISTRY.keys()))}'
             )
-        return deepcopy(SERVERS_REGISTRY[mode])
+        return deepcopy(_SERVERS_REGISTRY[mode])
 
     def set_servers(self, mode: str) -> None:
         servers = self.get_servers(mode)
@@ -525,8 +519,9 @@ def start_using_configuration_for_example(self) -> None:
             self._manager._config,
             servers=self._test_servers,
         )
+        test_server = self._test_servers[self._manager._config.api_version]["server"]
         warnings.warn(
-            f"Switching to the test servers {self._test_servers} to not upload results to "
+            f"Switching to the test server {test_server} to not upload results to "
             "the live server. Using the test server may result in reduced performance of the "
             "API!",
             stacklevel=2,

openml/cli.py

@@ -8,10 +8,12 @@
 from collections.abc import Callable
 from dataclasses import fields
 from pathlib import Path
+from typing import cast
 from urllib.parse import urlparse
 
 import openml
 from openml.__version__ import __version__
+from openml.enums import APIVersion
 
 
 def is_hex(string_: str) -> bool:
@@ -110,9 +112,9 @@ def check_server(server: str) -> str:
 
     def replace_shorthand(server: str) -> str:
         if server == "test":
-            return f"{openml.config.TEST_SERVER_URL}/api/v1/xml"
+            return cast("str", openml.config.get_servers("test")[APIVersion.V1]["server"])
         if server == "production_server":
-            return "https://www.openml.org/api/v1/xml"
+            return cast("str", openml.config.get_servers("production")[APIVersion.V1]["server"])
         return server
 
     configure_field(

openml/testing.py

@@ -49,9 +49,7 @@ class TestBase(unittest.TestCase):
         "user": [],
     }
     flow_name_tracker: ClassVar[list[str]] = []
-    test_server = f"{openml.config.TEST_SERVER_URL}/api/v1/xml/"
     admin_key = os.environ.get(openml.config.OPENML_TEST_SERVER_ADMIN_KEY_ENV_VAR)
-    user_key = openml.config._TEST_SERVER_NORMAL_USER_KEY
 
     # creating logger for tracking files uploaded to test server
     logger = logging.getLogger("unit_tests_published_entities")
@@ -106,8 +104,6 @@ def setUp(self, n_levels: int = 1, tmpdir_suffix: str = "") -> None:
         os.chdir(self.workdir)
 
         self.cached = True
-        openml.config.apikey = TestBase.user_key
-        self.production_server = "https://www.openml.org/api/v1/xml"
         openml.config.set_root_cache_directory(str(self.workdir))
 
         # Increase the number of retries to avoid spurious server failures
@@ -128,8 +124,7 @@ def use_production_server(self) -> None:
 
         Please use this sparingly - it is better to use the test server.
         """
-        openml.config.server = self.production_server
-        openml.config.apikey = ""
+        openml.config.set_servers("production")
 
     def tearDown(self) -> None:
         """Tear down the test"""

tests/conftest.py

@@ -99,8 +99,7 @@ def delete_remote_files(tracker, flow_names) -> None:
     :param tracker: Dict
     :return: None
     """
-    openml.config.server = TestBase.test_server
-    openml.config.apikey = TestBase.user_key
+    openml.config.set_servers("test")
 
     # reordering to delete sub flows at the end of flows
     # sub-flows have shorter names, hence, sorting by descending order of flow name length
@@ -252,8 +251,23 @@ def test_files_directory() -> Path:
 
 
 @pytest.fixture(scope="session")
-def test_api_key() -> str:
-    return TestBase.user_key
+def test_server_v1() -> str:
+    return openml.config.get_servers("test")[APIVersion.V1]["server"]
+
+
+@pytest.fixture(scope="session")
+def test_apikey_v1() -> str:
+    return openml.config.get_servers("test")[APIVersion.V1]["apikey"]
+
+
+@pytest.fixture(scope="session")
+def test_server_v2() -> str:
+    return openml.config.get_servers("test")[APIVersion.V2]["server"]
+
+
+@pytest.fixture(scope="session")
+def test_apikey_v2() -> str:
+    return openml.config.get_servers("test")[APIVersion.V2]["apikey"]
 
 
 @pytest.fixture(autouse=True, scope="function")
@@ -274,13 +288,12 @@ def as_robot() -> Iterator[None]:
 
 @pytest.fixture(autouse=True)
 def with_server(request):
+    openml.config.set_api_version(APIVersion.V1)
     if "production_server" in request.keywords:
-        openml.config.server = "https://www.openml.org/api/v1/xml/"
-        openml.config.apikey = None
+        openml.config.set_servers("production")
         yield
         return
-    openml.config.server = f"{openml.config.TEST_SERVER_URL}/api/v1/xml/"
-    openml.config.apikey = TestBase.user_key
+    openml.config.set_servers("test")
     yield
 
 
@@ -311,16 +324,6 @@ def workdir(tmp_path):
     os.chdir(original_cwd)
 
 
-@pytest.fixture
-def use_api_v1() -> None:
-    openml.config.set_api_version(api_version=APIVersion.V1)
-
-
-@pytest.fixture
-def use_api_v2() -> None:
-    openml.config.set_api_version(api_version=APIVersion.V2)
-
-
 @pytest.fixture
 def http_client_v1() -> HTTPClient:
     return HTTPClient(api_version=APIVersion.V1)