gooddata-pandas 1.9.0__tar.gz → 1.9.1.dev1__tar.gz

{gooddata-pandas-1.9.0/gooddata_pandas.egg-info → gooddata-pandas-1.9.1.dev1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: gooddata-pandas
-Version: 1.9.0
+Version: 1.9.1.dev1
 Summary: GoodData Cloud to pandas
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.9.0
+Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.9.1.dev1
 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.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-sdk~=1.9.0
+Requires-Dist: gooddata-sdk~=1.9.1.dev1
 Requires-Dist: pandas<2.0.0,>=1.0.0
 
 # GoodData Pandas
@@ -37,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.7 or newer
+-  Python 3.8 or newer
 
 ## Installation
 

{gooddata-pandas-1.9.0 → gooddata-pandas-1.9.1.dev1}/README.md

@@ -10,7 +10,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.7 or newer
+-  Python 3.8 or newer
 
 ## Installation
 

{gooddata-pandas-1.9.0 → gooddata-pandas-1.9.1.dev1}/gooddata_pandas/result_convertor.py

@@ -30,7 +30,7 @@ class _DataWithHeaders:
     data: List[_DataArray]
     data_headers: Tuple[_DataHeaders, Optional[_DataHeaders]]
     grand_totals: Tuple[Optional[List[_DataArray]], Optional[List[_DataArray]]]
-    grand_total_headers: Tuple[Optional[_DataHeaders], Optional[_DataHeaders]]
+    grand_total_headers: Tuple[Optional[List[Dict[str, _DataHeaders]]], Optional[List[Dict[str, _DataHeaders]]]]
 
 
 @define
@@ -50,7 +50,9 @@ class _AccumulatedData:
     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[_DataHeaders]] = field(init=False, factory=lambda: [None, None])
+    grand_totals_headers: List[Optional[List[Dict[str, _DataHeaders]]]] = field(
+        init=False, factory=lambda: [None, None]
+    )
 
     def accumulate_data(self, from_result: ExecutionResult) -> None:
         """
@@ -119,6 +121,14 @@ class _AccumulatedData:
         for grand_total in grand_totals:
             # 2-dim results have always 1-dim grand totals (3-dim results have 2-dim gt but DataFrame stores 2D only)
             dims = grand_total["totalDimensions"]
+
+            # if dims are empty then data contain total of column and row grandtotals so extend existing data array
+            if len(dims) == 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)
+                continue
+
             assert len(dims) == 1, "Only 2-dimensional results are supported"
             dim_idx = dim_idx_dict[dims[0]]
             # the dimension id specified on the grand total says from what dimension were
@@ -134,11 +144,7 @@ class _AccumulatedData:
                 # grand totals not initialized yet; initialize both data and headers by making
                 # a shallow copy from the results
                 self.grand_totals[opposite_dim] = grand_total["data"][:]
-                # TODO: row total measure headers are currently not supported (only aggregation info w/o measure label)
-                #       measure header defs are under ["headerGroups"][>0]
-                self.grand_totals_headers[opposite_dim] = grand_total["dimensionHeaders"][0]["headerGroups"][0][
-                    "headers"
-                ][:]
+                self.grand_totals_headers[opposite_dim] = grand_total["dimensionHeaders"][0]["headerGroups"]
             elif paging_dim != opposite_dim:
                 # 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:
@@ -446,10 +452,8 @@ def _merge_grand_total_headers_into_headers(extract: _DataWithHeaders) -> Tuple[
         if grand_total_headers is None:
             continue
         header = cast(List[List[Any]], headers[dim_idx])
-        header[0].extend(grand_total_headers)
-        padding = [None] * len(grand_total_headers)
-        for other_headers in header[1:]:
-            other_headers.extend(padding)
+        for level, grand_total_header in enumerate(grand_total_headers):
+            header[level].extend(grand_total_header["headers"])
 
     return headers
 

{gooddata-pandas-1.9.0 → gooddata-pandas-1.9.1.dev1/gooddata_pandas.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: gooddata-pandas
-Version: 1.9.0
+Version: 1.9.1.dev1
 Summary: GoodData Cloud to pandas
 Author: GoodData
 Author-email: support@gooddata.com
 License: MIT
-Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.9.0
+Project-URL: Documentation, https://gooddata-pandas.readthedocs.io/en/v1.9.1.dev1
 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.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: gooddata-sdk~=1.9.0
+Requires-Dist: gooddata-sdk~=1.9.1.dev1
 Requires-Dist: pandas<2.0.0,>=1.0.0
 
 # GoodData Pandas
@@ -37,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.7 or newer
+-  Python 3.8 or newer
 
 ## Installation
 

gooddata-pandas-1.9.1.dev1/gooddata_pandas.egg-info/requires.txt

@@ -0,0 +1,2 @@
+gooddata-sdk~=1.9.1.dev1
+pandas<2.0.0,>=1.0.0

{gooddata-pandas-1.9.0 → gooddata-pandas-1.9.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-sdk~=1.9.0",
+    "gooddata-sdk~=1.9.1.dev1",
     "pandas>=1.0.0,<2.0.0",
 ]
 
@@ -16,7 +16,7 @@ setup(
     description="GoodData Cloud to pandas",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.9.0",
+    version="1.9.1.dev1",
     author="GoodData",
     author_email="support@gooddata.com",
     license="MIT",
@@ -26,7 +26,7 @@ setup(
     packages=find_packages(exclude=["tests*"]),
     python_requires=">=3.8.0",
     project_urls={
-        "Documentation": "https://gooddata-pandas.readthedocs.io/en/v1.9.0",
+        "Documentation": "https://gooddata-pandas.readthedocs.io/en/v1.9.1.dev1",
         "Source": "https://github.com/gooddata/gooddata-python-sdk",
     },
     classifiers=[

gooddata-pandas-1.9.0/gooddata_pandas.egg-info/requires.txt

@@ -1,2 +0,0 @@
-gooddata-sdk~=1.9.0
-pandas<2.0.0,>=1.0.0