gooddata-pandas 1.34.0__py3-none-any.whl → 1.35.0__py3-none-any.whl

gooddata_pandas/data_access.py

@@ -26,6 +26,7 @@ from gooddata_pandas.utils import (
     _to_attribute,
     _to_item,
     _typed_attribute_value,
+    get_catalog_attributes_for_extract,
 )
 
 
@@ -446,7 +447,7 @@ def compute_and_extract(
     if not exec_def.has_attributes():
         return _extract_for_metrics_only(response, cols, col_to_metric_idx), dict()
     else:
-        attributes = sdk.catalog_workspace_content.get_attributes_catalog(workspace_id, include=["labels", "datasets"])
+        attributes = get_catalog_attributes_for_extract(sdk, workspace_id, exec_def.attributes)
         return _extract_from_attributes_and_maybe_metrics(
             response,
             attributes,

gooddata_pandas/utils.py

@@ -9,6 +9,7 @@ import pandas
 from gooddata_sdk import (
     Attribute,
     CatalogAttribute,
+    GoodDataSdk,
     Metric,
     ObjId,
     SimpleMetric,
@@ -16,6 +17,7 @@ from gooddata_sdk import (
     VisualizationMetric,
 )
 from gooddata_sdk.type_converter import AttributeConverterStore, DateConverter, DatetimeConverter, IntegerConverter
+from gooddata_sdk.utils import filter_for_attributes_labels
 from pandas import Index, MultiIndex
 
 LabelItemDef = Union[Attribute, ObjId, str]
@@ -29,6 +31,25 @@ DateConverter.set_external_fnc(lambda self, value: pandas.to_datetime(value))
 DatetimeConverter.set_external_fnc(lambda self, value: pandas.to_datetime(value))
 
 
+def get_catalog_attributes_for_extract(
+    sdk: GoodDataSdk, workspace_id: str, attributes: list[Attribute], character_limit: int = 1500
+) -> list[CatalogAttribute]:
+    """
+    Get catalog attributes for the given attributes.
+    It uses the filter_for_attributes_labels function to get the
+    RSQL queries for the attributes and then fetches the catalog attributes for the given workspace.
+    This approach prevents loading all catalog attributes providing significant speed-up.
+    """
+    rsql_queries = filter_for_attributes_labels(attributes, character_limit)
+    return [
+        attr
+        for query in rsql_queries
+        for attr in sdk.catalog_workspace_content.get_attributes_catalog(
+            workspace_id, include=["labels", "datasets"], rsql_filter=query
+        )
+    ]
+
+
 def _unique_local_id() -> str:
     """
     Generate unique local ID of a DataItem without dashes.

{gooddata_pandas-1.34.0.dist-info → gooddata_pandas-1.35.0.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: gooddata-pandas
-Version: 1.34.0
+Version: 1.35.0
 Summary: GoodData Cloud to pandas
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.34.0
+Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.35.0
 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
@@ -23,7 +23,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-sdk~=1.34.0
+Requires-Dist: gooddata-sdk~=1.35.0
 Requires-Dist: pandas<3.0.0,>=2.0.0
 Dynamic: author
 Dynamic: author-email

{gooddata_pandas-1.34.0.dist-info → gooddata_pandas-1.35.0.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=u64xnvPUCHmF41A6I02A1bhqmszuPNzoKuycIH6y3jc,19109
+gooddata_pandas/data_access.py,sha256=pIy_AWKabMUIxIRdoAGJrDIeZ_zvGWUv9ntP3OBx7Oc,19125
 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.34.0.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
-gooddata_pandas-1.34.0.dist-info/METADATA,sha256=Ev77j5iDMB0PSDkVoyQxGdizlWfgE_6U3RI1ORrYD74,3111
-gooddata_pandas-1.34.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gooddata_pandas-1.34.0.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
-gooddata_pandas-1.34.0.dist-info/RECORD,,
+gooddata_pandas/utils.py,sha256=JhWs0WYqg-9o3aWRP21ERFAxCKoT5oNKQ5mKlJh4uT4,8091
+gooddata_pandas-1.35.0.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
+gooddata_pandas-1.35.0.dist-info/METADATA,sha256=wZL4vdLBhDaoO9mKBWIMf9cIsPMVAXopiuRJYp0cJC4,3111
+gooddata_pandas-1.35.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gooddata_pandas-1.35.0.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
+gooddata_pandas-1.35.0.dist-info/RECORD,,