Merge branch 'pr-1576' into evaluations-mig

Author: EmanAbdelhaleem

openml/_api/clients/http.py

@@ -116,15 +116,13 @@ def __init__(  # noqa: PLR0913
         server: str,
         base_url: str,
         api_key: str,
-        timeout_seconds: int,
         retries: int,
         retry_policy: RetryPolicy,
         cache: HTTPCache | None = None,
     ) -> None:
         self.server = server
         self.base_url = base_url
         self.api_key = api_key
-        self.timeout_seconds = timeout_seconds
         self.retries = retries
         self.retry_policy = retry_policy
         self.cache = cache
@@ -238,6 +236,8 @@ def _validate_response(
             raise OpenMLServerError(f"URI too long! ({url})")
 
         retry_raise_e: Exception | None = None
+        code: int | None = None
+        message: str = ""
 
         try:
             code, message = self._parse_exception_response(response)
@@ -276,26 +276,25 @@ def _validate_response(
 
     def _request(  # noqa: PLR0913
         self,
+        session: requests.Session,
         method: str,
         url: str,
         params: Mapping[str, Any],
         data: Mapping[str, Any],
         headers: Mapping[str, str],
-        timeout: float | int,
         files: Mapping[str, Any] | None,
         **request_kwargs: Any,
     ) -> tuple[Response | None, Exception | None]:
         retry_raise_e: Exception | None = None
         response: Response | None = None
 
         try:
-            response = requests.request(
+            response = session.request(
                 method=method,
                 url=url,
                 params=params,
                 data=data,
                 headers=headers,
-                timeout=timeout,
                 files=files,
                 **request_kwargs,
             )
@@ -343,7 +342,6 @@ def request(
         headers = request_kwargs.pop("headers", {}).copy()
         headers.update(self.headers)
 
-        timeout = request_kwargs.pop("timeout", self.timeout_seconds)
         files = request_kwargs.pop("files", None)
 
         if use_cache and not reset_cache and self.cache is not None:
@@ -355,14 +353,15 @@ def request(
             except Exception:
                 raise  # propagate unexpected cache errors
 
+        session = requests.Session()
         for retry_counter in range(1, retries + 1):
             response, retry_raise_e = self._request(
+                session=session,
                 method=method,
                 url=url,
                 params=params,
                 data=data,
                 headers=headers,
-                timeout=timeout,
                 files=files,
                 **request_kwargs,
             )
@@ -377,6 +376,8 @@ def request(
             delay = self.retry_func(retry_counter)
             time.sleep(delay)
 
+        session.close()
+
         assert response is not None
 
         if use_cache and self.cache is not None:

openml/_api/setup/builder.py

@@ -39,7 +39,6 @@ def build(cls, config: Config) -> APIBackendBuilder:
             server=primary_api_config.server,
             base_url=primary_api_config.base_url,
             api_key=primary_api_config.api_key,
-            timeout_seconds=config.connection.timeout_seconds,
             retries=config.connection.retries,
             retry_policy=config.connection.retry_policy,
             cache=http_cache,
@@ -57,7 +56,6 @@ def build(cls, config: Config) -> APIBackendBuilder:
             server=fallback_api_config.server,
             base_url=fallback_api_config.base_url,
             api_key=fallback_api_config.api_key,
-            timeout_seconds=config.connection.timeout_seconds,
             retries=config.connection.retries,
             retry_policy=config.connection.retry_policy,
             cache=http_cache,

openml/_api/setup/config.py

@@ -19,7 +19,6 @@ class APIConfig:
 class ConnectionConfig:
     retries: int
     retry_policy: RetryPolicy
-    timeout_seconds: int
 
 
 @dataclass
@@ -52,7 +51,6 @@ class Config:
         default_factory=lambda: ConnectionConfig(
             retries=5,
             retry_policy=RetryPolicy.HUMAN,
-            timeout_seconds=50,
         )
     )
 

openml/testing.py

@@ -286,7 +286,6 @@ class TestAPIBase(unittest.TestCase):
     server: str
     base_url: str
     api_key: str
-    timeout_seconds: int
     retries: int
     retry_policy: RetryPolicy
     dir: str
@@ -298,7 +297,6 @@ def setUp(self) -> None:
         self.server = "https://test.openml.org/"
         self.base_url = "api/v1/xml"
         self.api_key = "normaluser"
-        self.timeout_seconds = 10
         self.retries = 3
         self.retry_policy = RetryPolicy.HUMAN
         self.dir = "test_cache"
@@ -312,7 +310,6 @@ def setUp(self) -> None:
             server=self.server,
             base_url=self.base_url,
             api_key=self.api_key,
-            timeout_seconds=self.timeout_seconds,
             retries=self.retries,
             retry_policy=self.retry_policy,
             cache=self.cache,
@@ -341,7 +338,6 @@ def _get_http_client(  # noqa: PLR0913
         server: str,
         base_url: str,
         api_key: str,
-        timeout_seconds: int,
         retries: int,
         retry_policy: RetryPolicy,
         cache: HTTPCache | None = None,
@@ -350,7 +346,6 @@ def _get_http_client(  # noqa: PLR0913
             server=server,
             base_url=base_url,
             api_key=api_key,
-            timeout_seconds=timeout_seconds,
             retries=retries,
             retry_policy=retry_policy,
             cache=cache,

tests/test_api/test_versions.py

@@ -65,7 +65,6 @@ def setUp(self):
             server=self.server,
             base_url=self.base_url,
             api_key=self.api_key,
-            timeout_seconds=self.timeout_seconds,
             retries=self.retries,
             retry_policy=self.retry_policy,
             cache=self.cache,
@@ -92,7 +91,6 @@ def setUp(self):
             server="",
             base_url="",
             api_key="",
-            timeout_seconds=self.timeout_seconds,
             retries=self.retries,
             retry_policy=self.retry_policy,
             cache=self.cache,