findly.unified-reporting-sdk 0.7.10__py3-none-any.whl → 0.7.11__py3-none-any.whl

findly/unified_reporting_sdk/data_sources/ga4/ga4_client.py

@@ -240,6 +240,18 @@ class GA4Client(ReportsClient):
             )
         return None
 
+    def _deduplicate_dimensions(self, dimensions: List[Dimension]) -> List[Dimension]:
+        """
+        Deduplicate a list of Dimension objects using their name as a unique key.
+        """
+        seen = set()
+        deduped = []
+        for d in dimensions:
+            if d.name not in seen:
+                seen.add(d.name)
+                deduped.append(d)
+        return deduped
+
     @backoff.on_exception(
         backoff.expo, Exception, max_time=60, max_tries=3, giveup=give_up
     )
@@ -260,10 +272,11 @@ class GA4Client(ReportsClient):
     ) -> Optional[RunReportResponse]:
         report_response = None
         try:
+            deduplicated_dimensions = self._deduplicate_dimensions(dimensions)
             request = RunReportRequest(
                 property=f"properties/{property_id}",
                 date_ranges=date_ranges,
-                dimensions=dimensions,
+                dimensions=deduplicated_dimensions,
                 metrics=metrics,
                 metric_filter=metric_filter,
                 dimension_filter=dimension_filter,
@@ -313,22 +326,48 @@ class GA4Client(ReportsClient):
         include_totals: bool = True,
         **kwargs: str,
     ) -> Optional[RunReportResponse]:
-        # deduplicate dimensions, otherwise we get an error
-        deduplicated_dimensions = list(set(dimensions))
+        # Use the new deduplication method instead of set() to avoid the unhashable error.
+        deduplicated_dimensions = self._deduplicate_dimensions(dimensions)
 
-        return await self._decorated_query_from_parts(
-            metrics=metrics,
-            dimensions=deduplicated_dimensions,
-            date_ranges=date_ranges,
-            dimension_filter=dimension_filter,
-            metric_filter=metric_filter,
-            order_bys=order_bys,
-            limit=limit,
-            offset=offset,
-            property_id=property_id,
-            include_totals=include_totals,
-            **kwargs,
-        )
+        try:
+            request = RunReportRequest(
+                property=f"properties/{property_id}",
+                date_ranges=date_ranges,
+                dimensions=deduplicated_dimensions,
+                metrics=metrics,
+                metric_filter=metric_filter,
+                dimension_filter=dimension_filter,
+                order_bys=order_bys,
+                limit=limit,
+                offset=offset,
+                keep_empty_rows=True,
+                metric_aggregations=(
+                    [MetricAggregation.TOTAL] if include_totals else None
+                ),
+            )
+            report_response = await asyncio.wait_for(
+                self._client.run_report(request), timeout=REQUEST_TIMEOUT
+            )
+        except (TimeoutError, asyncio.exceptions.TimeoutError) as timeout_error:
+            LOGGER.warning(
+                {
+                    "error": str(timeout_error),
+                    "msg": "timeout_error_from_ga4_client",
+                    "property_id": property_id,
+                }
+            )
+            raise timeout_error
+        except Exception as e:
+            LOGGER.warning(
+                {
+                    "msg": "failed_to_run_report",
+                    "property_id": property_id,
+                    "error": str(e),
+                }
+            )
+            raise e
+
+        return report_response
 
     @cached(ttl=300, cache=Cache.MEMORY)  # Cache results for 5 minutes
     async def _decorated_query(

{findly_unified_reporting_sdk-0.7.10.dist-info → findly_unified_reporting_sdk-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: findly.unified-reporting-sdk
-Version: 0.7.10
+Version: 0.7.11
 Summary: 
 License: GPL-3.0-only
 Requires-Python: >=3.9,<4.0

{findly_unified_reporting_sdk-0.7.10.dist-info → findly_unified_reporting_sdk-0.7.11.dist-info}/RECORD

@@ -16,7 +16,7 @@ findly/unified_reporting_sdk/data_sources/fb_ads/metadata/dimensions.jsonl,sha25
 findly/unified_reporting_sdk/data_sources/fb_ads/metadata/fields.csv,sha256=9FQ8yMY7DuD7NG_3vIlbHg-U2O__MQBZ5oRdX5ZeYIE,17708
 findly/unified_reporting_sdk/data_sources/fb_ads/metadata/metrics.jsonl,sha256=k46VIKAOZiuefpo-umQ7SYZnl8I5NIzP7_KITLfL974,19606
 findly/unified_reporting_sdk/data_sources/ga4/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-findly/unified_reporting_sdk/data_sources/ga4/ga4_client.py,sha256=m2ZfjF5TOAuJa8HkHOnx5N3_6o_e6d7XlgTh_7IKhMA,38427
+findly/unified_reporting_sdk/data_sources/ga4/ga4_client.py,sha256=_HDaDyxecq5CRxyGi1FcGeMismxhqgg598ISMrpIvrQ,39901
 findly/unified_reporting_sdk/data_sources/ga4/ga4_query_args_parser.py,sha256=LKESjdiSYDdcJXO8sae1L-W8zxNU4XdMScuLq1AVCXw,30016
 findly/unified_reporting_sdk/data_sources/ga4/metadata/dimensions.jsonl,sha256=nSecS8Pi0ZTjsd1PlIyqAbYF56Chw2zLYRWetLkG9VQ,33511
 findly/unified_reporting_sdk/data_sources/gsc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,7 +29,7 @@ findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=jjoQm4T
 findly/unified_reporting_sdk/urs.py,sha256=-vhOFpi-M0uo_tZ_O_hTDDEGO-ATf78nqEf5JhIcaz4,2956
 findly/unified_reporting_sdk/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/util/create_numeric_string_series.py,sha256=MmufpYatIhcVxA9e3H1dR1CrejXRnA8j4NNjJxfvBVA,457
-findly_unified_reporting_sdk-0.7.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-findly_unified_reporting_sdk-0.7.10.dist-info/METADATA,sha256=VH421mihzxgnFRCTr5v3dCix1hbieb1GOUBh5BSOV64,3212
-findly_unified_reporting_sdk-0.7.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-findly_unified_reporting_sdk-0.7.10.dist-info/RECORD,,
+findly_unified_reporting_sdk-0.7.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+findly_unified_reporting_sdk-0.7.11.dist-info/METADATA,sha256=2AId5iefHOUbOK0f20MN7HtkTc_RjSuPUNh8xOjJXUM,3212
+findly_unified_reporting_sdk-0.7.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+findly_unified_reporting_sdk-0.7.11.dist-info/RECORD,,