Merge branch 'migration' of https://github.com/geetu040/openml-python into runs-migration-stacked

Author: Omswastik-11

openml/_api/clients/http.py

@@ -211,7 +211,7 @@ def __init__(
     def server(self) -> str:
         server = openml.config.servers[self.api_version]["server"]
         if server is None:
-            servers_repr = {k.value: v for k, v in openml.config.servers}
+            servers_repr = {k.value: v for k, v in openml.config.servers.items()}
             raise ValueError(
                 f'server found to be None for api_version="{self.api_version}" in {servers_repr}'
             )

openml/_api/setup/backend.py

@@ -7,6 +7,7 @@
 from .builder import APIBackendBuilder
 
 if TYPE_CHECKING:
+    from openml._api.clients import HTTPClient, MinIOClient
     from openml._api.resources import (
         DatasetAPI,
         EstimationProcedureAPI,
@@ -111,6 +112,18 @@ def run(self) -> RunAPI:
     def setup(self) -> SetupAPI:
         return cast("SetupAPI", self._backend.setup)
 
+    @property
+    def http_client(self) -> HTTPClient:
+        return cast("HTTPClient", self._backend.http_client)
+
+    @property
+    def fallback_http_client(self) -> HTTPClient | None:
+        return cast("HTTPClient | None", self._backend.fallback_http_client)
+
+    @property
+    def minio_client(self) -> MinIOClient:
+        return cast("MinIOClient", self._backend.minio_client)
+
     @classmethod
     def get_instance(cls) -> APIBackend:
         """

openml/_api/setup/builder.py

@@ -1,10 +1,15 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+from typing import TYPE_CHECKING
 
 from openml._api.clients import HTTPClient, MinIOClient
-from openml._api.resources import API_REGISTRY, FallbackProxy, ResourceAPI
-from openml.enums import APIVersion, ResourceType
+from openml._api.resources import API_REGISTRY, FallbackProxy
+from openml.enums import ResourceType
+
+if TYPE_CHECKING:
+    from openml._api.resources import ResourceAPI
+    from openml.enums import APIVersion
 
 
 class APIBackendBuilder:
@@ -41,10 +46,17 @@ class APIBackendBuilder:
         API interface for run resources.
     setup : ResourceAPI | FallbackProxy
         API interface for setup resources.
+    http_client : HTTPClient
+        Client for HTTP Communication.
+    fallback_http_client : HTTPClient | None
+        Fallback Client for HTTP Communication.
+    minio_client : MinIOClient
+        Client for MinIO Communication.
     """
 
     def __init__(
         self,
+        clients: Mapping[str, HTTPClient | MinIOClient | None],
         resource_apis: Mapping[ResourceType, ResourceAPI | FallbackProxy],
     ):
         self.dataset = resource_apis[ResourceType.DATASET]
@@ -56,6 +68,9 @@ def __init__(
         self.study = resource_apis[ResourceType.STUDY]
         self.run = resource_apis[ResourceType.RUN]
         self.setup = resource_apis[ResourceType.SETUP]
+        self.http_client = clients["http_client"]
+        self.fallback_http_client = clients["fallback_http_client"]
+        self.minio_client = clients["minio_client"]
 
     @classmethod
     def build(
@@ -82,17 +97,22 @@ def build(
             Builder instance with all resource API interfaces initialized.
         """
         minio_client = MinIOClient()
-
         primary_http_client = HTTPClient(api_version=api_version)
+        clients: dict[str, HTTPClient | MinIOClient | None] = {
+            "http_client": primary_http_client,
+            "fallback_http_client": None,
+            "minio_client": minio_client,
+        }
 
         resource_apis: dict[ResourceType, ResourceAPI] = {}
         for resource_type, resource_api_cls in API_REGISTRY[api_version].items():
             resource_apis[resource_type] = resource_api_cls(primary_http_client, minio_client)
 
         if fallback_api_version is None:
-            return cls(resource_apis)
+            return cls(clients, resource_apis)
 
         fallback_http_client = HTTPClient(api_version=fallback_api_version)
+        clients["fallback_http_client"] = fallback_http_client
 
         fallback_resource_apis: dict[ResourceType, ResourceAPI] = {}
         for resource_type, resource_api_cls in API_REGISTRY[fallback_api_version].items():
@@ -105,4 +125,4 @@ def build(
             for name in resource_apis
         }
 
-        return cls(merged)
+        return cls(clients, merged)

tests/test_api/test_versions.py

@@ -1,7 +1,7 @@
 import pytest
 from requests import Session, Response
 from unittest.mock import patch
-from openml._api import FallbackProxy, ResourceAPI, ResourceV1API, ResourceV2API, TaskAPI
+from openml._api import FallbackProxy, ResourceAPI, ResourceV1API, ResourceV2API
 from openml.enums import ResourceType
 from openml.exceptions import OpenMLNotSupportedError
 import openml
@@ -11,11 +11,11 @@ class DummyTaskAPI(ResourceAPI):
     resource_type: ResourceType = ResourceType.TASK
 
 
-class DummyTaskV1API(ResourceV1API, TaskAPI):
+class DummyTaskV1API(ResourceV1API, DummyTaskAPI):
     pass
 
 
-class DummyTaskV2API(ResourceV2API, TaskAPI):
+class DummyTaskV2API(ResourceV2API, DummyTaskAPI):
     pass