Skip to content

Commit 001caad

Browse files
committed
replace config.cache.dir with config.cache_dir
1 parent 2a42712 commit 001caad

5 files changed

Lines changed: 6 additions & 28 deletions

File tree

openml/_api/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
APIBackend,
4242
APIBackendBuilder,
4343
APIConfig,
44-
CacheConfig,
4544
Config,
4645
ConnectionConfig,
4746
_backend,
@@ -52,7 +51,6 @@
5251
"APIBackend",
5352
"APIBackendBuilder",
5453
"APIConfig",
55-
"CacheConfig",
5654
"Config",
5755
"ConnectionConfig",
5856
"DatasetAPI",

openml/_api/setup/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
from ._instance import _backend
22
from .backend import APIBackend
33
from .builder import APIBackendBuilder
4-
from .config import APIConfig, CacheConfig, Config, ConnectionConfig
4+
from .config import APIConfig, Config, ConnectionConfig
55

66
__all__ = [
77
"APIBackend",
88
"APIBackendBuilder",
99
"APIConfig",
10-
"CacheConfig",
1110
"Config",
1211
"ConnectionConfig",
1312
"_backend",

openml/_api/setup/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def build(cls, config: Config) -> APIBackendBuilder:
8282
APIBackendBuilder
8383
Builder instance with all resource API interfaces initialized.
8484
"""
85-
cache_dir = Path(config.cache.dir).expanduser()
85+
cache_dir = Path(config.cache_dir).expanduser()
8686

8787
http_cache = HTTPCache(path=cache_dir)
8888
minio_client = MinIOClient(path=cache_dir)

openml/_api/setup/config.py

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,6 @@ class ConnectionConfig:
4444
retry_policy: RetryPolicy
4545

4646

47-
@dataclass
48-
class CacheConfig:
49-
"""
50-
Configuration for caching API responses locally.
51-
52-
Parameters
53-
----------
54-
dir : str
55-
Path to the directory where cached files will be stored.
56-
"""
57-
58-
dir: str
59-
60-
6147
@dataclass
6248
class Config:
6349
"""
@@ -71,16 +57,17 @@ class Config:
7157
Primary API version to use (default is V1).
7258
fallback_api_version : APIVersion or None
7359
Optional fallback API version if the primary API does not support certain operations.
60+
cache_dir : str
61+
Path to the directory where cached files will be stored.
7462
api_configs : dict of APIVersion to APIConfig
7563
Mapping from API version to its server/base URL and API key configuration.
7664
connection : ConnectionConfig
7765
Settings for request retries and retry policy.
78-
cache : CacheConfig
79-
Settings for local caching of API responses.
8066
"""
8167

8268
api_version: APIVersion = APIVersion.V1
8369
fallback_api_version: APIVersion | None = None
70+
cache_dir: str = str(_resolve_default_cache_dir())
8471

8572
api_configs: dict[APIVersion, APIConfig] = field(
8673
default_factory=lambda: {
@@ -103,9 +90,3 @@ class Config:
10390
retry_policy=RetryPolicy.HUMAN,
10491
)
10592
)
106-
107-
cache: CacheConfig = field(
108-
default_factory=lambda: CacheConfig(
109-
dir=str(_resolve_default_cache_dir()),
110-
)
111-
)

openml/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,10 @@ def _sync_api_config() -> None:
540540

541541
APIBackend.set_config_values(
542542
{
543+
"cache_dir": cache_dir,
543544
"api_configs.v1.server": v1_server,
544545
"api_configs.v1.base_url": v1_base_url,
545546
"api_configs.v1.api_key": apikey,
546-
"cache.dir": cache_dir,
547547
"connection.retry_policy": connection_retry_policy,
548548
"connection.retries": connection_n_retries,
549549
}

0 commit comments

Comments
 (0)