findly.unified-reporting-sdk 0.6.22__py3-none-any.whl → 0.7.1__py3-none-any.whl

findly/unified_reporting_sdk/data_sources/common/common_parser.py

@@ -127,12 +127,9 @@ class CommonParser:
 
         # Date Where clause
         if query.date_ranges:
-            sql_date_range = await self.get_date_ranges(
-                date_str_range_list=list(query.date_ranges)
-            )
-            for date_range in sql_date_range:
-                start_date = date_range["since"]
-                end_date = date_range["until"]
+            for date_range in list(query.date_ranges):
+                start_date = date_range.start_date
+                end_date = date_range.end_date
                 # Check if start and end dates are the same
                 if start_date == end_date:
                     # Use equality condition when dates are the same
@@ -158,7 +155,8 @@ class CommonParser:
 
         # Order By
         if query.order_by:
-            query_parts.append(f"ORDER BY {query.order_by}")
+            order_by_str = ", ".join(query.order_by)
+            query_parts.append(f"ORDER BY {order_by_str}")
 
         # Limit
         if query.limit:

findly/unified_reporting_sdk/data_sources/common/entities.py

@@ -0,0 +1,10 @@
+import dataclasses
+from typing import List, Optional
+from pandas import DataFrame
+
+
+@dataclasses.dataclass
+class ReportsClientQueryResult:
+    main_result: List[DataFrame]
+    totals_result: List[DataFrame]
+    sql_query: Optional[str] = None

findly/unified_reporting_sdk/data_sources/common/reports_client.py

@@ -1,8 +1,9 @@
-import logging
-import pandas as pd
 from abc import ABC, abstractmethod
-from typing import List, Tuple, Optional, Dict
+from typing import List, Optional
 
