Skip to content

Commit 81058b7

Browse files
final commit
1 parent f9f31bd commit 81058b7

2 files changed

Lines changed: 43 additions & 44 deletions

File tree

openml/_api/resources/setup.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,20 @@ class SetupV2API(ResourceV2API, SetupAPI):
208208

209209
def list(
210210
self,
211-
limit: int,
212-
offset: int,
211+
limit: int, # noqa: ARG002
212+
offset: int, # noqa: ARG002
213213
*,
214-
setup: Iterable[int] | None = None,
215-
flow: int | None = None,
216-
tag: str | None = None,
214+
setup: Iterable[int] | None = None, # noqa: ARG002
215+
flow: int | None = None, # noqa: ARG002
216+
tag: str | None = None, # noqa: ARG002
217217
) -> builtins.list[OpenMLSetup]:
218-
raise NotImplementedError("V2 API implementation is not yet available")
218+
self._not_supported(method="list")
219219

220-
def _create_setup(self, result_dict: dict) -> OpenMLSetup:
221-
raise NotImplementedError("V2 API implementation is not yet available")
220+
def _create_setup(self, result_dict: dict) -> OpenMLSetup: # noqa: ARG002
221+
self._not_supported(method="create_setup")
222222

223-
def get(self, setup_id: int) -> OpenMLSetup:
224-
raise NotImplementedError("V2 API implementation is not yet available")
223+
def get(self, setup_id: int) -> OpenMLSetup: # noqa: ARG002
224+
self._not_supported(method="get")
225225

226-
def exists(self, file_elements: dict[str, Any]) -> int | bool:
227-
raise NotImplementedError("V2 API implementation is not yet available")
226+
def exists(self, file_elements: dict[str, Any]) -> int | bool: # noqa: ARG002
227+
self._not_supported(method="exists")

tests/test_api/test_setups.py

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import pytest
55
import hashlib
66
import time
7-
from openml._api.config import settings
87
import sklearn.tree
98
import sklearn.naive_bayes
109
import openml
1110
from openml_sklearn import SklearnExtension
1211
from openml.testing import TestBase
1312

1413

15-
from openml._api.resources.setups import SetupsV1, SetupsV2
14+
from openml._api.resources.setup import SetupV1API, SetupV2API
1615
from openml.setups.setup import OpenMLSetup
1716
from openml.testing import TestAPIBase
1817
from openml._api.resources.base.fallback import FallbackProxy
@@ -26,22 +25,22 @@ def get_sentinel():
2625
sentinel = md5.hexdigest()[:10]
2726
return f"TEST{sentinel}"
2827

29-
class TestSetupsV1(TestAPIBase):
28+
class TestSetupV1(TestAPIBase):
3029
"""Tests for V1 XML API implementation of setups."""
3130

3231
_multiprocess_can_split_ = True
3332

3433
def setUp(self) -> None:
3534
super().setUp()
3635
self.client = self._get_http_client(
37-
server=settings.api.v1.server,
38-
base_url=settings.api.v1.base_url,
39-
api_key=settings.api.v1.api_key,
40-
timeout=settings.api.v1.timeout,
41-
retries=settings.connection.retries,
42-
retry_policy=settings.connection.retry_policy,
36+
server=self.server,
37+
base_url=self.base_url,
38+
api_key=self.api_key,
39+
timeout_seconds=self.timeout_seconds,
40+
retries=self.retries,
41+
retry_policy=self.retry_policy,
4342
)
44-
self.resource = SetupsV1(self.client)
43+
self.resource = SetupV1API(self.client)
4544
self.extension = SklearnExtension()
4645

4746
@pytest.mark.uses_test_server()
@@ -111,45 +110,45 @@ def test_exists_existing_setup(self):
111110
assert setup_id == run.setup_id
112111

113112

114-
class TestSetupsV2(TestAPIBase):
113+
class TestSetupV2(TestAPIBase):
115114
"""Tests for V2 JSON API implementation of setups."""
116115

117116
_multiprocess_can_split_ = True
118117

119118
def setUp(self) -> None:
120119
super().setUp()
121120
self.client = self._get_http_client(
122-
server=settings.api.v2.server,
123-
base_url=settings.api.v2.base_url,
124-
api_key=settings.api.v2.api_key,
125-
timeout=settings.api.v2.timeout,
126-
retries=settings.connection.retries,
127-
retry_policy=settings.connection.retry_policy,
121+
server=self.server,
122+
base_url=self.base_url,
123+
api_key=self.api_key,
124+
timeout_seconds=self.timeout_seconds,
125+
retries=self.retries,
126+
retry_policy=self.retry_policy,
128127
)
129-
self.resource = SetupsV2(self.client)
128+
self.resource = SetupV2API(self.client)
130129

131130

132131
class TestSetupsCombined(TestAPIBase):
133132
def setUp(self):
134133
super().setUp()
135134
self.v1_client = self._get_http_client(
136-
server=settings.api.v1.server,
137-
base_url=settings.api.v1.base_url,
138-
api_key=settings.api.v1.api_key,
139-
timeout=settings.api.v1.timeout,
140-
retries=settings.connection.retries,
141-
retry_policy=settings.connection.retry_policy,
135+
server=self.server,
136+
base_url=self.base_url,
137+
api_key=self.api_key,
138+
timeout_seconds=self.timeout_seconds,
139+
retries=self.retries,
140+
retry_policy=self.retry_policy,
142141
)
143142
self.v2_client = self._get_http_client(
144-
server=settings.api.v2.server,
145-
base_url=settings.api.v2.base_url,
146-
api_key=settings.api.v2.api_key,
147-
timeout=settings.api.v2.timeout,
148-
retries=settings.connection.retries,
149-
retry_policy=settings.connection.retry_policy,
143+
server=self.server,
144+
base_url=self.base_url,
145+
api_key=self.api_key,
146+
timeout_seconds=self.timeout_seconds,
147+
retries=self.retries,
148+
retry_policy=self.retry_policy,
150149
)
151-
self.resource_v1 = SetupsV1(self.v1_client)
152-
self.resource_v2 = SetupsV2(self.v2_client)
150+
self.resource_v1 = SetupV1API(self.v1_client)
151+
self.resource_v2 = SetupV2API(self.v2_client)
153152
self.resource_fallback = FallbackProxy(self.resource_v2, self.resource_v1)
154153
self.extension = SklearnExtension()
155154

0 commit comments

Comments
 (0)