NAS-3695 minor fixes

* all classes participated in load_from_disk for data sources returns their instance in the process.
* for generate_logical_model set generate_ldm_request default (like for generating_pdm)
* for kwargs CatalogAnalyticsBase added is not None check

Author: hkad98

.gitignore

@@ -5,3 +5,4 @@
 .venv
 test_clients.py
 gooddata-sdk/tests/catalog/store
+.DS_Store

MAINTENANCE.md

@@ -6,7 +6,7 @@
 * Create pull request with the latest commit with bumped versions
 * Ask for merge of pull request. Once it is merged:
 * Checkout latest master tag it vX.Y.Z
-* Push the tag to the gooddata/gooddata-python-sdk repository (e.g. `git push <remote> v.X.Y.Z`)
+* Push the tag to the gooddata/gooddata-python-sdk repository (e.g. `git push <remote> vX.Y.Z`)
 
 ### Errors that may appear
 

gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py

@@ -69,7 +69,7 @@ def load_from_disk(cls, layout_organization_folder: Path) -> CatalogDeclarativeD
         data_sources = []
         for data_source_id in data_source_ids:
             data_sources.append(CatalogDeclarativeDataSource.load_from_disk(data_sources_folder, data_source_id))
-        return cls.from_dict({"dataSources": data_sources})
+        return cls(data_sources=data_sources)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, CatalogDeclarativeDataSources):
@@ -178,15 +178,29 @@ def store_to_disk(self, data_sources_folder: Path) -> None:
         if self.pdm is not None:
             self.pdm.store_to_disk(data_source_folder)
 
-    @staticmethod
-    def load_from_disk(data_sources_folder: Path, data_source_id: str) -> dict:
+    @classmethod
+    def load_from_disk(cls, data_sources_folder: Path, data_source_id: str) -> CatalogDeclarativeDataSource:
         data_source_folder = data_sources_folder / data_source_id
         data_source_file_path = data_source_folder / f"{data_source_id}.yaml"
         pdm = CatalogDeclarativeTables.load_from_disk(data_source_folder)
-        data_source = read_layout_from_file(data_source_file_path)
-        data_source["pdm"] = pdm
+        data_source_dict = read_layout_from_file(data_source_file_path)
+        data_source = CatalogDeclarativeDataSource.from_dict(data_source_dict)
+        data_source.pdm = pdm
         return data_source
 
+    @classmethod
+    def from_dict(cls, data: dict[str, Any], camel_case: bool = True) -> CatalogDeclarativeDataSource:
+        """
+        :param data:    Data loaded for example from the file.
+        :param camel_case:  True if the variable names in the input
+                        data are serialized names as specified in the OpenAPI document.
+                        False if the variables names in the input data are python
+                        variable names in PEP-8 snake case.
+        :return:    CatalogDeclarativeDataSource object.
+        """
+        declarative_data_source = DeclarativeDataSource.from_dict(data, camel_case)
+        return cls.from_api(declarative_data_source)
+
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, CatalogDeclarativeDataSource):
             return False

gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/physical_model/pdm.py

@@ -6,7 +6,7 @@
 
 from gooddata_metadata_client.model.declarative_tables import DeclarativeTables
 from gooddata_sdk.catalog.data_source.declarative_model.physical_model.table import CatalogDeclarativeTable
-from gooddata_sdk.utils import create_directory, read_layout_from_file
+from gooddata_sdk.utils import create_directory
 
 LAYOUT_PDM_DIR = "pdm"
 
@@ -49,14 +49,14 @@ def from_dict(cls, data: dict[str, Any], camel_case: bool = True) -> CatalogDecl
         declarative_data_sources = DeclarativeTables.from_dict(data, camel_case)
         return cls.from_api(declarative_data_sources)
 
