Merge branch 'main' into support_Models

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version changelog
 
+## [Release] Release v0.32.1
+
+### Bug Fixes
+
+ * Properly include message when handing SCIM errors ([#753](https://github.com/databricks/databricks-sdk-py/pull/753)).
+
+
+
 ## [Release] Release v0.32.0
 
 ### Bug Fixes

databricks/sdk/errors/parser.py

@@ -60,8 +60,9 @@ def parse_error(self, response: requests.Response, response_body: bytes) -> Opti
         if detail:
             # Handle SCIM error message details
             # @see https://tools.ietf.org/html/rfc7644#section-3.7.3
-            error_args[
-                'message'] = f"{scim_type} {error_args.get('message', 'SCIM API Internal Error')}".strip(" ")
+            if detail == "null":
+                detail = "SCIM API Internal Error"
+            error_args['message'] = f"{scim_type} {detail}".strip(" ")
             error_args['error_code'] = f"SCIM_{status}"
         return error_args
 

databricks/sdk/version.py

@@ -1 +1 @@
-__version__ = '0.32.0'
+__version__ = '0.32.1'

tests/test_errors.py

@@ -109,7 +109,16 @@ def make_private_link_response() -> requests.Response:
        'Please report this issue with the following debugging information to the SDK issue tracker at '
        'https://github.com/databricks/databricks-sdk-go/issues. Request log:```GET /api/2.0/service\n'
        '< 400 Bad Request\n'
-       '< this is not a real response```')), ])
+       '< this is not a real response```')),
+     [
+         fake_response(
+             'GET', 404,
+             json.dumps({
+                 'detail': 'Group with id 1234 is not found',
+                 'status': '404',
+                 'schemas': ['urn:ietf:params:scim:api:messages:2.0:Error']
+             })), errors.NotFound, 'None Group with id 1234 is not found'
+     ]])
 def test_get_api_error(response, expected_error, expected_message):
     with pytest.raises(errors.DatabricksError) as e:
         raise errors.get_api_error(response)