gooddata-pandas 1.24.0__py3-none-any.whl → 1.25.0__py3-none-any.whl

gooddata_pandas/_version.py

@@ -1,7 +1,4 @@
 # (C) 2021 GoodData Corporation
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore # mypy issue #1153
+from importlib import metadata
 
 __version__: str = metadata.version("gooddata-pandas")

gooddata_pandas/data_access.py

@@ -119,10 +119,7 @@ class ExecutionDefinitionBuilder:
         if index_by is None:
             return
 
-        if not isinstance(index_by, dict):
-            _index_by = {self._DEFAULT_INDEX_NAME: index_by}
-        else:
-            _index_by = index_by
+        _index_by = {self._DEFAULT_INDEX_NAME: index_by} if not isinstance(index_by, dict) else index_by
 
         for index_name, index_def in _index_by.items():
             if isinstance(index_def, str) and (index_def in self._col_to_attr_idx):
@@ -208,11 +205,14 @@ class ExecutionDefinitionBuilder:
                         raise ValueError(f"AttributeFilter instance referencing metric [{_filter.label}]")
                     else:
                         _filter.label = _str_to_obj_id(_filter.label) or _filter.label
-                elif isinstance(_filter, MetricValueFilter) and isinstance(_filter.metric, str):
-                    if _filter.metric in self._col_to_metric_idx:
-                        # Metric is referenced by local_id which was already generated during creation of columns
-                        # When Metric filter contains ObjId reference, it does not need to be modified
-                        _filter.metric = self._metrics[self._col_to_metric_idx[_filter.metric]].local_id
+                elif (
+                    isinstance(_filter, MetricValueFilter)
+                    and isinstance(_filter.metric, str)
+                    and _filter.metric in self._col_to_metric_idx
+                ):
+                    # Metric is referenced by local_id which was already generated during creation of columns
+                    # When Metric filter contains ObjId reference, it does not need to be modified
+                    _filter.metric = self._metrics[self._col_to_metric_idx[_filter.metric]].local_id
 
         return filters
 

gooddata_pandas/dataframe.py

@@ -1,7 +1,7 @@
 # (C) 2021 GoodData Corporation
 from __future__ import annotations
 
-from typing import Optional, Tuple, Union
+from typing import Optional, Union
 
 import pandas
 from gooddata_api_client import models
@@ -202,7 +202,7 @@ class DataFrameFactory:
         result_size_dimensions_limits: ResultSizeDimensions = (),
         result_size_bytes_limit: Optional[int] = None,
         page_size: int = _DEFAULT_PAGE_SIZE,
-    ) -> Tuple[pandas.DataFrame, DataFrameMetadata]:
+    ) -> tuple[pandas.DataFrame, DataFrameMetadata]:
         """
         Creates a data frame using an execution definition.
 
@@ -261,7 +261,7 @@ class DataFrameFactory:
         use_local_ids_in_headers: bool = False,
         use_primary_labels_in_attributes: bool = False,
         page_size: int = _DEFAULT_PAGE_SIZE,
-    ) -> Tuple[pandas.DataFrame, DataFrameMetadata]:
+    ) -> tuple[pandas.DataFrame, DataFrameMetadata]:
         """
             Retrieves a DataFrame and DataFrame metadata for a given execution result identifier.
 

gooddata_pandas/result_convertor.py

@@ -1,14 +1,14 @@
 # (C) 2022 GoodData Corporation
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union, cast
+from typing import Any, Callable, Optional, Union, cast
 
 import pandas
 from attrs import define, field, frozen
 from gooddata_sdk import BareExecutionResponse, ExecutionResult, ResultCacheMetadata, ResultSizeDimensions
 
 _DEFAULT_PAGE_SIZE = 100
-_DataHeaders = List[List[Any]]
-_DataArray = List[Union[int, None]]
-LabelOverrides = Dict[str, Dict[str, Dict[str, str]]]
+_DataHeaders = list[list[Any]]
+_DataArray = list[Union[int, None]]
+LabelOverrides = dict[str, dict[str, dict[str, str]]]
 
 
 @frozen
@@ -26,10 +26,10 @@ class _DataWithHeaders:
             Per-dimension grand total headers.
     """
 
-    data: List[_DataArray]
-    data_headers: Tuple[_DataHeaders, Optional[_DataHeaders]]
-    grand_totals: Tuple[Optional[List[_DataArray]], Optional[List[_DataArray]]]
-    grand_total_headers: Tuple[Optional[List[Dict[str, _DataHeaders]]], Optional[List[Dict[str, _DataHeaders]]]]
+    data: list[_DataArray]
+    data_headers: tuple[_DataHeaders, Optional[_DataHeaders]]
+    grand_totals: tuple[Optional[list[_DataArray]], Optional[list[_DataArray]]]
+    grand_total_headers: tuple[Optional[list[dict[str, _DataHeaders]]], Optional[list[dict[str, _DataHeaders]]]]
 
 
 @define
@@ -46,10 +46,10 @@ class _AccumulatedData:
         grand_totals_headers (List[Optional[_DataHeaders]]): Holds the headers for grand total data arrays.
     """
 