-    @staticmethod
-    def load_from_disk(data_source_folder: Path) -> dict:
+    @classmethod
+    def load_from_disk(cls, data_source_folder: Path) -> CatalogDeclarativeTables:
         pdm_folder = get_pdm_folder(data_source_folder)
         table_files = sorted([p for p in pdm_folder.glob("*.yaml")])
         tables = []
         for table_file in table_files:
-            tables.append(read_layout_from_file(table_file))
-        return {"tables": tables}
+            tables.append(CatalogDeclarativeTable.load_from_disk(table_file))
+        return cls(tables=tables)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, CatalogDeclarativeTables):

gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/physical_model/table.py

@@ -7,7 +7,7 @@
 from gooddata_metadata_client.model.declarative_table import DeclarativeTable
 from gooddata_sdk.catalog.data_source.declarative_model.physical_model.column import CatalogDeclarativeColumn
 from gooddata_sdk.catalog.entity import CatalogTypeEntity
-from gooddata_sdk.utils import write_layout_to_file
+from gooddata_sdk.utils import read_layout_from_file, write_layout_to_file
 
 
 class CatalogDeclarativeTable(CatalogTypeEntity):
@@ -41,6 +41,24 @@ def store_to_disk(self, pdm_folder: Path) -> None:
         table_file_path = pdm_folder / f"{self.id}.yaml"
         write_layout_to_file(table_file_path, table_dict)
 
+    @classmethod
+    def load_from_disk(cls, table_file_path: Path) -> CatalogDeclarativeTable:
+        table_data = read_layout_from_file(table_file_path)
+        return CatalogDeclarativeTable.from_dict(table_data)
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any], camel_case: bool = True) -> CatalogDeclarativeTable:
+        """
+        :param data:    Data loaded for example from the file.
+        :param camel_case:  True if the variable names in the input
+                        data are serialized names as specified in the OpenAPI document.
+                        False if the variables names in the input data are python
+                        variable names in PEP-8 snake case.
+        :return:    CatalogDeclarativeTable object.
+        """
+        declarative_table = DeclarativeTable.from_dict(data, camel_case)
+        return cls.from_api(declarative_table)
+
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, CatalogDeclarativeTable):
             return False

gooddata-sdk/gooddata_sdk/catalog/data_source/service.py

@@ -82,7 +82,9 @@ def patch_data_source_attributes(self, data_source_id: str, attributes: dict) ->
         )
 
     def generate_logical_model(
-        self, data_source_id: str, generate_ldm_request: CatalogGenerateLdmRequest
+        self,
+        data_source_id: str,
+        generate_ldm_request: CatalogGenerateLdmRequest = CatalogGenerateLdmRequest(separator="__", wdf_prefix="wdf"),
     ) -> CatalogDeclarativeModel:
         return CatalogDeclarativeModel.from_api(
             self._actions_api.generate_logical_model(data_source_id, generate_ldm_request.to_api())
@@ -207,7 +209,7 @@ def load_declarative_pdm(
         self, data_source_id: str, layout_root_path: Path = Path.cwd()
     ) -> CatalogDeclarativeTables:
         data_source_folder = self.data_source_folder(data_source_id, layout_root_path)
-        return CatalogDeclarativeTables.from_dict(CatalogDeclarativeTables.load_from_disk(data_source_folder))
+        return CatalogDeclarativeTables.load_from_disk(data_source_folder)
 
     def load_and_put_declarative_pdm(self, data_source_id: str, layout_root_path: Path = Path.cwd()) -> None:
         self.put_declarative_pdm(data_source_id, self.load_declarative_pdm(data_source_id, layout_root_path))

gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/analytics_model/analytics_model.py

@@ -289,9 +289,9 @@ def __repr__(self) -> str:
 
     def get_kwargs(self) -> dict[str, Any]:
         kwargs: dict[str, Any] = dict()
-        if self.description:
+        if self.description is not None:
             kwargs["description"] = self.description
-        if self.tags:
+        if self.tags is not None:
             kwargs["tags"] = self.tags
         return kwargs