Skip to content

Commit c25fcca

Browse files
committed
refactor(Core): Replace config_get with ConfigOptions
Assisted by Claude Sonnet 4.6 - Used to search and replace without changing logic. Issue: documentation#325
1 parent 03f38df commit c25fcca

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

lib/rucio/common/cache.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616

1717
from dogpile.cache.region import CacheRegion
1818

19-
from rucio.common.config import config_get, is_client
19+
from rucio.common.config import is_client
20+
from rucio.common.config_settings import Config
2021

2122
if TYPE_CHECKING:
2223
from collections.abc import Callable
2324

2425

25-
CACHE_URL = config_get('cache', 'url', False, '127.0.0.1:11211', check_config_table=False)
26+
CACHE_URL = Config.cache.url(raise_exception=False, check_config_table=False)
2627

2728
ENABLE_CACHING = True
2829
_mc_client = None

lib/rucio/common/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from configparser import NoOptionError, NoSectionError
1818
from typing import TYPE_CHECKING
1919

20-
from rucio.common.config import config_get
20+
from rucio.common.config_settings import Config
2121
from rucio.common.constants import DEFAULT_VO
2222

2323
if TYPE_CHECKING:
@@ -34,7 +34,7 @@ def get_client_vo() -> str:
3434
vo = os.environ['RUCIO_VO']
3535
else:
3636
try:
37-
vo = str(config_get('client', 'vo'))
37+
vo = str(Config.client.vo())
3838
except (NoOptionError, NoSectionError):
3939
vo = DEFAULT_VO
4040
return vo

lib/rucio/common/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
from typing_extensions import ParamSpec
4747

4848
from rucio.common.config import config_get, config_get_bool
49+
from rucio.common.config_settings import Config
4950
from rucio.common.constants import BASE_SCHEME_MAP, DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL
5051
from rucio.common.exception import DIDFilterSyntaxError, DuplicateCriteriaInDIDFilter, InputValidationError, InvalidType, MetalinkJsonParsingError, MissingModuleException, RucioException
5152
from rucio.common.extra import import_extras
@@ -664,7 +665,7 @@ def extract_scope(
664665
vo: str = DEFAULT_VO
665666
) -> 'Sequence[str]':
666667
scope_extraction_algorithms = ScopeExtractionAlgorithms(vo)
667-
extract_scope_convention = config_get('common', 'extract_scope', False, None) or config_get('policy', 'extract_scope', False, None)
668+
extract_scope_convention = Config.common.extract_scope(raise_exception=False) or Config.policy.extract_scope(raise_exception=False)
668669
if extract_scope_convention is None or not ScopeExtractionAlgorithms.supports(extract_scope_convention):
669670
extract_scope_convention = default_extract
670671
return scope_extraction_algorithms.extract_scope(did, scopes, extract_scope_convention)

lib/rucio/core/did_meta_plugins/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from typing import TYPE_CHECKING
1818

1919
from rucio.common import config, exception
20+
from rucio.common.config_settings import Config
2021
from rucio.db.sqla.session import read_session, transactional_session
2122

2223
if TYPE_CHECKING:
@@ -36,13 +37,15 @@
3637

3738
# Overwrite these defaults if plugins are set in the configuration file.
3839
#
40+
3941
if config.config_has_section('metadata'):
4042
try:
41-
CUSTOM_METADATA_PLUGIN_MODULE_PATHS = config.config_get('metadata', 'plugins')
43+
CUSTOM_METADATA_PLUGIN_MODULE_PATHS = Config.metadata.plugins()
4244
except (NoOptionError, NoSectionError):
4345
CUSTOM_METADATA_PLUGIN_MODULE_PATHS = DEFAULT_CUSTOM_METADATA_PLUGIN_MODULE_PATH
4446
else:
4547
CUSTOM_METADATA_PLUGIN_MODULE_PATHS = DEFAULT_CUSTOM_METADATA_PLUGIN_MODULE_PATH
48+
4649
METADATA_PLUGIN_MODULE_PATHS = [DEFAULT_BASE_METADATA_PLUGIN_MODULE_PATH] + CUSTOM_METADATA_PLUGIN_MODULE_PATHS.split(",")
4750

4851
# Import plugin modules.

0 commit comments

Comments
 (0)