gooddata-sdk 1.32.3.dev2__tar.gz → 1.33.1.dev1__tar.gz

{gooddata_sdk-1.32.3.dev2/gooddata_sdk.egg-info → gooddata_sdk-1.33.1.dev1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: gooddata-sdk
-Version: 1.32.3.dev2
+Version: 1.33.1.dev1
 Summary: GoodData Cloud Python SDK
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.32.3.dev2
+Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.33.1.dev1
 Project-URL: Source, https://github.com/gooddata/gooddata-python-sdk
 Keywords: gooddata,sdk,api,analytics,headless,business,intelligence,headless-bi,cloud,native,semantic,layer,sql,metrics
 Classifier: Development Status :: 5 - Production/Stable
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
@@ -22,7 +23,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-api-client~=1.32.3.dev2
+Requires-Dist: gooddata-api-client~=1.33.1.dev1
 Requires-Dist: python-dateutil>=2.5.3
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: attrs<=24.2.0,>=21.4.0
@@ -46,7 +47,7 @@ At the moment the SDK provides services to inspect and interact with the Semanti
 * Compute Service
 * Table Service
 
-See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.32.3.dev2) for more details.
+See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.33.1.dev1) for more details.
 
 ## Requirements
 

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/README.md

@@ -13,7 +13,7 @@ At the moment the SDK provides services to inspect and interact with the Semanti
 * Compute Service
 * Table Service
 
-See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.32.3.dev2) for more details.
+See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.33.1.dev1) for more details.
 
 ## Requirements
 

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/gooddata_sdk/catalog/data_source/declarative_model/data_source.py

@@ -12,12 +12,13 @@ from gooddata_api_client.model.declarative_data_sources import DeclarativeDataSo
 from gooddata_api_client.model.test_definition_request import TestDefinitionRequest
 
 from gooddata_sdk.catalog.base import Base, value_in_allowed
-from gooddata_sdk.catalog.entity import TokenCredentialsFromFile
+from gooddata_sdk.catalog.entity import ClientSecretCredentialsFromFile, TokenCredentialsFromFile
 from gooddata_sdk.catalog.parameter import CatalogParameter
 from gooddata_sdk.catalog.permission.declarative_model.permission import CatalogDeclarativeDataSourcePermission
 from gooddata_sdk.utils import create_directory, get_ds_credentials, read_layout_from_file, write_layout_to_file
 
 BIGQUERY_TYPE = "BIGQUERY"
+DATABRICKS_TYPE = "DATABRICKS"
 LAYOUT_DATA_SOURCES_DIR = "data_sources"
 
 
@@ -33,6 +34,15 @@ class CatalogDeclarativeDataSources(Base):
                 if data_source.type == BIGQUERY_TYPE:
                     token = TokenCredentialsFromFile.token_from_file(credentials[data_source.id])
                     data_sources.append(data_source.to_api(token=token))
+                elif data_source.type == DATABRICKS_TYPE:
+                    if data_source.client_id is not None:
+                        client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
+                            credentials[data_source.id]
+                        )
+                        data_sources.append(data_source.to_api(client_secret=client_secret))
+                    else:
+                        token = TokenCredentialsFromFile.token_from_file(credentials[data_source.id])
+                        data_sources.append(data_source.to_api(token=token))
                 else:
                     data_sources.append(data_source.to_api(password=credentials[data_source.id]))
             else:
@@ -125,8 +135,13 @@ class CatalogDeclarativeDataSource(Base):
             kwargs["private_key"] = private_key
         if private_key_passphrase is not None:
             kwargs["private_key_passphrase"] = private_key
+        if self.client_id is not None:
+            kwargs["client_id"] = self.client_id
         if client_secret is not None:
             kwargs["client_secret"] = client_secret
+        if self.parameters is not None:
+            kwargs["parameters"] = [param.to_data_source_parameter() for param in self.parameters]
+
         return TestDefinitionRequest(type=self.type, url=self.url, **kwargs)
 
     @staticmethod

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/gooddata_sdk/catalog/data_source/service.py

@@ -17,6 +17,7 @@ from gooddata_sdk.catalog.data_source.action_model.requests.scan_sql_request imp
 from gooddata_sdk.catalog.data_source.action_model.responses.scan_sql_response import ScanSqlResponse
 from gooddata_sdk.catalog.data_source.declarative_model.data_source import (
     BIGQUERY_TYPE,
+    DATABRICKS_TYPE,
     CatalogDeclarativeDataSource,
     CatalogDeclarativeDataSources,
 )
@@ -25,7 +26,7 @@ from gooddata_sdk.catalog.data_source.declarative_model.physical_model.pdm impor
     CatalogScanResultPdm,
 )
 from gooddata_sdk.catalog.data_source.entity_model.data_source import CatalogDataSource
-from gooddata_sdk.catalog.entity import TokenCredentialsFromFile
+from gooddata_sdk.catalog.entity import ClientSecretCredentialsFromFile, TokenCredentialsFromFile
 from gooddata_sdk.catalog.workspace.declarative_model.workspace.logical_model.ldm import CatalogDeclarativeModel
 from gooddata_sdk.client import GoodDataApiClient
 from gooddata_sdk.utils import get_ds_credentials, load_all_entities_dict, read_layout_from_file
@@ -474,6 +475,19 @@ class CatalogDataSourceService(CatalogServiceBase):
                     response = self._actions_api.test_data_source_definition(
                         declarative_data_source.to_test_request(token=token)
                     )
