databricks-sdk 0.26.0__py3-none-any.whl → 0.27.1__py3-none-any.whl

databricks/sdk/__init__.py

@@ -59,12 +59,12 @@ from databricks.sdk.service.serving import AppsAPI, ServingEndpointsAPI
 from databricks.sdk.service.settings import (AccountIpAccessListsAPI,
                                              AccountSettingsAPI,
                                              AutomaticClusterUpdateAPI,
+                                             ComplianceSecurityProfileAPI,
                                              CredentialsManagerAPI,
                                              CspEnablementAccountAPI,
-                                             CspEnablementAPI,
                                              DefaultNamespaceAPI,
+                                             EnhancedSecurityMonitoringAPI,
                                              EsmEnablementAccountAPI,
-                                             EsmEnablementAPI,
                                              IpAccessListsAPI,
                                              NetworkConnectivityAPI,
                                              PersonalComputeAPI,
@@ -267,7 +267,7 @@ class WorkspaceClient:
 
     @property
     def apps(self) -> AppsAPI:
-        """Lakehouse Apps run directly on a customer’s Databricks instance, integrate with their data, use and extend Databricks services, and enable users to interact through single sign-on."""
+        """Apps run directly on a customer’s Databricks instance, integrate with their data, use and extend Databricks services, and enable users to interact through single sign-on."""
         return self._apps
 
     @property

databricks/sdk/_property.py

@@ -0,0 +1,42 @@
+# Copied from functools.py
+# Remove when Python 3.8 is the minimum supported version.
+
+_NOT_FOUND = object()
+
+
+class _cached_property:
+
+    def __init__(self, func):
+        self.func = func
+        self.attrname = None
+        self.__doc__ = func.__doc__
+        self.__module__ = func.__module__
+
+    def __set_name__(self, owner, name):
+        if self.attrname is None:
+            self.attrname = name
+        elif name != self.attrname:
+            raise TypeError("Cannot assign the same cached_property to two different names "
+                            f"({self.attrname!r} and {name!r}).")
+
+    def __get__(self, instance, owner=None):
+        if instance is None:
+            return self
+        if self.attrname is None:
+            raise TypeError("Cannot use cached_property instance without calling __set_name__ on it.")
+        try:
+            cache = instance.__dict__
+        except AttributeError: # not all objects have __dict__ (e.g. class defines slots)
+            msg = (f"No '__dict__' attribute on {type(instance).__name__!r} "
+                   f"instance to cache {self.attrname!r} property.")
+            raise TypeError(msg) from None
+        val = cache.get(self.attrname, _NOT_FOUND)
+        if val is _NOT_FOUND:
+            val = self.func(instance)
+            try:
+                cache[self.attrname] = val
+            except TypeError:
+                msg = (f"The '__dict__' attribute on {type(instance).__name__!r} instance "
+                       f"does not support item assignment for caching {self.attrname!r} property.")
+                raise TypeError(msg) from None
+        return val

databricks/sdk/core.py

@@ -145,11 +145,14 @@ class ApiClient:
         if not len(response.content):
             return resp
 
-        json = response.json()
-        if isinstance(json, list):
-            return json
+        jsonResponse = response.json()
+        if jsonResponse is None:
+            return resp
+
+        if isinstance(jsonResponse, list):
+            return jsonResponse
 
-        return {**resp, **json}
+        return {**resp, **jsonResponse}
 
     @staticmethod
     def _is_retryable(err: BaseException) -> Optional[str]:

databricks/sdk/dbutils.py

@@ -1,9 +1,10 @@
 import base64
 import json
 import logging
+import os.path
 import threading
-import typing
 from collections import namedtuple
+from typing import Callable, Dict, List
 
 from .core import ApiClient, Config, DatabricksError
 from .mixins import compute as compute_ext
@@ -34,7 +35,7 @@ class SecretMetadata(namedtuple('SecretMetadata', ['key'])):
 class _FsUtil:
     """ Manipulates the Databricks filesystem (DBFS) """
 
-    def __init__(self, dbfs_ext: dbfs_ext.DbfsExt, proxy_factory: typing.Callable[[str], '_ProxyUtil']):
+    def __init__(self, dbfs_ext: dbfs_ext.DbfsExt, proxy_factory: Callable[[str], '_ProxyUtil']):
         self._dbfs = dbfs_ext
         self._proxy_factory = proxy_factory
 
@@ -45,17 +46,15 @@ class _FsUtil:
 
     def head(self, file: str, maxBytes: int = 65536) -> str:
         """Returns up to the first 'maxBytes' bytes of the given file as a String encoded in UTF-8 """
-        res = self._dbfs.read(file, length=maxBytes, offset=0)
-        raw = base64.b64decode(res.data)
-        return raw.decode('utf8')
+        with self._dbfs.download(file) as f:
+            return f.read(maxBytes).decode('utf8')
 
-    def ls(self, dir: str) -> typing.List[FileInfo]:
+    def ls(self, dir: str) -> List[FileInfo]:
         """Lists the contents of a directory """
-        result = []
-        for f in self._dbfs.list(dir):
-            name = f.path.split('/')[-1]
-            result.append(FileInfo(f'dbfs:{f.path}', name, f.file_size, f.modification_time))
-        return result
+        return [
+            FileInfo(f.path, os.path.basename(f.path), f.file_size, f.modification_time)
+            for f in self._dbfs.list(dir)
+        ]
 
     def mkdirs(self, dir: str) -> bool:
         """Creates the given directory if it does not exist, also creating any necessary parent directories """
@@ -83,7 +82,7 @@ class _FsUtil:
               mount_point: str,
               encryption_type: str = None,
               owner: str = None,
-              extra_configs: 'typing.Dict[str, str]' = None) -> bool:
+              extra_configs: Dict[str, str] = None) -> bool:
         """Mounts the given source directory into DBFS at the given mount point"""
         fs = self._proxy_factory('fs')
         kwargs = {}
