move _HEADERS to confing

Author: geetu040

openml/_api/clients/http.py

@@ -17,7 +17,6 @@
 from requests import Response
 
 import openml
-from openml.__version__ import __version__
 from openml.enums import APIVersion, RetryPolicy
 from openml.exceptions import (
     OpenMLAuthenticationError,
@@ -27,8 +26,6 @@
     OpenMLServerNoResult,
 )
 
-_HEADERS: dict[str, str] = {"user-agent": f"openml-python/{__version__}"}
-
 
 class HTTPCache:
     """
@@ -236,10 +233,6 @@ def retry_policy(self) -> RetryPolicy:
     def retry_func(self) -> Callable:
         return self._human_delay if self.retry_policy == RetryPolicy.HUMAN else self._robot_delay
 
-    @property
-    def headers(self) -> dict[str, str]:
-        return _HEADERS
-
     def _robot_delay(self, n: int) -> float:
         """
         Compute delay for automated retry policy.
@@ -594,7 +587,7 @@ def _request(  # noqa: PLR0913, C901
 
         # prepare headers
         headers = request_kwargs.pop("headers", {}).copy()
-        headers.update(_HEADERS)
+        headers.update(openml.config._HEADERS)
 
         files = request_kwargs.pop("files", None)
 

openml/_api/clients/minio.py

@@ -3,9 +3,6 @@
 from pathlib import Path
 
 import openml
-from openml.__version__ import __version__
-
-_HEADERS: dict[str, str] = {"user-agent": f"openml-python/{__version__}"}
 
 
 class MinIOClient:
@@ -29,7 +26,3 @@ class MinIOClient:
     @property
     def path(self) -> Path:
         return Path(openml.config.get_cache_directory())
-
-    @property
-    def headers(self) -> dict[str, str]:
-        return _HEADERS

openml/_config.py

@@ -21,6 +21,8 @@
 
 from openml.enums import APIVersion
 
+from .__version__ import __version__
+
 logger = logging.getLogger(__name__)
 openml_logger = logging.getLogger("openml")
 
@@ -141,6 +143,7 @@ def __init__(self) -> None:
         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]
 
@@ -176,6 +179,7 @@ def __setattr__(self, name: str, value: Any) -> None:
             "OPENML_CACHE_DIR_ENV_VAR",
             "OPENML_SKIP_PARQUET_ENV_VAR",
             "_TEST_SERVER_NORMAL_USER_KEY",
+            "_HEADERS",
         }:
             return object.__setattr__(self, name, value)
 

tests/test_api/test_http.py

@@ -1,7 +1,6 @@
 from requests import Response, Request, Session
 from unittest.mock import patch
 import pytest
-from openml.testing import TestBase
 import os
 from pathlib import Path
 from urllib.parse import urljoin, urlparse
@@ -209,7 +208,7 @@ def test_post(http_client):
             url=urljoin(openml.config.server, resource_name),
             params={},
             data={"api_key": openml.config.apikey},
-            headers=http_client.headers,
+            headers=openml.config._HEADERS,
             files=resource_files,
         )
 
@@ -234,6 +233,6 @@ def test_delete(http_client):
             ),
             params={"api_key": openml.config.apikey},
             data={},
-            headers=http_client.headers,
+            headers=openml.config._HEADERS,
             files=None,
         )