databricks-sdk 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

databricks/sdk/core.py

@@ -114,7 +114,9 @@ def oauth_service_principal(cfg: 'Config') -> Optional[HeaderFactory]:
 def external_browser(cfg: 'Config') -> Optional[HeaderFactory]:
     if cfg.auth_type != 'external-browser':
         return None
-    if cfg.is_aws:
+    if cfg.client_id:
+        client_id = cfg.client_id
+    elif cfg.is_aws:
         client_id = 'databricks-cli'
     elif cfg.is_azure:
         # Use Azure AD app for cases when Azure CLI is not available on the machine.
@@ -123,7 +125,10 @@ def external_browser(cfg: 'Config') -> Optional[HeaderFactory]:
         client_id = '6128a518-99a9-425b-8333-4cc94f04cacd'
     else:
         raise ValueError(f'local browser SSO is not supported')
-    oauth_client = OAuthClient(cfg.host, client_id, 'http://localhost:8020')
+    oauth_client = OAuthClient(host=cfg.host,
+                               client_id=client_id,
+                               redirect_url='http://localhost:8020',
+                               client_secret=cfg.client_secret)
     consent = oauth_client.initiate_consent()
     if not consent:
         return None

databricks/sdk/oauth.py

@@ -15,6 +15,10 @@ from typing import Any, Dict, List
 import requests
 import requests.auth
 
+# Error code for PKCE flow in Azure Active Directory, that gets additional retry.
+# See https://stackoverflow.com/a/75466778/277035 for more info
+NO_ORIGIN_FOR_SPA_CLIENT_ERROR = 'AADSTS9002327'
+
 logger = logging.getLogger(__name__)
 
 
@@ -240,23 +244,30 @@ class Consent:
         if self._state != state:
             raise ValueError('state mismatch')
         params = {
+            'redirect_uri': self._client.redirect_url,
             'grant_type': 'authorization_code',
-            'code': code,
             'code_verifier': self._verifier,
-            'redirect_uri': self._client.redirect_url
+            'code': code
         }
         headers = {}
-        if 'microsoft' in self._client.token_url:
-            # Tokens issued for the 'Single-Page Application' client-type may
-            # only be redeemed via cross-origin requests
-            headers = {'Origin': self._client.redirect_url}
-        token = retrieve_token(client_id=self._client.client_id,
-                               client_secret=self._client.client_secret,
-                               token_url=self._client.token_url,
-                               params=params,
-                               headers=headers,
-                               use_params=True)
-        return RefreshableCredentials(self._client, token)
+        while True:
+            try:
+                token = retrieve_token(client_id=self._client.client_id,
+                                       client_secret=self._client.client_secret,
+                                       token_url=self._client.token_url,
+                                       params=params,
+                                       headers=headers,
+                                       use_params=True)
+                return RefreshableCredentials(self._client, token)
+            except ValueError as e:
+                if NO_ORIGIN_FOR_SPA_CLIENT_ERROR in str(e):
+                    # Retry in cases of 'Single-Page Application' client-type with
+                    # 'Origin' header equal to client's redirect URL.
+                    headers['Origin'] = self._client.redirect_url
+                    msg = f'Retrying OAuth token exchange with {self._client.redirect_url} origin'
+                    logger.debug(msg)
+                    continue
+                raise e
 
 
 class OAuthClient:

databricks/sdk/version.py

@@ -1 +1 @@
-__version__ = '0.1.0'
+__version__ = '0.1.1'