@@ -105,7 +104,7 @@ class _FsUtil:
                     mount_point: str,
                     encryption_type: str = None,
                     owner: str = None,
-                    extra_configs: 'typing.Dict[str, str]' = None) -> bool:
+                    extra_configs: Dict[str, str] = None) -> bool:
         """ Similar to mount(), but updates an existing mount point (if present) instead of creating a new one """
         fs = self._proxy_factory('fs')
         kwargs = {}
@@ -117,7 +116,7 @@ class _FsUtil:
             kwargs['extra_configs'] = extra_configs
         return fs.updateMount(source, mount_point, **kwargs)
 
-    def mounts(self) -> typing.List[MountInfo]:
+    def mounts(self) -> List[MountInfo]:
         """ Displays information about what is mounted within DBFS """
         result = []
         fs = self._proxy_factory('fs')
@@ -150,13 +149,13 @@ class _SecretsUtil:
         string_value = val.decode()
         return string_value
 
-    def list(self, scope) -> typing.List[SecretMetadata]:
+    def list(self, scope) -> List[SecretMetadata]:
         """Lists the metadata for secrets within the specified scope."""
 
         # transform from SDK dataclass to dbutils-compatible namedtuple
         return [SecretMetadata(v.key) for v in self._api.list_secrets(scope)]
 
-    def listScopes(self) -> typing.List[SecretScope]:
+    def listScopes(self) -> List[SecretScope]:
         """Lists the available scopes."""
 
         # transform from SDK dataclass to dbutils-compatible namedtuple
@@ -245,8 +244,7 @@ class _ProxyUtil:
     """Enables temporary workaround to call remote in-REPL dbutils without having to re-implement them"""
 
     def __init__(self, *, command_execution: compute.CommandExecutionAPI,
-                 context_factory: typing.Callable[[],
-                                                  compute.ContextStatusResponse], cluster_id: str, name: str):
+                 context_factory: Callable[[], compute.ContextStatusResponse], cluster_id: str, name: str):
         self._commands = command_execution
         self._cluster_id = cluster_id
         self._context_factory = context_factory
@@ -267,8 +265,8 @@ import re
 class _ProxyCall:
 
     def __init__(self, *, command_execution: compute.CommandExecutionAPI,
-                 context_factory: typing.Callable[[], compute.ContextStatusResponse], cluster_id: str,
-                 util: str, method: str):
+                 context_factory: Callable[[], compute.ContextStatusResponse], cluster_id: str, util: str,
+                 method: str):
         self._commands = command_execution
         self._cluster_id = cluster_id
         self._context_factory = context_factory