Skip to content

Commit e5f66a4

Browse files
committed
expose some methods for agent
1 parent 20530fb commit e5f66a4

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

cycode/cyclient/config.py

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import logging
22
import os
33
import sys
4-
from typing import Optional
4+
from typing import Optional, Union
55
from urllib.parse import urlparse
66

77
from cycode.cli import consts
88
from cycode.cli.user_settings.configuration_manager import ConfigurationManager
9-
from cycode.cyclient.config_dev import DEV_MODE_ENV_VAR_NAME, DEV_TENANT_ID_ENV_VAR_NAME
9+
from cycode.cyclient import config_dev
1010

1111

1212
def _set_io_encodings() -> None:
@@ -37,20 +37,22 @@ def _set_io_encodings() -> None:
3737
DEFAULT_CONFIGURATION = {
3838
consts.TIMEOUT_ENV_VAR_NAME: 300,
3939
consts.LOGGING_LEVEL_ENV_VAR_NAME: logging.INFO,
40-
DEV_MODE_ENV_VAR_NAME: 'False',
40+
config_dev.DEV_MODE_ENV_VAR_NAME: 'false',
4141
}
4242

4343
configuration = dict(DEFAULT_CONFIGURATION, **os.environ)
4444

4545
_CREATED_LOGGERS = set()
4646

4747

48-
def get_logger(logger_name: Optional[str] = None) -> logging.Logger:
49-
config_level = _get_val_as_string(consts.LOGGING_LEVEL_ENV_VAR_NAME)
50-
level = logging.getLevelName(config_level)
48+
def get_logger_level() -> Optional[Union[int, str]]:
49+
config_level = get_val_as_string(consts.LOGGING_LEVEL_ENV_VAR_NAME)
50+
return logging.getLevelName(config_level)
51+
5152

53+
def get_logger(logger_name: Optional[str] = None) -> logging.Logger:
5254
new_logger = logging.getLogger(logger_name)
53-
new_logger.setLevel(level)
55+
new_logger.setLevel(get_logger_level())
5456

5557
_CREATED_LOGGERS.add(new_logger)
5658

@@ -62,24 +64,24 @@ def set_logging_level(level: int) -> None:
6264
created_logger.setLevel(level)
6365

6466

65-
def _get_val_as_string(key: str) -> str:
67+
def get_val_as_string(key: str) -> str:
6668
return configuration.get(key)
6769

6870

69-
def _get_val_as_bool(key: str, default: str = '') -> bool:
71+
def get_val_as_bool(key: str, default: str = '') -> bool:
7072
val = configuration.get(key, default)
71-
return val.lower() in ('true', '1')
73+
return val.lower() in {'true', '1'}
7274

7375

74-
def _get_val_as_int(key: str) -> Optional[int]:
76+
def get_val_as_int(key: str) -> Optional[int]:
7577
val = configuration.get(key)
7678
if val:
7779
return int(val)
7880

7981
return None
8082

8183

82-
def _is_valid_url(url: str) -> bool:
84+
def is_valid_url(url: str) -> bool:
8385
try:
8486
urlparse(url)
8587
return True
@@ -92,12 +94,12 @@ def _is_valid_url(url: str) -> bool:
9294
configuration_manager = ConfigurationManager()
9395

9496
cycode_api_url = configuration_manager.get_cycode_api_url()
95-
if not _is_valid_url(cycode_api_url):
97+
if not is_valid_url(cycode_api_url):
9698
cycode_api_url = consts.DEFAULT_CYCODE_API_URL
9799

98-
timeout = _get_val_as_int(consts.CYCODE_CLI_REQUEST_TIMEOUT_ENV_VAR_NAME)
100+
timeout = get_val_as_int(consts.CYCODE_CLI_REQUEST_TIMEOUT_ENV_VAR_NAME)
99101
if not timeout:
100-
timeout = _get_val_as_int(consts.TIMEOUT_ENV_VAR_NAME)
102+
timeout = get_val_as_int(consts.TIMEOUT_ENV_VAR_NAME)
101103

102-
dev_mode = _get_val_as_bool(DEV_MODE_ENV_VAR_NAME)
103-
dev_tenant_id = _get_val_as_string(DEV_TENANT_ID_ENV_VAR_NAME)
104+
dev_mode = get_val_as_bool(config_dev.DEV_MODE_ENV_VAR_NAME)
105+
dev_tenant_id = get_val_as_string(config_dev.DEV_TENANT_ID_ENV_VAR_NAME)

0 commit comments

Comments
 (0)