{databricks_sdk-0.1.0.dist-info → databricks_sdk-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: databricks-sdk
-Version: 0.1.0
+Version: 0.1.1
 Summary: Databricks SDK for Python (Experimental)
 Home-page: https://github.com/databricks/databricks-sdk-py
 Author: Serge Smertin
@@ -174,6 +174,8 @@ w = WorkspaceClient(host=input('Databricks Workspace URL: '),
                     azure_client_secret=input('AAD Client Secret: '))
 ```
 
+Please see more examples in [this document](./docs/azure-ad.md).
+
 ### Overriding `.databrickscfg`
 
 For [Databricks native authentication](#databricks-native-authentication), you can override the default behavior for using `.databrickscfg` as follows:

{databricks_sdk-0.1.0.dist-info → databricks_sdk-0.1.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 databricks/__init__.py,sha256=-1cBy2684NfMPosP7CE8LgIYlw8ve82AGkP1ZVp9M5A,260
 databricks/sdk/__init__.py,sha256=5hL4sD2aCGU7BHQFpEz5DmME-xk7Yp5fCdjStNpFziM,12817
 databricks/sdk/azure.py,sha256=2CljLtiyOnH-rUQcCSarbLsJd0zkil5f4vpjsSGzyxc,1656
-databricks/sdk/core.py,sha256=Lc-PwhID-UbrK463rWaynPjlG2BkJ_UqCR5lfmLD9DE,34099
+databricks/sdk/core.py,sha256=1AWSWam7aq-2xn2MNGMBVkxr1GqKNWznBEhzkrvOPOw,34311
 databricks/sdk/dbconnect.py,sha256=mAqVSDSAIjuqy4oSsDbcKLWIgqDLEnWtXPlb133YYhQ,2616
 databricks/sdk/dbutils.py,sha256=9lHGcXjRnIylWOSBFbioIym1JzVBo9of3laoXE7TvOA,11147
 databricks/sdk/errors.py,sha256=SBy7QvNgGKzEg0j-zuyNpaiuChwx93DeKbya5MNftGc,94
-databricks/sdk/oauth.py,sha256=JEl30pJQ2C912R1H30r3TvVJ9Kzbi3P24sWWaMFSTFI,13431
-databricks/sdk/version.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
+databricks/sdk/oauth.py,sha256=0RHrbxbPvVEE_kFrSPigzgYQdqZr79aDJRE1q0IdsEs,13981
+databricks/sdk/version.py,sha256=ls1camlIoMxEZz9gSkZ1OJo-MXqHWwKPtdPbZJmwp7E,22
 databricks/sdk/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 databricks/sdk/mixins/compute.py,sha256=cCoRkkChrV9bEXq2h8WwxdWJ4sVB5dT9KazjJMSC74I,8909
 databricks/sdk/mixins/dbfs.py,sha256=nvAhP_Aem_xmB3GT0LAozAb_PjUXB5Xc9Xev9BpW5aM,12666
@@ -29,9 +29,9 @@ databricks/sdk/service/settings.py,sha256=rfcv96j5Y4udGKr9LzjA2jkAj8kuL8A7lXqW0N
 databricks/sdk/service/sharing.py,sha256=N83p-0AysFO8nwnm-HUSYT5qaQUgMsvXET6lY9JaOR4,44357
 databricks/sdk/service/sql.py,sha256=geciXxYvv3Le-JHP7k_K0r4XBVw003TqXJ1oA7UzeoE,140031
 databricks/sdk/service/workspace.py,sha256=h_zgD2ElOjJq83xxs-SG6QrGP-x0zDxZHADMiqKwD4o,43457
-databricks_sdk-0.1.0.dist-info/LICENSE,sha256=afBgTZo-JsYqj4VOjnejBetMuHKcFR30YobDdpVFkqY,11411
-databricks_sdk-0.1.0.dist-info/METADATA,sha256=Q4Wfe3WjZLJEtLuoCucSb55FXELkr6o2Plso6YGwlF0,29578
-databricks_sdk-0.1.0.dist-info/NOTICE,sha256=FXJCqJfV8_zzXWjB4wgTx_iot23yvSo_d2SyCjrlleg,725
-databricks_sdk-0.1.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-databricks_sdk-0.1.0.dist-info/top_level.txt,sha256=7kRdatoSgU0EUurRQJ_3F1Nv4EOSHWAr6ng25tJOJKU,11
-databricks_sdk-0.1.0.dist-info/RECORD,,
+databricks_sdk-0.1.1.dist-info/LICENSE,sha256=afBgTZo-JsYqj4VOjnejBetMuHKcFR30YobDdpVFkqY,11411
+databricks_sdk-0.1.1.dist-info/METADATA,sha256=iniqjP2p8RkicUG9w6yHTl7quH3AlgEstwmolcnGDeM,29644
+databricks_sdk-0.1.1.dist-info/NOTICE,sha256=FXJCqJfV8_zzXWjB4wgTx_iot23yvSo_d2SyCjrlleg,725
+databricks_sdk-0.1.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+databricks_sdk-0.1.1.dist-info/top_level.txt,sha256=7kRdatoSgU0EUurRQJ_3F1Nv4EOSHWAr6ng25tJOJKU,11
+databricks_sdk-0.1.1.dist-info/RECORD,,