Skip to content

Commit baeb4cf

Browse files
SK-2838: fix warn logs structure
1 parent 63c49d2 commit baeb4cf

5 files changed

Lines changed: 24 additions & 20 deletions

File tree

skyflow/client/skyflow.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import warnings
21
from collections import OrderedDict
3-
from typing_extensions import deprecated
42
from skyflow import LogLevel
53
from skyflow.error import SkyflowError
64
from skyflow.utils import SkyflowMessages
7-
from skyflow.utils.logger import log_info, Logger
5+
from skyflow.utils.logger import log_info, log_warn, set_active_log_level, Logger
86
from skyflow.utils.constants import OptionField
97
from skyflow.utils.validations import validate_vault_config, validate_connection_config, validate_update_vault_config, \
108
validate_update_connection_config, validate_credentials, validate_log_level
@@ -61,13 +59,9 @@ def set_log_level(self, log_level):
6159
self.__builder._Builder__set_log_level(log_level)
6260
return self
6361

64-
@deprecated("[DEPRECATED] Use set_log_level() instead.")
6562
def update_log_level(self, log_level):
66-
warnings.warn(
67-
SkyflowMessages.Warning.UPDATE_LOG_LEVEL_DEPRECATED.value,
68-
DeprecationWarning,
69-
stacklevel=2,
70-
)
63+
""".. deprecated:: Use set_log_level() instead. Will be removed in a future release."""
64+
log_warn(SkyflowMessages.Warning.UPDATE_LOG_LEVEL_DEPRECATED.value)
7165
return self.set_log_level(log_level)
7266

7367
def get_log_level(self):
@@ -227,6 +221,7 @@ def __set_log_level(self, log_level):
227221
validate_log_level(self.__logger, log_level)
228222
self.__log_level = log_level
229223
self.__logger.set_log_level(log_level)
224+
set_active_log_level(log_level)
230225
self.__update_vault_client_logger(log_level, self.__logger)
231226
log_info(SkyflowMessages.Info.LOGGER_SETUP_DONE.value, self.__logger)
232227
log_info(SkyflowMessages.Info.CURRENT_LOG_LEVEL.value.format(self.__log_level), self.__logger)
@@ -243,6 +238,7 @@ def __add_skyflow_credentials(self, credentials):
243238
def build(self):
244239
validate_log_level(self.__logger, self.__log_level)
245240
self.__logger.set_log_level(self.__log_level)
241+
set_active_log_level(self.__log_level)
246242

247243
for config in self.__vault_list:
248244
self.__add_vault_config(config)

skyflow/utils/_skyflow_messages.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
error_prefix = f"Skyflow Python SDK {SDK_VERSION}"
66
INFO = "INFO"
7+
WARN = "WARN"
78
ERROR = "ERROR"
89

910
class SkyflowMessages:
@@ -417,11 +418,11 @@ class HttpStatus(Enum):
417418

418419
class Warning(Enum):
419420
UPDATE_LOG_LEVEL_DEPRECATED = (
420-
"[DEPRECATED] Skyflow.update_log_level() is deprecated. "
421-
"Use Skyflow.set_log_level() instead — identical behavior."
421+
f"{WARN}: [{error_prefix}] Skyflow.update_log_level() is deprecated. "
422+
"Use Skyflow.set_log_level() instead."
422423
)
423424
FILE_UPLOAD_REQUEST_ARG_ORDER_DEPRECATED = (
424-
"[DEPRECATED] FileUploadRequest: argument order changed. "
425+
f"{WARN}: [{error_prefix}] FileUploadRequest: argument order changed. "
425426
"Old positional order: (table, skyflow_id, column_name). "
426427
"New order: FileUploadRequest(table, column_name=..., skyflow_id=...)."
427428
)

skyflow/utils/logger/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
from ._logger import Logger
2-
from ._log_helpers import log_error, log_info, log_error_log
2+
from ._log_helpers import log_error, log_info, log_warn, log_error_log, set_active_log_level

skyflow/utils/logger/_log_helpers.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,25 @@
22
from . import Logger
33
from ..constants import ResponseField
44

5+
_active_log_level = LogLevel.ERROR
6+
7+
8+
def set_active_log_level(level):
9+
global _active_log_level
10+
_active_log_level = level
11+
512

613
def log_info(message, logger = None):
714
if not logger:
815
logger = Logger(LogLevel.INFO)
916

1017
logger.info(message)
1118

19+
def log_warn(message, logger=None):
20+
if not logger:
21+
logger = Logger(_active_log_level)
22+
logger.warn(message)
23+
1224
def log_error_log(message, logger=None):
1325
if not logger:
1426
logger = Logger(LogLevel.ERROR)

skyflow/vault/data/_file_upload_request.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import warnings
21
from typing import BinaryIO, Optional
32

43
from skyflow.utils import SkyflowMessages
4+
from skyflow.utils.logger import log_warn
55

66

77
class FileUploadRequest:
@@ -15,12 +15,7 @@ def __init__(self,
1515
file_object: Optional[BinaryIO] = None,
1616
file_name: Optional[str] = None):
1717
if args:
18-
warnings.warn(
19-
SkyflowMessages.Warning.FILE_UPLOAD_REQUEST_ARG_ORDER_DEPRECATED.value,
20-
DeprecationWarning,
21-
stacklevel=2,
22-
)
23-
# Old positional order was: (table, skyflow_id, column_name, ...)
18+
log_warn(SkyflowMessages.Warning.FILE_UPLOAD_REQUEST_ARG_ORDER_DEPRECATED.value)
2419
skyflow_id = args[0] if args else skyflow_id
2520
column_name = args[1] if len(args) > 1 else column_name
2621
self.table = table

0 commit comments

Comments
 (0)