gooddata-pandas 1.28.1.dev2__py3-none-any.whl → 1.28.1.dev4__py3-none-any.whl

gooddata_pandas/data_access.py

@@ -6,7 +6,7 @@ from typing import Any, Optional, Union
 from gooddata_sdk import (
     Attribute,
     AttributeFilter,
-    CatalogWorkspaceContent,
+    CatalogAttribute,
     ExecutionDefinition,
     ExecutionResponse,
     Filter,
@@ -16,6 +16,7 @@ from gooddata_sdk import (
     ObjId,
     TableDimension,
 )
+from gooddata_sdk.utils import IdObjType
 
 from gooddata_pandas.utils import (
     ColumnsDef,
@@ -311,27 +312,32 @@ def _extract_for_metrics_only(response: ExecutionResponse, cols: list, col_to_me
     """
     exec_def = response.exec_def
     result = response.read_result(len(exec_def.metrics))
-    data = dict()
+    if len(result.data) == 0:
+        return {col: [] for col in cols}
 
-    for col in cols:
-        data[col] = [result.data[col_to_metric_idx[col]]]
+    return {col: [result.data[col_to_metric_idx[col]]] for col in cols}
 
-    return data
 
+def _find_attribute(attributes: list[CatalogAttribute], id_obj: IdObjType) -> Union[CatalogAttribute, None]:
+    for attribute in attributes:
+        if attribute.find_label(id_obj) is not None:
+            return attribute
+    return None
 
-def _typed_result(catalog: CatalogWorkspaceContent, attribute: Attribute, result_values: list[Any]) -> list[Any]:
+
+def _typed_result(attributes: list[CatalogAttribute], attribute: Attribute, result_values: list[Any]) -> list[Any]:
     """
     Internal function to convert result_values to proper data types.
 
     Args:
-        catalog (CatalogWorkspaceContent): The catalog workspace content.
+        attributes (list[CatalogAttribute]): The catalog of attributes.
         attribute (Attribute): The attribute for which the typed result will be computed.
         result_values (list[Any]): A list of raw values.
 
     Returns:
         list[Any]: A list of converted values with proper data types.
     """
-    catalog_attribute = catalog.find_label_attribute(attribute.label)
+    catalog_attribute = _find_attribute(attributes, attribute.label)
     if catalog_attribute is None:
         raise ValueError(f"Unable to find attribute {attribute.label} in catalog")
     return [_typed_attribute_value(catalog_attribute, value) for value in result_values]
@@ -339,7 +345,7 @@ def _typed_result(catalog: CatalogWorkspaceContent, attribute: Attribute, result
 
 def _extract_from_attributes_and_maybe_metrics(
     response: ExecutionResponse,
-    catalog: CatalogWorkspaceContent,
+    attributes: list[CatalogAttribute],
     cols: list[str],
     col_to_attr_idx: dict[str, int],
     col_to_metric_idx: dict[str, int],
@@ -382,12 +388,12 @@ def _extract_from_attributes_and_maybe_metrics(
         for idx_name in index:
             rs = result.get_all_header_values(attribute_dim, safe_index_to_attr_idx[idx_name])
             attribute = index_to_attribute[idx_name]
-            index[idx_name] += _typed_result(catalog, attribute, rs)
+            index[idx_name] += _typed_result(attributes, attribute, rs)
         for col in cols:
             if col in col_to_attr_idx:
                 rs = result.get_all_header_values(attribute_dim, col_to_attr_idx[col])
                 attribute = col_to_attribute[col]
-                data[col] += _typed_result(catalog, attribute, rs)
+                data[col] += _typed_result(attributes, attribute, rs)
             elif col_to_metric_idx[col] < len(result.data):
                 data[col] += result.data[col_to_metric_idx[col]]
         if result.is_complete(attribute_dim):
@@ -440,10 +446,10 @@ def compute_and_extract(
     if not exec_def.has_attributes():
         return _extract_for_metrics_only(response, cols, col_to_metric_idx), dict()
     else:
-        catalog = sdk.catalog_workspace_content.get_full_catalog(workspace_id)
+        attributes = sdk.catalog_workspace_content.get_attributes_catalog(workspace_id, include=["labels", "datasets"])
         return _extract_from_attributes_and_maybe_metrics(
             response,
-            catalog,
+            attributes,
             cols,
             col_to_attr_idx,
             col_to_metric_idx,

{gooddata_pandas-1.28.1.dev2.dist-info → gooddata_pandas-1.28.1.dev4.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: gooddata-pandas
-Version: 1.28.1.dev2
+Version: 1.28.1.dev4
 Summary: GoodData Cloud to pandas
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.28.1.dev2
+Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.28.1.dev4
 Project-URL: Source, https://github.com/gooddata/gooddata-python-sdk
 Keywords: gooddata,pandas,series,data,frame,data_frame,analytics,headless,business,intelligence,headless-bi,cloud,native,semantic,layer,sql,metrics
 Classifier: Development Status :: 5 - Production/Stable
@@ -22,7 +22,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-sdk ~=1.28.1.dev2
+Requires-Dist: gooddata-sdk ~=1.28.1.dev4
 Requires-Dist: pandas <3.0.0,>=2.0.0
 
 # GoodData Pandas

{gooddata_pandas-1.28.1.dev2.dist-info → gooddata_pandas-1.28.1.dev4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 gooddata_pandas/__init__.py,sha256=Ta3qIIDq7kBRUsYSV3aC69AQBFvFvhtWDQucgP-l88w,297
 gooddata_pandas/_version.py,sha256=960vTs6l7xsN2BOXWCxOc4PSKdzzKhnNEPTMnmMTCQs,119
-gooddata_pandas/data_access.py,sha256=JqiaEKZLrL6hisiO-4uy4A0Eng9X6shzAb_hiMuONJs,18753
+gooddata_pandas/data_access.py,sha256=u64xnvPUCHmF41A6I02A1bhqmszuPNzoKuycIH6y3jc,19109
 gooddata_pandas/dataframe.py,sha256=SeNIx-tlf7PjmGppkhNDPEl8RQN6BRKOC3UJ89uFnjo,13000
 gooddata_pandas/good_pandas.py,sha256=ePEm2Lmeiftz5td0BLC71q7my5Aj8aABn3xV0myRmqI,3444
 gooddata_pandas/py.typed,sha256=u_MS29sadlaIqGRPYFjWml5u0gQnoQfvbsf9pu3TZJU,94
 gooddata_pandas/result_convertor.py,sha256=r7uFrjeM6cxMy08YcS3LywF1iUPSyEyG3BAddh0DkIQ,25807
 gooddata_pandas/series.py,sha256=wTvJR_I0FUteyxo4RwHzP20eU7rei0dP8ZdqfrLbf5c,5759
 gooddata_pandas/utils.py,sha256=JQZOuGjDfpPZqBnz-KdN8EwjzXXTbQCONWmUEE3cY9M,7217
-gooddata_pandas-1.28.1.dev2.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
-gooddata_pandas-1.28.1.dev2.dist-info/METADATA,sha256=nuwMgaJFQGneRP5j-09T9dxXdAJVreyvLpBefbVbMho,2843
-gooddata_pandas-1.28.1.dev2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-gooddata_pandas-1.28.1.dev2.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
-gooddata_pandas-1.28.1.dev2.dist-info/RECORD,,
+gooddata_pandas-1.28.1.dev4.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
+gooddata_pandas-1.28.1.dev4.dist-info/METADATA,sha256=TrYPzQwPF4Dj2A-_LUJSMPtMp8ddYIU6sO_VS42UBy4,2843
+gooddata_pandas-1.28.1.dev4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+gooddata_pandas-1.28.1.dev4.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
+gooddata_pandas-1.28.1.dev4.dist-info/RECORD,,