From 88120966182d2077d07a67c9ad416d53a090352b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 15 May 2025 15:44:48 +0000 Subject: [PATCH 1/2] Remove unnecessary warnings --- databricks/sdk/errors/base.py | 39 ++++++++--------------------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/databricks/sdk/errors/base.py b/databricks/sdk/errors/base.py index 4e104c0b7..40869bd43 100644 --- a/databricks/sdk/errors/base.py +++ b/databricks/sdk/errors/base.py @@ -62,31 +62,6 @@ def __init__( :param details: :param kwargs: """ - # SCIM-specific parameters are deprecated. - if detail: - warnings.warn( - "The 'detail' parameter of DatabricksError is deprecated and will be removed in a future version." - ) - if scimType: - warnings.warn( - "The 'scimType' parameter of DatabricksError is deprecated and will be removed in a future version." - ) - if status: - warnings.warn( - "The 'status' parameter of DatabricksError is deprecated and will be removed in a future version." - ) - - # API 1.2-specific parameters are deprecated. - if error: - warnings.warn( - "The 'error' parameter of DatabricksError is deprecated and will be removed in a future version." - ) - - # Retry-after is deprecated. - if retry_after_secs: - warnings.warn( - "The 'retry_after_secs' parameter of DatabricksError is deprecated and will be removed in a future version." - ) if detail: # Handle SCIM error message details @@ -101,7 +76,7 @@ def __init__( super().__init__(message if message else error) self.error_code = error_code - self.retry_after_secs = retry_after_secs + self._retry_after_secs = retry_after_secs self._error_details = errdetails.parse_error_details(details or []) self.kwargs = kwargs @@ -113,13 +88,17 @@ def __init__( continue self.details.append(ErrorDetail.from_dict(d)) - def get_error_info(self) -> List[ErrorDetail]: - return self._get_details_by_type(errdetails._ERROR_INFO_TYPE) + @property + def retry_after_secs(self) -> Optional[int]: + warnings.warn( + "The 'retry_after_secs' parameter of DatabricksError is deprecated and will be removed in a future version." + ) + return self._retry_after_secs - def _get_details_by_type(self, error_type) -> List[ErrorDetail]: + def get_error_info(self) -> List[ErrorDetail]: if self.details is None: return [] - return [detail for detail in self.details if detail.type == error_type] + return [detail for detail in self.details if detail.type == errdetails._ERROR_INFO_TYPE] def get_error_details(self) -> errdetails.ErrorDetails: return self._error_details From 9f69db9b2668680ad18585f027ee0adfad26ab6c Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 15 May 2025 17:30:31 +0000 Subject: [PATCH 2/2] Remove warning --- databricks/sdk/errors/base.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/databricks/sdk/errors/base.py b/databricks/sdk/errors/base.py index 40869bd43..c88ec60ff 100644 --- a/databricks/sdk/errors/base.py +++ b/databricks/sdk/errors/base.py @@ -1,5 +1,4 @@ import re -import warnings from dataclasses import dataclass from typing import Any, Dict, List, Optional @@ -76,7 +75,7 @@ def __init__( super().__init__(message if message else error) self.error_code = error_code - self._retry_after_secs = retry_after_secs + self.retry_after_secs = retry_after_secs self._error_details = errdetails.parse_error_details(details or []) self.kwargs = kwargs @@ -88,13 +87,6 @@ def __init__( continue self.details.append(ErrorDetail.from_dict(d)) - @property - def retry_after_secs(self) -> Optional[int]: - warnings.warn( - "The 'retry_after_secs' parameter of DatabricksError is deprecated and will be removed in a future version." - ) - return self._retry_after_secs - def get_error_info(self) -> List[ErrorDetail]: if self.details is None: return []