+from findly.unified_reporting_sdk.data_sources.common.entities import (
+    ReportsClientQueryResult,
+)
 from findly.unified_reporting_sdk.protos.findly_semantic_layer_pb2 import (
     Dimension,
     Metric,
@@ -23,7 +24,7 @@ class ReportsClient(ABC):
     @abstractmethod
     async def query(
         self, query_args: QueryArgs, property_id: str, **kwargs: str
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         """
         Executes the integration API request based on the SQL query parts.
 
@@ -32,7 +33,7 @@ class ReportsClient(ABC):
             property_id (str): The property ID to execute the query for.
 
         Returns:
-            Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]: A tuple containing two lists of pandas DataFrames, or None if the query failed.
+            Optional[ReportsClientQueryResult]: The query result, or None if the query failed.
         """
         pass
 

findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py

@@ -194,6 +194,6 @@ def parse_where_column_condition(
 if __name__ == "__main__":
     # ERROR:findly.unified_reporting_sdk.data_sources.common.where_string_comparison:{'msg': 'error_parse_where_column_condition', 'where_clause': "WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) ", 'sql_query': "select * from table WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) ", 'error': "Required keyword: 'expression' missing for <class 'sqlglot.expressions.And'>. Line 1, Col: 70.\n  select * from table WHERE LOWER(cargo) LIKE LOWER('%crude%') AND \x1b[4mWHERE\x1b[0m LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) "}
     # i want to test this case above
-    where_clause_str = "WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) "
+    where_clause_str = "WHERE LOWER(cargo) LIKE LOWER('%crude%') AND LOWER(imo__ais_destination_formatted) LIKE LOWER('%rotterdam%') "
     dialect = "bigquery"
     print(parse_where_column_condition(where_clause_str, dialect))

findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_client.py

@@ -10,6 +10,9 @@ from facebook_business.adobjects.adsinsights import AdsInsights
 from facebook_business.adobjects.user import User
 from facebook_business.adobjects.business import Business
 
+from findly.unified_reporting_sdk.data_sources.common.entities import (
+    ReportsClientQueryResult,
+)
 from findly.unified_reporting_sdk.data_sources.common.reports_client import (
     ReportsClient,
 )
@@ -172,7 +175,6 @@ class FbAdsClient(ReportsClient):
         sort: Optional[List[str]] = None,
         filtering: Optional[List[Dict[str, str]]] = None,
         limit: Union[int, str] = DEFAULT_LIMIT_FOR_ADS_INSIGHTS_CURSOR,
-        time_increment: Optional[str] = None,
         level: AdsInsights.Level = AdsInsights.Level.account,
         page_size: int = DEFAULT_PAGE_SIZE_FOR_FB_ADS_PAGINATED_CALL,
         **kwargs: str,
@@ -303,7 +305,7 @@ class FbAdsClient(ReportsClient):
         query_args: QueryArgs,
         property_id: str,
         **kwargs: str,
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         params = await FB_PARSER.parse_query_args_to_request_params(
             query_args=query_args,
             property_id=property_id,
@@ -333,14 +335,17 @@ class FbAdsClient(ReportsClient):
             summary=summary,
             query_args=query_args,
         )
-        return generated_result_df, generated_totals_df
+
+        return ReportsClientQueryResult(
+            main_result=generated_result_df, totals_result=generated_totals_df
+        )
 
     async def query(
         self,
         query_args: QueryArgs,
         property_id: str,
         **kwargs: str,
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         return await self._decorated_query(
             query_args=query_args,
             property_id=property_id,

findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_query_args_parser.py

@@ -299,7 +299,7 @@ class FbAdsQueryArgsParser(CommonParser):
                     exploded_df = df.explode(metric.name)
 
                     # Normalize the dictionary in 'metric column to separate columns
-                    normalized_df = pd.json_normalize(exploded_df[metric.name])
+                    normalized_df = pd.json_normalize(exploded_df[metric.name].tolist())
 
                     # Identify overlapping columns
                     overlapping_columns = list(
@@ -398,7 +398,7 @@ class FbAdsQueryArgsParser(CommonParser):
             )
             equalized_dataframes = self.equalize_dataframe_rows(
                 dataframes=final_df_list,
-                dimensions=dimensions_headers,
+                dimensions=list(query_args.group_by_columns),
             )
             return equalized_dataframes
 
@@ -493,7 +493,7 @@ class FbAdsQueryArgsParser(CommonParser):
                 exploded_df = summary_df.explode(metric.name)
 
                 # Normalize the dictionary in 'metric column to separate columns
-                normalized_df = pd.json_normalize(exploded_df[metric.name])
+                normalized_df = pd.json_normalize(exploded_df[metric.name].tolist())
 
                 # Identify overlapping columns
                 overlapping_columns = list(

findly/unified_reporting_sdk/data_sources/ga4/ga4_client.py

@@ -1,7 +1,6 @@
 import asyncio
 import backoff
 import json
-import pandas as pd
 from aiocache import cached, Cache
 from google.protobuf.json_format import ParseDict
 from google.analytics.data_v1beta import BetaAnalyticsDataAsyncClient
@@ -29,6 +28,10 @@ from google.analytics.data_v1beta.types import (
     CheckCompatibilityRequest,
     CheckCompatibilityResponse,
 )
+
+from findly.unified_reporting_sdk.data_sources.common.entities import (
+    ReportsClientQueryResult,
+)
 from findly.unified_reporting_sdk.protos.findly_semantic_layer_pb2 import (
     Dimension as DimensionProto,
 )
@@ -330,7 +333,7 @@ class GA4Client(ReportsClient):
         query_args: QueryArgs,
         property_id: str,
         **kwargs: str,
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         params = await GA4_PARSER.parse_query_args_to_request_params(
             query_args=query_args,
             property_id=property_id,
@@ -357,14 +360,17 @@ class GA4Client(ReportsClient):
         generated_totals_df = GA4_PARSER.parse_totals_to_dataframe(
             report_response=result,
         )
-        return generated_result_df, generated_totals_df
+
+        return ReportsClientQueryResult(
+            main_result=generated_result_df, totals_result=generated_totals_df
+        )
 
     async def query(
         self,
         query_args: QueryArgs,
         property_id: str,
         **kwargs: str,
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         return await self._decorated_query(
             query_args=query_args, property_id=property_id, **kwargs
         )

findly/unified_reporting_sdk/data_sources/ga4/ga4_query_args_parser.py

@@ -109,7 +109,7 @@ class GA4QueryArgsParser(CommonParser):
             date_range_indices = set([row[DATE_RANGE_HEADER] for row in rows])
 
             # Create a list of dataframes.
-            dataframes = []
+            dataframes_tuple: List[tuple[int, pd.DataFrame]] = []
             for date_range_index in date_range_indices:
                 # Create a dataframe with the rows that have the same date range index.
                 date_range_df = pd.DataFrame(
@@ -120,14 +120,14 @@ class GA4QueryArgsParser(CommonParser):
                 date_range_df = date_range_df.drop(columns=[DATE_RANGE_HEADER])
 
                 # Add the dataframe to the list of dataframes.
-                dataframes.append(
+                dataframes_tuple.append(
                     (int(str(date_range_index).split("_")[-1]), date_range_df)
                 )
             # Sort the dataframes based on the date range index.
-            dataframes.sort()
+            dataframes_tuple.sort()
 
             # Remove the date range index from the tuples.
-            dataframes = [df for _, df in dataframes]
+            dataframes: List[pd.DataFrame] = [df for _, df in dataframes_tuple]
 
             # remove DATE_RANGE_HEADER from the dimension headers.
             if DATE_RANGE_HEADER in dimension_headers:
@@ -196,7 +196,7 @@ class GA4QueryArgsParser(CommonParser):
             date_range_indices = set([row[DATE_RANGE_HEADER] for row in rows])
 
             # Create a list of dataframes.
-            dataframes = []
+            dataframes_tuple: List[tuple[int, pd.DataFrame]] = []
             for date_range_index in date_range_indices:
                 # Create a dataframe with the rows that have the same date range index.
                 date_range_df = pd.DataFrame(
@@ -207,14 +207,14 @@ class GA4QueryArgsParser(CommonParser):
                 date_range_df = date_range_df.drop(columns=[DATE_RANGE_HEADER])
 
                 # Add the dataframe to the list of dataframes.
-                dataframes.append(
+                dataframes_tuple.append(
                     (int(str(date_range_index).split("_")[-1]), date_range_df)
                 )
             # Sort the dataframes based on the date range index.
-            dataframes.sort()
+            dataframes_tuple.sort()
 
             # Remove the date range index from the tuples.
-            dataframes = [df for _, df in dataframes]
+            dataframes: List[pd.DataFrame] = [df for _, df in dataframes_tuple]
 
             # remove DATE_RANGE_HEADER from the dimension headers.
             if DATE_RANGE_HEADER in dimension_headers:

findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: findly_semantic_layer.proto
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,37 +15,37 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66indly_semantic_layer.proto\x12\x15\x66indly_semantic_layer\"\xd4\x02\n\tDimension\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x03 \x01(\t\x12\x32\n\x04type\x18\x04 \x01(\x0e\x32$.findly_semantic_layer.DimensionType\x12?\n\x0btype_params\x18\x05 \x01(\x0b\x32*.findly_semantic_layer.DimensionTypeParams\x12\x14\n\x0ctop_n_values\x18\x06 \x03(\t\x12\x16\n\nvalue_type\x18\x07 \x01(\tB\x02\x18\x01\x12\x19\n\x11\x64\x61ta_source_names\x18\x08 \x03(\t\x12\x14\n\x0c\x64isplay_name\x18\t \x01(\t\x12\x42\n\x0fvalue_type_enum\x18\n \x01(\x0e\x32).findly_semantic_layer.DimensionValueType\"k\n\x13\x44imensionTypeParams\x12@\n\x10time_granularity\x18\x01 \x01(\x0e\x32&.findly_semantic_layer.DateGranularity\x12\x12\n\nis_primary\x18\x02 \x01(\x08\"\x8b\x03\n\x06Metric\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x12\n\nexpression\x18\x04 \x01(\t\x12\x18\n\x10view_id_of_table\x18\x05 \x01(\t\x12\x12\n\ntable_name\x18\x06 \x01(\t\x12\x10\n\x08measures\x18\x07 \x03(\t\x12\x11\n\tnumerator\x18\x08 \x01(\t\x12\x13\n\x0b\x64\x65nominator\x18\t \x01(\t\x12/\n\x04type\x18\n \x01(\x0e\x32!.findly_semantic_layer.MetricType\x12\x10\n\x06window\x18\x0b \x01(\tH\x00\x12\x17\n\rgrain_to_date\x18\x0c \x01(\tH\x00\x12:\n\nvalue_type\x18\r \x01(\x0e\x32&.findly_semantic_layer.MetricValueType\x12\x14\n\x0c\x64isplay_name\x18\x0e \x01(\t\x12\x12\n\nis_numeric\x18\x0f \x01(\x08\x42\x14\n\x12\x63umulative_process\"4\n\x0c\x44\x61teStrRange\x12\x12\n\nstart_date\x18\x01 \x01(\t\x12\x10\n\x08\x65nd_date\x18\x02 \x01(\t\"\xf4\x02\n\tQueryArgs\x12\x14\n\x0cwhere_clause\x18\x01 \x01(\t\x12\x18\n\x10group_by_columns\x18\x02 \x03(\t\x12\x1a\n\x12metrics_expression\x18\x03 \x03(\t\x12\r\n\x05limit\x18\x04 \x01(\t\x12\x10\n\x08order_by\x18\x05 \x03(\t\x12\x19\n\x11\x64\x61te_where_clause\x18\x06 \x01(\t\x12\x0f\n\x07metrics\x18\x07 \x03(\t\x12\x15\n\rhaving_clause\x18\x08 \x01(\t\x12\x1c\n\x14incompatible_metrics\x18\t \x03(\t\x12\x1f\n\x17incompatible_dimensions\x18\n \x03(\t\x12\x38\n\x0b\x64\x61te_ranges\x18\x0b \x03(\x0b\x32#.findly_semantic_layer.DateStrRange\x12\x17\n\x0fsql_explanation\x18\x0c \x01(\t\x12\r\n\x05level\x18\r \x01(\t\x12\x16\n\x0etime_increment\x18\x0e \x01(\t\"\x80\x01\n\x12\x44\x61tasourceMetadata\x12>\n\x08location\x18\x01 \x01(\x0e\x32,.findly_semantic_layer.DataSourceIntegration\x12\x13\n\x0bproperty_id\x18\x02 \x01(\t\x12\x15\n\rproperty_name\x18\x03 \x01(\t*b\n\x15\x44\x61taSourceIntegration\x12 \n\x1c\x44\x41TA_SOURCE_LOCATION_UNKNOWN\x10\x00\x12\x12\n\x0eSEMANTIC_LAYER\x10\x01\x12\x07\n\x03GA4\x10\x02\x12\n\n\x06\x46\x42_ADS\x10\x03*S\n\x0f\x44\x61teGranularity\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x44\x41Y\x10\x01\x12\x08\n\x04WEEK\x10\x02\x12\t\n\x05MONTH\x10\x03\x12\x0b\n\x07QUARTER\x10\x04\x12\x08\n\x04YEAR\x10\x05*\x7f\n\x0b\x41ggregation\x12\x17\n\x13\x41GGREGATION_UNKNOWN\x10\x00\x12\x07\n\x03SUM\x10\x01\x12\x0f\n\x0bSUM_BOOLEAN\x10\x02\x12\x12\n\x0e\x43OUNT_DISTINCT\x10\x03\x12\x07\n\x03MIN\x10\x04\x12\x07\n\x03MAX\x10\x05\x12\x0b\n\x07\x41VERAGE\x10\x06\x12\n\n\x06MEDIAN\x10\x07*\xab\x01\n\rDimensionType\x12\x15\n\x11\x44IMENSION_UNKNOWN\x10\x00\x12\x0f\n\x0b\x43\x41TEGORICAL\x10\x01\x12\x08\n\x04TIME\x10\x02\x12\x10\n\x0c\x46\x42_ADS_FIELD\x10\x03\x12\x14\n\x10\x46\x42_ADS_BREAKDOWN\x10\x04\x12\x1b\n\x17\x46\x42_ADS_ACTION_BREAKDOWN\x10\x05\x12#\n\x1f\x46\x42_ADS_SUMMARY_ACTION_BREAKDOWN\x10\x06*\x84\x01\n\x12\x44imensionValueType\x12\x16\n\x12VALUE_TYPE_UNKNOWN\x10\x00\x12\n\n\x06STRING\x10\x01\x12\x0b\n\x07INTEGER\x10\x02\x12\t\n\x05\x46LOAT\x10\x03\x12\x0b\n\x07\x42OOLEAN\x10\x04\x12\x08\n\x04\x44\x41TE\x10\x05\x12\x0c\n\x08\x44\x41TETIME\x10\x06\x12\r\n\tTIMESTAMP\x10\x07*o\n\nMetricType\x12\x12\n\x0eMETRIC_UNKNOWN\x10\x00\x12\x11\n\rMEASURE_PROXY\x10\x01\x12\x0e\n\nCUMULATIVE\x10\x02\x12\t\n\x05RATIO\x10\x03\x12\x0b\n\x07\x44\x45RIVED\x10\x04\x12\x12\n\x0eSQL_EXPRESSION\x10\x05*\xf9\x04\n\x0fMetricValueType\x12\x1d\n\x19METRIC_VALUE_TYPE_UNKNOWN\x10\x00\x12\x1d\n\x19METRIC_VALUE_TYPE_INTEGER\x10\x01\x12\x1b\n\x17METRIC_VALUE_TYPE_FLOAT\x10\x02\x12\x1d\n\x19METRIC_VALUE_TYPE_SECONDS\x10\x03\x12\"\n\x1eMETRIC_VALUE_TYPE_MILLISECONDS\x10\x04\x12\x1d\n\x19METRIC_VALUE_TYPE_MINUTES\x10\x05\x12\x1b\n\x17METRIC_VALUE_TYPE_HOURS\x10\x06\x12\x1e\n\x1aMETRIC_VALUE_TYPE_STANDARD\x10\x07\x12\x1e\n\x1aMETRIC_VALUE_TYPE_CURRENCY\x10\x08\x12\x1a\n\x16METRIC_VALUE_TYPE_FEET\x10\t\x12\x1b\n\x17METRIC_VALUE_TYPE_MILES\x10\n\x12\x1c\n\x18METRIC_VALUE_TYPE_METERS\x10\x0b\x12 \n\x1cMETRIC_VALUE_TYPE_KILOMETERS\x10\x0c\x12\x1c\n\x18METRIC_VALUE_TYPE_STRING\x10\r\x12$\n METRIC_VALUE_TYPE_NUMERIC_STRING\x10\x0e\x12+\n\'METRIC_VALUE_TYPE_LIST_ADS_ACTION_STATS\x10\x0f\x12\x32\n.METRIC_VALUE_TYPE_LIST_ADS_INSIGHTS_DDA_RESULT\x10\x10\x12.\n*METRIC_VALUE_TYPE_LIST_ADS_HISTOGRAM_STATS\x10\x11\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'findly_semantic_layer_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'findly_semantic_layer_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
   DESCRIPTOR._options = None
-  _DIMENSION.fields_by_name['value_type']._options = None
-  _DIMENSION.fields_by_name['value_type']._serialized_options = b'\030\001'
-  _DATASOURCEINTEGRATION._serialized_start=1464
-  _DATASOURCEINTEGRATION._serialized_end=1562
-  _DATEGRANULARITY._serialized_start=1564
-  _DATEGRANULARITY._serialized_end=1647
-  _AGGREGATION._serialized_start=1649
-  _AGGREGATION._serialized_end=1776
-  _DIMENSIONTYPE._serialized_start=1779
-  _DIMENSIONTYPE._serialized_end=1950
-  _DIMENSIONVALUETYPE._serialized_start=1953
-  _DIMENSIONVALUETYPE._serialized_end=2085
-  _METRICTYPE._serialized_start=2087
-  _METRICTYPE._serialized_end=2198
-  _METRICVALUETYPE._serialized_start=2201
-  _METRICVALUETYPE._serialized_end=2834
-  _DIMENSION._serialized_start=55
-  _DIMENSION._serialized_end=395
-  _DIMENSIONTYPEPARAMS._serialized_start=397
-  _DIMENSIONTYPEPARAMS._serialized_end=504
-  _METRIC._serialized_start=507
-  _METRIC._serialized_end=902
-  _DATESTRRANGE._serialized_start=904
-  _DATESTRRANGE._serialized_end=956
-  _QUERYARGS._serialized_start=959
-  _QUERYARGS._serialized_end=1331
-  _DATASOURCEMETADATA._serialized_start=1334
-  _DATASOURCEMETADATA._serialized_end=1462
+  _globals['_DIMENSION'].fields_by_name['value_type']._options = None
+  _globals['_DIMENSION'].fields_by_name['value_type']._serialized_options = b'\030\001'
+  _globals['_DATASOURCEINTEGRATION']._serialized_start=1464
+  _globals['_DATASOURCEINTEGRATION']._serialized_end=1562
+  _globals['_DATEGRANULARITY']._serialized_start=1564
+  _globals['_DATEGRANULARITY']._serialized_end=1647
+  _globals['_AGGREGATION']._serialized_start=1649
+  _globals['_AGGREGATION']._serialized_end=1776
+  _globals['_DIMENSIONTYPE']._serialized_start=1779
+  _globals['_DIMENSIONTYPE']._serialized_end=1950
+  _globals['_DIMENSIONVALUETYPE']._serialized_start=1953
+  _globals['_DIMENSIONVALUETYPE']._serialized_end=2085
+  _globals['_METRICTYPE']._serialized_start=2087
+  _globals['_METRICTYPE']._serialized_end=2198
+  _globals['_METRICVALUETYPE']._serialized_start=2201
+  _globals['_METRICVALUETYPE']._serialized_end=2834
+  _globals['_DIMENSION']._serialized_start=55
+  _globals['_DIMENSION']._serialized_end=395
+  _globals['_DIMENSIONTYPEPARAMS']._serialized_start=397
+  _globals['_DIMENSIONTYPEPARAMS']._serialized_end=504
+  _globals['_METRIC']._serialized_start=507
+  _globals['_METRIC']._serialized_end=902
+  _globals['_DATESTRRANGE']._serialized_start=904
+  _globals['_DATESTRRANGE']._serialized_end=956
+  _globals['_QUERYARGS']._serialized_start=959
+  _globals['_QUERYARGS']._serialized_end=1331
+  _globals['_DATASOURCEMETADATA']._serialized_start=1334
+  _globals['_DATASOURCEMETADATA']._serialized_end=1462
 # @@protoc_insertion_point(module_scope)

findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi

@@ -2,7 +2,6 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-
 import builtins
 import collections.abc
 import google.protobuf.descriptor
@@ -287,7 +286,7 @@ METRIC_VALUE_TYPE_LIST_ADS_INSIGHTS_DDA_RESULT: MetricValueType.ValueType  # 16
 METRIC_VALUE_TYPE_LIST_ADS_HISTOGRAM_STATS: MetricValueType.ValueType  # 17
 global___MetricValueType = MetricValueType
 
-@typing.final
+@typing_extensions.final
 class Dimension(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -313,25 +312,22 @@ class Dimension(google.protobuf.message.Message):
     """
     type: global___DimensionType.ValueType
     """The type of the dimension, e.g. CATEGORICAL or TIME."""
-    value_type: builtins.str
-    """The type of the values of the dimension, e.g. STRING, INTEGER, FLOAT, etc.
-    Prefer to use the value_type_enum field
-    """
-    display_name: builtins.str
-    """The display name."""
-    value_type_enum: global___DimensionValueType.ValueType
     @property
     def type_params(self) -> global___DimensionTypeParams:
         """The parameters of the dimension type."""
-
     @property
     def top_n_values(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """The top n values of the dimension."""
-
+    value_type: builtins.str
+    """The type of the values of the dimension, e.g. STRING, INTEGER, FLOAT, etc.
+    Prefer to use the value_type_enum field
+    """
     @property
     def data_source_names(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """The data source names that the dimension is available in."""
-
+    display_name: builtins.str
+    """The display name."""
+    value_type_enum: global___DimensionValueType.ValueType
     def __init__(
         self,
         *,
@@ -346,12 +342,12 @@ class Dimension(google.protobuf.message.Message):
         display_name: builtins.str = ...,
         value_type_enum: global___DimensionValueType.ValueType = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["type_params", b"type_params"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["data_source_names", b"data_source_names", "description", b"description", "display_name", b"display_name", "expr", b"expr", "name", b"name", "top_n_values", b"top_n_values", "type", b"type", "type_params", b"type_params", "value_type", b"value_type", "value_type_enum", b"value_type_enum"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["type_params", b"type_params"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["data_source_names", b"data_source_names", "description", b"description", "display_name", b"display_name", "expr", b"expr", "name", b"name", "top_n_values", b"top_n_values", "type", b"type", "type_params", b"type_params", "value_type", b"value_type", "value_type_enum", b"value_type_enum"]) -> None: ...
 
 global___Dimension = Dimension
 
-@typing.final
+@typing_extensions.final
 class DimensionTypeParams(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -369,11 +365,11 @@ class DimensionTypeParams(google.protobuf.message.Message):
         time_granularity: global___DateGranularity.ValueType = ...,
         is_primary: builtins.bool = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["is_primary", b"is_primary", "time_granularity", b"time_granularity"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["is_primary", b"is_primary", "time_granularity", b"time_granularity"]) -> None: ...
 
 global___DimensionTypeParams = DimensionTypeParams
 
-@typing.final
+@typing_extensions.final
 class Metric(google.protobuf.message.Message):
     """Parameters that are associated with metrics include:
 
@@ -419,6 +415,13 @@ class Metric(google.protobuf.message.Message):
     """The id of the table view that the metric is defined on."""
     table_name: builtins.str
     """The name of the table view that the metric is defined on."""
+    @property
+    def measures(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
+        """The measures of the metric.
+        If type is MEASURE_PROXY, then this should be a list of exactly one measure.
+        It should be included only measures that are defined in a data source.
+        Two metrics of type MEASURE_PROXY cannot refer to the same measure.
+        """
     numerator: builtins.str
     """Numerator and denominator are only used if type is RATIO. Don't use identifiers as numerator or denominator.
     It should be included only measures that are defined in a data source.
@@ -443,14 +446,6 @@ class Metric(google.protobuf.message.Message):
     display_name: builtins.str
     is_numeric: builtins.bool
     """If the metric is numeric or not."""
-    @property
-    def measures(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
-        """The measures of the metric.
-        If type is MEASURE_PROXY, then this should be a list of exactly one measure.
-        It should be included only measures that are defined in a data source.
-        Two metrics of type MEASURE_PROXY cannot refer to the same measure.
-        """
-
     def __init__(
         self,
         *,
@@ -470,13 +465,13 @@ class Metric(google.protobuf.message.Message):
         display_name: builtins.str = ...,
         is_numeric: builtins.bool = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["cumulative_process", b"cumulative_process", "grain_to_date", b"grain_to_date", "window", b"window"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["cumulative_process", b"cumulative_process", "denominator", b"denominator", "description", b"description", "display_name", b"display_name", "expression", b"expression", "grain_to_date", b"grain_to_date", "id", b"id", "is_numeric", b"is_numeric", "measures", b"measures", "name", b"name", "numerator", b"numerator", "table_name", b"table_name", "type", b"type", "value_type", b"value_type", "view_id_of_table", b"view_id_of_table", "window", b"window"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["cumulative_process", b"cumulative_process"]) -> typing.Literal["window", "grain_to_date"] | None: ...
+    def HasField(self, field_name: typing_extensions.Literal["cumulative_process", b"cumulative_process", "grain_to_date", b"grain_to_date", "window", b"window"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["cumulative_process", b"cumulative_process", "denominator", b"denominator", "description", b"description", "display_name", b"display_name", "expression", b"expression", "grain_to_date", b"grain_to_date", "id", b"id", "is_numeric", b"is_numeric", "measures", b"measures", "name", b"name", "numerator", b"numerator", "table_name", b"table_name", "type", b"type", "value_type", b"value_type", "view_id_of_table", b"view_id_of_table", "window", b"window"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["cumulative_process", b"cumulative_process"]) -> typing_extensions.Literal["window", "grain_to_date"] | None: ...
 
 global___Metric = Metric
 
-@typing.final
+@typing_extensions.final
 class DateStrRange(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -492,11 +487,11 @@ class DateStrRange(google.protobuf.message.Message):
         start_date: builtins.str = ...,
         end_date: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["end_date", b"end_date", "start_date", b"start_date"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["end_date", b"end_date", "start_date", b"start_date"]) -> None: ...
 
 global___DateStrRange = DateStrRange
 
-@typing.final
+@typing_extensions.final
 class QueryArgs(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -516,45 +511,38 @@ class QueryArgs(google.protobuf.message.Message):
     TIME_INCREMENT_FIELD_NUMBER: builtins.int
     where_clause: builtins.str
     """This is the where clause of the generated sql."""
-    limit: builtins.str
-    """This is the LIMIT clause of the generated sql."""
-    date_where_clause: builtins.str
-    having_clause: builtins.str
-    sql_explanation: builtins.str
-    """The explanation of the generated sql."""
-    level: builtins.str
-    """level and time_increment are important info for Facebook Ads insights
-    https://developers.facebook.com/docs/marketing-api/reference/ad-account/insights/
-    """
-    time_increment: builtins.str
     @property
     def group_by_columns(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """This is the group by clause of the generated sql."""
-
     @property
     def metrics_expression(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """This is the metric expression of the generated sql."""
-
+    limit: builtins.str
+    """This is the LIMIT clause of the generated sql."""
     @property
     def order_by(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """Column names for ordering. Descending order is indicated by a prepended '-'."""
-
+    date_where_clause: builtins.str
     @property
     def metrics(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """The name of the metrics to be queried."""
-
+    having_clause: builtins.str
     @property
     def incompatible_metrics(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """The list of metrics selected by the pipeline, but are incompatible for the request."""
-
     @property
     def incompatible_dimensions(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """The list of dimensions selected by the pipeline, but are incompatible for the request."""
-
     @property
     def date_ranges(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DateStrRange]:
         """The date ranges to be queried."""
-
+    sql_explanation: builtins.str
+    """The explanation of the generated sql."""
+    level: builtins.str
+    """level and time_increment are important info for Facebook Ads insights
+    https://developers.facebook.com/docs/marketing-api/reference/ad-account/insights/
+    """
+    time_increment: builtins.str
     def __init__(
         self,
         *,
@@ -573,11 +561,11 @@ class QueryArgs(google.protobuf.message.Message):
         level: builtins.str = ...,
         time_increment: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["date_ranges", b"date_ranges", "date_where_clause", b"date_where_clause", "group_by_columns", b"group_by_columns", "having_clause", b"having_clause", "incompatible_dimensions", b"incompatible_dimensions", "incompatible_metrics", b"incompatible_metrics", "level", b"level", "limit", b"limit", "metrics", b"metrics", "metrics_expression", b"metrics_expression", "order_by", b"order_by", "sql_explanation", b"sql_explanation", "time_increment", b"time_increment", "where_clause", b"where_clause"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["date_ranges", b"date_ranges", "date_where_clause", b"date_where_clause", "group_by_columns", b"group_by_columns", "having_clause", b"having_clause", "incompatible_dimensions", b"incompatible_dimensions", "incompatible_metrics", b"incompatible_metrics", "level", b"level", "limit", b"limit", "metrics", b"metrics", "metrics_expression", b"metrics_expression", "order_by", b"order_by", "sql_explanation", b"sql_explanation", "time_increment", b"time_increment", "where_clause", b"where_clause"]) -> None: ...
 
 global___QueryArgs = QueryArgs
 
-@typing.final
+@typing_extensions.final
 class DatasourceMetadata(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -594,6 +582,6 @@ class DatasourceMetadata(google.protobuf.message.Message):
         property_id: builtins.str = ...,
         property_name: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["location", b"location", "property_id", b"property_id", "property_name", b"property_name"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["location", b"location", "property_id", b"property_id", "property_name", b"property_name"]) -> None: ...
 
 global___DatasourceMetadata = DatasourceMetadata

findly/unified_reporting_sdk/urs.py

@@ -1,10 +1,11 @@
+from typing import List, Optional, Any
+
 from findly.unified_reporting_sdk.data_sources.common.reports_client import (
     ReportsClient,
 )
-import logging
-import pandas as pd
-from typing import List, Tuple, Optional, Any
-
+from findly.unified_reporting_sdk.data_sources.common.entities import (
+    ReportsClientQueryResult,
+)
 from findly.unified_reporting_sdk.protos.findly_semantic_layer_pb2 import (
     Dimension,
     Metric,
@@ -44,7 +45,7 @@ class Urs(ReportsClient):
 
     async def query(
         self, query_args: QueryArgs, property_id: str, **kwargs: str
-    ) -> Optional[Tuple[List[pd.DataFrame], List[pd.DataFrame]]]:
+    ) -> Optional[ReportsClientQueryResult]:
         return await self._client.query(
             query_args=query_args, property_id=property_id, **kwargs
         )

{findly_unified_reporting_sdk-0.6.22.dist-info → findly_unified_reporting_sdk-0.7.1.dist-info}/METADATA

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

{findly_unified_reporting_sdk-0.6.22.dist-info → findly_unified_reporting_sdk-0.7.1.dist-info}/RECORD

@@ -2,33 +2,34 @@ findly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/__init__.py,sha256=1GE1LJq5zf-0fuObZtLXJN6RaxkeByKX3-bgEkzpi6I,342
 findly/unified_reporting_sdk/data_sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/data_sources/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-findly/unified_reporting_sdk/data_sources/common/common_parser.py,sha256=OymaK3T9U10ZiIpMqwYQv3ukvCmBu9ALgxS5zQmKpLY,7897
+findly/unified_reporting_sdk/data_sources/common/common_parser.py,sha256=3pT27dAsOMBUGuBL77hqtiAaNtvjsOUp5ndETGD8I3c,7828
 findly/unified_reporting_sdk/data_sources/common/date_range_helper.py,sha256=z2L1YU1Mzbybkl1wZK_mXL9lKFfG6CEomvlTfADD_80,971
-findly/unified_reporting_sdk/data_sources/common/reports_client.py,sha256=fCza94iwZz05QPr6B3mmsrvQQdymgD3CzMbvAYEOetw,3647
-findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py,sha256=0DgrMklgE-Lj2jBJO0GzWRdMlFd68CoDMYyTMBOy_g4,8302
+findly/unified_reporting_sdk/data_sources/common/entities.py,sha256=vz6V1KaZVqMpLghFOD-KaBGuTikt1rJFzfpkz53gBbU,243
+findly/unified_reporting_sdk/data_sources/common/reports_client.py,sha256=zvr6itv2MSV_O1zlhlgiHSWZNMyyjs-2OQG59aWMZLg,3628
+findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py,sha256=rraEwXe_bo0R1Fbq6-C_Ooz0_J5C0tr1VwHvajKWfsg,8298
 findly/unified_reporting_sdk/data_sources/fb_ads/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_client.py,sha256=hVrxsbf0DLoTka5B7DACBbcMeVEh4PRU_s8WZ8nlvFY,21913
-findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_query_args_parser.py,sha256=kM1ewN1bQqL_hTfbItkPGJenbwYeEpUXZEYnoTjTbDo,31949
+findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_client.py,sha256=K4Z6cIBNdQWBrD_NKT_QRz8-gJE7YnoOeZmxGhgUT8A,22004
+findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_query_args_parser.py,sha256=HY-p7gX2vn34UtFtQWDfhps0SJgNtg8Cz5LPW4yDsuQ,31982
 findly/unified_reporting_sdk/data_sources/fb_ads/metadata/action_breakdowns.csv,sha256=FUjp_e4aPnkKPIjCmEq4gOmSInFefAZQNsSs3-rRcLg,1492
 findly/unified_reporting_sdk/data_sources/fb_ads/metadata/breakdowns.csv,sha256=-i_hd5NAJjHkcfMboqemRmnAalZ4Z8TczNzeYuaFnsw,5778
 findly/unified_reporting_sdk/data_sources/fb_ads/metadata/dimensions.jsonl,sha256=066M3G-khDomEBN3BwE2wf5QVTZDucC7Cqr_77CZfN8,16133
 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=YbnLpfH9WNsHv4jJ8Ru7BkFz0GmONW-FpnUV-bwPZtk,38179
-findly/unified_reporting_sdk/data_sources/ga4/ga4_query_args_parser.py,sha256=j0PY267q9XOXNc2G0KvYPF1XKSXtJRxw0qMro6qFgXo,30180
+findly/unified_reporting_sdk/data_sources/ga4/ga4_client.py,sha256=xx2joP4BOObyNPxASjPO2mYuCsGwfYnAvcU_swp3KsI,38297
+findly/unified_reporting_sdk/data_sources/ga4/ga4_query_args_parser.py,sha256=I8iuEqWHUS_S6iXKEXRE1-RVWCOdb1HP11MyTS_fPag,30332
 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
 findly/unified_reporting_sdk/data_sources/gsc/gsc_client.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/data_sources/gsc/gsc_service.py,sha256=uWs9b5qNgmNaqBWml8tkTKGlE1RgXs6Hn8eNZ5fCnZg,1038
 findly/unified_reporting_sdk/protos/.gitignore,sha256=jyvVCY11J1OlOGM-nZCWKSR1vfO6fP65lnH65qf5W20,27
 findly/unified_reporting_sdk/protos/__init__.py,sha256=sfz7Yn3hvQrnhTfoZPGTbo0F1_Fw4X494wPSZojRajA,137
-findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.py,sha256=MugAV1tSmvX9bB3w_bS0i5d_aNqUZttJzH-vu1lspOs,6874
-findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=PmMDYAWRyTS3Uo7L1Zy9VQiTBSlfWDGekr7u4GbaE3w,30848
-findly/unified_reporting_sdk/urs.py,sha256=8um_pLJNOu1FGd0IO7XlNBIFAvGYD2nXnxiHMjkraKs,2915
+findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.py,sha256=1QkWH9LLhvbZPDH1HEX2nDblrwBJc3liKfckW93myew,7228
+findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=QwFz5TD5qW3eC7pVODIb8ystAHfHmRvk8Hyj4RzXwvM,31012
+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.6.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-findly_unified_reporting_sdk-0.6.22.dist-info/METADATA,sha256=HWKuw3LoXhUAb7-15610if6rNIY0zM-wCuBBKtRDsXE,3160
-findly_unified_reporting_sdk-0.6.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-findly_unified_reporting_sdk-0.6.22.dist-info/RECORD,,
+findly_unified_reporting_sdk-0.7.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+findly_unified_reporting_sdk-0.7.1.dist-info/METADATA,sha256=2TPLRnZFIBNXP9E1H7w--htXoHTjJ9qz7rPlDtgwtHY,3159
+findly_unified_reporting_sdk-0.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+findly_unified_reporting_sdk-0.7.1.dist-info/RECORD,,