+                elif declarative_data_source.type == DATABRICKS_TYPE:
+                    if declarative_data_source.client_id is not None:
+                        client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
+                            credentials[declarative_data_source.id]
+                        )
+                        response = self._actions_api.test_data_source_definition(
+                            declarative_data_source.to_test_request(client_secret=client_secret)
+                        )
+                    else:
+                        token = TokenCredentialsFromFile.token_from_file(credentials[declarative_data_source.id])
+                        response = self._actions_api.test_data_source_definition(
+                            declarative_data_source.to_test_request(token=token)
+                        )
                 else:
                     response = self._actions_api.test_data_source_definition(
                         declarative_data_source.to_test_request(password=credentials[declarative_data_source.id])
@@ -528,6 +542,6 @@ class CatalogDataSourceService(CatalogServiceBase):
         if data.get("data_sources") is None:
             raise ValueError("The file has a wrong structure. There should be a root key 'data_sources'.")
         if len(data["data_sources"]) == 0:
-            raise ValueError("There are no pairs of data source id and token.")
+            raise ValueError("There are no pairs of data source id and credentials.")
         credentials = data["data_sources"]
         return credentials

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/gooddata_sdk/catalog/entity.py

@@ -274,3 +274,31 @@ class ClientSecretCredentials(Credentials):
             # You have to fill it to keep it or update it
             client_secret="",
         )
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class ClientSecretCredentialsFromFile(Credentials):
+    file_path: Path
+    client_secret: str = attr.field(init=False, repr=lambda value: "***")
+
+    def __attrs_post_init__(self) -> None:
+        self.client_secret = self.client_secret_from_file(self.file_path)
+
+    def to_api_args(self) -> dict[str, Any]:
+        return {
+            self.CLIENT_SECRET: self.client_secret,
+        }
+
+    @classmethod
+    def is_part_of_api(cls, entity: dict[str, Any]) -> bool:
+        return cls.CLIENT_SECRET in entity
+
+    @classmethod
+    def from_api(cls, entity: dict[str, Any]) -> ClientSecretCredentialsFromFile:
+        # Credentials are not returned for security reasons
+        raise NotImplementedError
+
+    @staticmethod
+    def client_secret_from_file(file_path: Union[str, Path]) -> str:
+        with open(file_path, "rb") as fp:
+            return base64.b64encode(fp.read()).decode("utf-8")

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/gooddata_sdk/catalog/parameter.py

@@ -1,5 +1,6 @@
 # (C) 2022 GoodData Corporation
 import attr
+from gooddata_api_client.model.data_source_parameter import DataSourceParameter
 from gooddata_api_client.model.parameter import Parameter
 
 from gooddata_sdk.catalog.base import Base
@@ -13,3 +14,6 @@ class CatalogParameter(Base):
     @staticmethod
     def client_class() -> type[Parameter]:
         return Parameter
+
+    def to_data_source_parameter(self) -> DataSourceParameter:
+        return DataSourceParameter(name=self.name, value=self.value)

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1/gooddata_sdk.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: gooddata-sdk
-Version: 1.32.3.dev2
+Version: 1.33.1.dev1
 Summary: GoodData Cloud Python SDK
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.32.3.dev2
+Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.33.1.dev1
 Project-URL: Source, https://github.com/gooddata/gooddata-python-sdk
 Keywords: gooddata,sdk,api,analytics,headless,business,intelligence,headless-bi,cloud,native,semantic,layer,sql,metrics
 Classifier: Development Status :: 5 - Production/Stable
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
@@ -22,7 +23,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-api-client~=1.32.3.dev2
+Requires-Dist: gooddata-api-client~=1.33.1.dev1
 Requires-Dist: python-dateutil>=2.5.3
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: attrs<=24.2.0,>=21.4.0
@@ -46,7 +47,7 @@ At the moment the SDK provides services to inspect and interact with the Semanti
 * Compute Service
 * Table Service
 
-See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.32.3.dev2) for more details.
+See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.33.1.dev1) for more details.
 
 ## Requirements
 

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/gooddata_sdk.egg-info/requires.txt

@@ -1,4 +1,4 @@
-gooddata-api-client~=1.32.3.dev2
+gooddata-api-client~=1.33.1.dev1
 python-dateutil>=2.5.3
 pyyaml>=5.1
 attrs<=24.2.0,>=21.4.0

{gooddata_sdk-1.32.3.dev2 → gooddata_sdk-1.33.1.dev1}/setup.py

@@ -7,7 +7,7 @@ this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text(encoding="utf-8")
 
 REQUIRES = [
-    "gooddata-api-client~=1.32.3.dev2",
+    "gooddata-api-client~=1.33.1.dev1",
     "python-dateutil>=2.5.3",
     "pyyaml>=5.1",
     "attrs>=21.4.0,<=24.2.0",
@@ -22,7 +22,7 @@ setup(
     description="GoodData Cloud Python SDK",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.32.3.dev2",
+    version="1.33.1.dev1",
     author="GoodData",
     author_email="support@gooddata.com",
     license="MIT",
@@ -36,7 +36,7 @@ setup(
         "bin/gdc",
     ],
     project_urls={
-        "Documentation": "https://www.gooddata.com/docs/python-sdk/1.32.3.dev2",
+        "Documentation": "https://www.gooddata.com/docs/python-sdk/1.33.1.dev1",
         "Source": "https://github.com/gooddata/gooddata-python-sdk",
     },
     classifiers=[
@@ -47,6 +47,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Database",
         "Topic :: Scientific/Engineering",
         "Topic :: Software Development",