-    data: List[_DataArray] = field(init=False, factory=list)
-    data_headers: List[Optional[_DataHeaders]] = field(init=False, factory=lambda: [None, None])
-    grand_totals: List[Optional[List[_DataArray]]] = field(init=False, factory=lambda: [None, None])
-    grand_totals_headers: List[Optional[List[Dict[str, _DataHeaders]]]] = field(
+    data: list[_DataArray] = field(init=False, factory=list)
+    data_headers: list[Optional[_DataHeaders]] = field(init=False, factory=lambda: [None, None])
+    grand_totals: list[Optional[list[_DataArray]]] = field(init=False, factory=lambda: [None, None])
+    grand_totals_headers: list[Optional[list[dict[str, _DataHeaders]]]] = field(
         init=False, factory=lambda: [None, None]
     )
     total_of_grant_totals_processed: bool = field(init=False, default=False)
@@ -125,7 +125,7 @@ class _AccumulatedData:
             # if dims are empty then data contain total of column and row grandtotals so extend existing data array
             if len(dims) == 0:
                 if not self.total_of_grant_totals_processed:
-                    grand_totals_item = cast(List[_DataArray], self.grand_totals[0])
+                    grand_totals_item = cast(list[_DataArray], self.grand_totals[0])
                     for total_idx, total_data in enumerate(grand_total["data"]):
                         grand_totals_item[total_idx].extend(total_data)
                     self.total_of_grant_totals_processed = True
@@ -151,7 +151,7 @@ class _AccumulatedData:
                 # grand totals are already initialized and the code is paging in the direction that reveals
                 # additional grand total values; append them accordingly; no need to consider total headers:
                 # that is because only the grand total data is subject to paging
-                grand_totals_item = cast(List[_DataArray], self.grand_totals[opposite_dim])
+                grand_totals_item = cast(list[_DataArray], self.grand_totals[opposite_dim])
                 if opposite_dim == 0:
                     # have column totals and paging 'to the right'; totals for the new columns are revealed so
                     # extend existing data arrays
@@ -198,18 +198,18 @@ class DataFrameMetadata:
                           execution response.
     """
 
-    row_totals_indexes: List[List[int]]
+    row_totals_indexes: list[list[int]]
     execution_response: BareExecutionResponse
-    primary_labels_from_index: Dict[int, Dict[str, str]]
-    primary_labels_from_columns: Dict[int, Dict[str, str]]
+    primary_labels_from_index: dict[int, dict[str, str]]
+    primary_labels_from_columns: dict[int, dict[str, str]]
 
     @classmethod
     def from_data(
         cls,
-        headers: Tuple[_DataHeaders, Optional[_DataHeaders]],
+        headers: tuple[_DataHeaders, Optional[_DataHeaders]],
         execution_response: BareExecutionResponse,
-        primary_labels_from_index: Dict[int, Dict[str, str]],
-        primary_labels_from_columns: Dict[int, Dict[str, str]],
+        primary_labels_from_index: dict[int, dict[str, str]],
+        primary_labels_from_columns: dict[int, dict[str, str]],
     ) -> "DataFrameMetadata":
         """This method constructs a DataFrameMetadata object from data headers and an execution response.
 
@@ -310,7 +310,7 @@ def _read_complete_execution_result(
 def _create_header_mapper(
     response: BareExecutionResponse,
     dim: int,
-    primary_attribute_labels_mapping: Dict[int, Dict[str, str]],
+    primary_attribute_labels_mapping: dict[int, dict[str, str]],
     label_overrides: Optional[LabelOverrides] = None,
     use_local_ids_in_headers: bool = False,
     use_primary_labels_in_attributes: bool = False,
@@ -347,10 +347,7 @@ def _create_header_mapper(
             if "labelValue" in header["attributeHeader"]:
                 label_value = header["attributeHeader"]["labelValue"]
                 primary_label_value = header["attributeHeader"]["primaryLabelValue"]
-                if use_primary_labels_in_attributes:
-                    label = primary_label_value
-                else:
-                    label = label_value
+                label = primary_label_value if use_primary_labels_in_attributes else label_value
                 if header_idx is not None:
                     if header_idx in primary_attribute_labels_mapping:
                         primary_attribute_labels_mapping[header_idx][primary_label_value] = label_value
@@ -393,12 +390,12 @@ def _create_header_mapper(
 
 def _headers_to_index(
     dim_idx: int,
-    headers: Tuple[_DataHeaders, Optional[_DataHeaders]],
+    headers: tuple[_DataHeaders, Optional[_DataHeaders]],
     response: BareExecutionResponse,
     label_overrides: LabelOverrides,
     use_local_ids_in_headers: bool = False,
     use_primary_labels_in_attributes: bool = False,
-) -> Tuple[Optional[pandas.Index], Dict[int, Dict[str, str]]]:
+) -> tuple[Optional[pandas.Index], dict[int, dict[str, str]]]:
     """Converts headers to a pandas MultiIndex.
 
     This function converts the headers present in the response to a pandas MultiIndex (can be used in pandas dataframes)
@@ -418,7 +415,7 @@ def _headers_to_index(
         with primary attribute labels mapping as Dict, or None with empty Dict if the headers are empty.
     """
     # dict of primary labels and it's custom labels for attributes per level as key
-    primary_attribute_labels_mapping: Dict[int, Dict[str, str]] = {}
+    primary_attribute_labels_mapping: dict[int, dict[str, str]] = {}
 
     if len(response.dimensions) <= dim_idx or not len(response.dimensions[dim_idx]["headers"]):
         return None, primary_attribute_labels_mapping
@@ -441,7 +438,7 @@ def _headers_to_index(
     ), primary_attribute_labels_mapping
 
 
-def _merge_grand_totals_into_data(extract: _DataWithHeaders) -> Union[_DataArray, List[_DataArray]]:
+def _merge_grand_totals_into_data(extract: _DataWithHeaders) -> Union[_DataArray, list[_DataArray]]:
     """
     Merges grand totals into the extracted data. This function will mutate the extracted data,
     extending the rows and columns with grand totals. Going with mutation here so as not to copy arrays around.
@@ -452,7 +449,7 @@ def _merge_grand_totals_into_data(extract: _DataWithHeaders) -> Union[_DataArray
     Returns:
         Union[_DataArray, List[_DataArray]]: Mutated data with rows and columns extended with grand totals.
     """
-    data: List[_DataArray] = extract.data
+    data: list[_DataArray] = extract.data
 
     if extract.grand_totals[0] is not None:
         # column totals are computed into extra rows, one row per column total
@@ -468,7 +465,7 @@ def _merge_grand_totals_into_data(extract: _DataWithHeaders) -> Union[_DataArray
     return data
 
 
-def _merge_grand_total_headers_into_headers(extract: _DataWithHeaders) -> Tuple[_DataHeaders, Optional[_DataHeaders]]:
+def _merge_grand_total_headers_into_headers(extract: _DataWithHeaders) -> tuple[_DataHeaders, Optional[_DataHeaders]]:
     """Merges grand total headers into data headers. This function will mutate the extracted data.
 
     Args:
@@ -478,12 +475,12 @@ def _merge_grand_total_headers_into_headers(extract: _DataWithHeaders) -> Tuple[
         Tuple[_DataHeaders, Optional[_DataHeaders]]:
             A tuple containing the modified data headers and the grand total headers if present.
     """
-    headers: Tuple[_DataHeaders, Optional[_DataHeaders]] = extract.data_headers
+    headers: tuple[_DataHeaders, Optional[_DataHeaders]] = extract.data_headers
 
     for dim_idx, grand_total_headers in enumerate(extract.grand_total_headers):
         if grand_total_headers is None:
             continue
-        header = cast(List[List[Any]], headers[dim_idx])
+        header = cast(list[list[Any]], headers[dim_idx])
         for level, grand_total_header in enumerate(grand_total_headers):
             header[level].extend(grand_total_header["headers"])
 
@@ -499,7 +496,7 @@ def convert_execution_response_to_dataframe(
     use_local_ids_in_headers: bool = False,
     use_primary_labels_in_attributes: bool = False,
     page_size: int = _DEFAULT_PAGE_SIZE,
-) -> Tuple[pandas.DataFrame, DataFrameMetadata]:
+) -> tuple[pandas.DataFrame, DataFrameMetadata]:
     """
     Converts execution result to a pandas dataframe, maintaining the dimensionality of the result.
 

gooddata_pandas/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import hashlib
 import uuid
-from typing import Any, Dict, Optional, Union
+from typing import Any, Optional, Union
 
 import pandas
 from gooddata_sdk import (
@@ -20,8 +20,8 @@ from pandas import Index, MultiIndex
 
 LabelItemDef = Union[Attribute, ObjId, str]
 DataItemDef = Union[Attribute, Metric, ObjId, str]
-IndexDef = Union[LabelItemDef, Dict[str, LabelItemDef]]
-ColumnsDef = Dict[str, DataItemDef]
+IndexDef = Union[LabelItemDef, dict[str, LabelItemDef]]
+ColumnsDef = dict[str, DataItemDef]
 
 # register external pandas types to converters
 IntegerConverter.set_external_fnc(lambda self, value: pandas.to_numeric(value))

{gooddata_pandas-1.24.0.dist-info → gooddata_pandas-1.25.0.dist-info}/METADATA

@@ -1,17 +1,16 @@
 Metadata-Version: 2.1
 Name: gooddata-pandas
-Version: 1.24.0
+Version: 1.25.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.24.0
+Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.25.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
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -20,10 +19,10 @@ Classifier: Topic :: Database
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-sdk ~=1.24.0
+Requires-Dist: gooddata-sdk ~=1.25.0
 Requires-Dist: pandas <3.0.0,>=2.0.0
 
 # GoodData Pandas
@@ -38,7 +37,7 @@ See [DOCUMENTATION](https://gooddata-pandas.readthedocs.io/en/latest/) for more
 -  GoodData.CN installation; either running on your cloud
    infrastructure or the free Community Edition running on your workstation
 
--  Python 3.8 or newer
+-  Python 3.9 or newer
 
 ## Installation
 

gooddata_pandas-1.25.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+gooddata_pandas/__init__.py,sha256=Ta3qIIDq7kBRUsYSV3aC69AQBFvFvhtWDQucgP-l88w,297
+gooddata_pandas/_version.py,sha256=960vTs6l7xsN2BOXWCxOc4PSKdzzKhnNEPTMnmMTCQs,119
+gooddata_pandas/data_access.py,sha256=nkXYBCnDh8h02n15bk6KUnWWOEtqhU_uTthMnY6f9Ag,18750
+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.25.0.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
+gooddata_pandas-1.25.0.dist-info/METADATA,sha256=c-gXNBSVZU_WfYLZLS1zt0-s4MzHvTeDz70IoeGM4W0,2828
+gooddata_pandas-1.25.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+gooddata_pandas-1.25.0.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
+gooddata_pandas-1.25.0.dist-info/RECORD,,

{gooddata_pandas-1.24.0.dist-info → gooddata_pandas-1.25.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

gooddata_pandas-1.24.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-gooddata_pandas/__init__.py,sha256=Ta3qIIDq7kBRUsYSV3aC69AQBFvFvhtWDQucgP-l88w,297
-gooddata_pandas/_version.py,sha256=YxaAwfP9Yw10sit_vyhVfHJQBAzUUwtm5p0BItfBFx8,225
-gooddata_pandas/data_access.py,sha256=X8NKYtwWKFEfXvgrUbybuQmg1cub5pAhFtDCFMyzffY,18748
-gooddata_pandas/dataframe.py,sha256=YwjkuO6PzqSfQTaB1Bsn2VuQHvxyiYL75xIW2iI7t3M,13007
-gooddata_pandas/good_pandas.py,sha256=ePEm2Lmeiftz5td0BLC71q7my5Aj8aABn3xV0myRmqI,3444
-gooddata_pandas/py.typed,sha256=u_MS29sadlaIqGRPYFjWml5u0gQnoQfvbsf9pu3TZJU,94
-gooddata_pandas/result_convertor.py,sha256=6k9-Z6Jgtej2yPcR2iftKd2c6e8OwSEDkiil2o-zjP0,25892
-gooddata_pandas/series.py,sha256=wTvJR_I0FUteyxo4RwHzP20eU7rei0dP8ZdqfrLbf5c,5759
-gooddata_pandas/utils.py,sha256=PpkB6oWacRxYY9S-RbEZm9Jdblo4bgAzrmHzV9MlMPQ,7223
-gooddata_pandas-1.24.0.dist-info/LICENSE.txt,sha256=3RjzQk8y9HG1_LgqvbEqWZKJnTQGOO1cpzYzBc13Myk,149825
-gooddata_pandas-1.24.0.dist-info/METADATA,sha256=KU_mdywEg9E5BasDyZW9-_GVLaQqUzZv7_mGDcX95Cs,2878
-gooddata_pandas-1.24.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-gooddata_pandas-1.24.0.dist-info/top_level.txt,sha256=B7K_WFxlxplJbEbv5Mf0YhX74dbOpTPgDX-W6I7CssI,16
-gooddata_pandas-1.24.0.dist-info/RECORD,,