findly.unified-reporting-sdk 0.7.10__tar.gz → 0.7.12__tar.gz

{findly_unified_reporting_sdk-0.7.10 → findly_unified_reporting_sdk-0.7.12}/PKG-INFO

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

{findly_unified_reporting_sdk-0.7.10 → findly_unified_reporting_sdk-0.7.12}/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 → findly_unified_reporting_sdk-0.7.12}/findly/unified_reporting_sdk/data_sources/ga4/ga4_query_args_parser.py

@@ -225,16 +225,20 @@ class GA4QueryArgsParser(CommonParser):
         query_args: QueryArgs,
         property_id: str,
     ) -> Dict[str, Any]:
+        # Remove duplicates from metrics and dimensions to avoid redundant processing.
+        unique_metrics = list(dict.fromkeys(query_args.metrics))
+        unique_dimensions = list(dict.fromkeys(query_args.group_by_columns))
+        
         ga4_metrics_list = await self.get_metrics(
-            metrics_name_list=list(query_args.metrics),
+            metrics_name_list=unique_metrics,
         )
         LOGGER.info("sucessfully got metrics")
-
+    
         ga4_dimensions_list = await self.get_dimensions(
-            dimensions_name_list=list(query_args.group_by_columns),
+            dimensions_name_list=unique_dimensions,
         )
         LOGGER.info("sucessfully got dimensions")
-
+    
         ga4_date_ranges = self.get_date_ranges(
             date_str_range_list=(
                 list(query_args.date_ranges)
@@ -244,7 +248,7 @@ class GA4QueryArgsParser(CommonParser):
             format_function=format_ga4_date_ranges_default,
         )
         LOGGER.info("sucessfully got date ranges")
-
+    
         ga4_order_by_list = await self.get_order_by(
             order_by_list=(
                 list(query_args.order_by) if query_args.order_by is not None else None
@@ -253,17 +257,17 @@ class GA4QueryArgsParser(CommonParser):
             order_by_dimensions_candidates=list(query_args.group_by_columns),
         )
         LOGGER.info("sucessfully got order by")
-
+    
         ga4_dimension_filter_list = await self.get_filter_clause(
             filter_clause=query_args.where_clause
         )
         LOGGER.info("sucessfully got dimension filter")
-
+    
         ga4_metrics_filter_list = await self.get_filter_clause(
             filter_clause=query_args.having_clause
         )
         LOGGER.info("sucessfully got metrics filter")
-
+    
         LOGGER.info(
             {
                 "msg": "query_parts",
@@ -279,7 +283,7 @@ class GA4QueryArgsParser(CommonParser):
                 "limit": query_args.limit,
             }
         )
-
+    
         ga4_request = {
             "metrics": ga4_metrics_list,
             "dimensions": ga4_dimensions_list,

{findly_unified_reporting_sdk-0.7.10 → findly_unified_reporting_sdk-0.7.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "findly.unified-reporting-sdk"
-version = "0.7.10"
+version = "0.7.12"
 license = "GPL-3.0-only"
 description = ""
 authors = []