findly.unified-reporting-sdk 0.7.14__py3-none-any.whl → 0.7.16__py3-none-any.whl

findly/unified_reporting_sdk/data_sources/common/common_parser.py

@@ -2,6 +2,7 @@ import re
 import pandas as pd
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+import sqlglot
 
 from typing import List, Optional, Callable, Tuple, Any, TypedDict
 from findly.unified_reporting_sdk.protos.findly_semantic_layer_pb2 import (
@@ -16,6 +17,60 @@ from findly.unified_reporting_sdk.data_sources.common.date_range_helper import (
 NONE_VALUE = "none"
 RESERVED_TOTAL = "RESERVED_TOTAL"
 
+# Regex pattern for valid SQL identifiers
+_IDENTIFIER_PATTERN = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_]*$")
+# Regex pattern for ORDER BY column (identifier with optional ASC/DESC)
+_ORDER_BY_PATTERN = re.compile(r"^([a-zA-Z_][a-zA-Z0-9_]*)\s*(ASC|DESC)?$", re.IGNORECASE)
+# Regex pattern for YYYY-MM-DD date format
+_DATE_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}$")
+
+
+def _validate_identifier(name: str) -> str:
+    """Validate that a string is a safe SQL identifier."""
+    if not _IDENTIFIER_PATTERN.match(name):
+        raise ValueError(f"Invalid SQL identifier: {name!r}")
+    return name
+
+
+def _validate_order_by_column(col: str) -> str:
+    """Validate an ORDER BY column (identifier with optional ASC/DESC)."""
+    if not _ORDER_BY_PATTERN.match(col):
+        raise ValueError(f"Invalid ORDER BY column: {col!r}")
+    return col
+
+
+def _validate_date(date_str: str) -> str:
+    """Validate that a string is a valid YYYY-MM-DD date."""
+    if not _DATE_PATTERN.match(date_str):
+        raise ValueError(f"Invalid date format (expected YYYY-MM-DD): {date_str!r}")
+    return date_str
+
+
+def _validate_positive_integer(value: Any) -> int:
+    """Validate that a value is a positive integer."""
+    try:
+        int_value = int(value)
+    except (TypeError, ValueError) as e:
+        raise ValueError(f"Invalid integer value: {value!r}") from e
+    if int_value <= 0:
+        raise ValueError(f"Value must be positive: {int_value}")
+    return int_value
+
+
+def _validate_sql_clause(clause: str, clause_type: str) -> str:
+    """Validate a SQL clause (WHERE/HAVING) using sqlglot parsing."""
+    if not clause or not clause.strip():
+        raise ValueError(f"Empty {clause_type} clause")
+    # Wrap in a minimal SELECT statement to validate the clause
+    test_query = f"SELECT 1 FROM t {clause_type} {clause}"
+    try:
+        parsed = sqlglot.parse(test_query)
+        if not parsed or parsed[0] is None:
+            raise ValueError(f"Failed to parse {clause_type} clause: {clause!r}")
+    except sqlglot.errors.ParseError as e:
+        raise ValueError(f"Invalid {clause_type} clause: {clause!r}") from e
+    return clause
+
 
 class DefaultFormattedDateRange(TypedDict):
     since: str
@@ -102,17 +157,24 @@ class CommonParser:
 
         Returns:
             str: The SQL query generated from the QueryArgs object.
+
+        Raises:
+            ValueError: If any input fails validation.
         """
         query_parts = []
 
         select_parts = []
         # Metrics and Metrics Expression
         if query.metrics:
-            select_parts.append(", ".join(query.metrics))
+            validated_metrics = [_validate_identifier(m) for m in query.metrics]
+            select_parts.append(", ".join(validated_metrics))
         elif query.metrics_expression:
             select_parts.append(", ".join(query.metrics_expression))
         if query.group_by_columns:
-            select_parts.append(", ".join(query.group_by_columns))
+            validated_group_cols = [
+                _validate_identifier(col) for col in query.group_by_columns
+            ]
+            select_parts.append(", ".join(validated_group_cols))
         if len(select_parts) > 0:
             select_str = "SELECT " + ", ".join(select_parts)
             query_parts.append(select_str)
@@ -123,13 +185,14 @@ class CommonParser:
             where_clause_modified = re.sub(
                 r"\bwhere\b", "", query.where_clause, flags=re.IGNORECASE
             ).strip()
+            _validate_sql_clause(where_clause_modified, "WHERE")
             conditions.append(f"WHERE {where_clause_modified}")
 
         # Date Where clause
         if query.date_ranges:
             for date_range in list(query.date_ranges):
-                start_date = date_range.start_date
-                end_date = date_range.end_date
+                start_date = _validate_date(date_range.start_date)
+                end_date = _validate_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
@@ -143,7 +206,10 @@ class CommonParser:
 
         # Group By
         if query.group_by_columns:
-            group_by_str = ", ".join(query.group_by_columns)
+            validated_group_cols = [
+                _validate_identifier(col) for col in query.group_by_columns
+            ]
+            group_by_str = ", ".join(validated_group_cols)
             query_parts.append(f"GROUP BY {group_by_str}")
 
         # Having
@@ -151,16 +217,21 @@ class CommonParser:
             having_clause_modified = re.sub(
                 r"\bhaving\b", "", query.having_clause, flags=re.IGNORECASE
             ).strip()
+            _validate_sql_clause(having_clause_modified, "HAVING")
             query_parts.append(f"HAVING {having_clause_modified}")
 
         # Order By
         if query.order_by:
-            order_by_str = ", ".join(query.order_by)
+            validated_order_cols = [
+                _validate_order_by_column(col) for col in query.order_by
+            ]
+            order_by_str = ", ".join(validated_order_cols)
             query_parts.append(f"ORDER BY {order_by_str}")
 
         # Limit
         if query.limit:
-            query_parts.append(f"LIMIT {query.limit}")
+            validated_limit = _validate_positive_integer(query.limit)
+            query_parts.append(f"LIMIT {validated_limit}")
 
         return "\n".join(query_parts)
 

findly/unified_reporting_sdk/protos/.gitignore

@@ -1,3 +1 @@
-*
-!.gitignore
-!__init__.py
+__pycache__/

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\"\x93\x03\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\x12\x1d\n\x15main_data_source_name\x18\x0f \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')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'findly_semantic_layer_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'findly_semantic_layer_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  _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=1495
-  _globals['_DATASOURCEINTEGRATION']._serialized_end=1593
-  _globals['_DATEGRANULARITY']._serialized_start=1595
-  _globals['_DATEGRANULARITY']._serialized_end=1678
-  _globals['_AGGREGATION']._serialized_start=1680
-  _globals['_AGGREGATION']._serialized_end=1807
-  _globals['_DIMENSIONTYPE']._serialized_start=1810
-  _globals['_DIMENSIONTYPE']._serialized_end=1981
-  _globals['_DIMENSIONVALUETYPE']._serialized_start=1984
-  _globals['_DIMENSIONVALUETYPE']._serialized_end=2116
-  _globals['_METRICTYPE']._serialized_start=2118
-  _globals['_METRICTYPE']._serialized_end=2229
-  _globals['_METRICVALUETYPE']._serialized_start=2232
-  _globals['_METRICVALUETYPE']._serialized_end=2865
-  _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=1362
-  _globals['_DATASOURCEMETADATA']._serialized_start=1365
-  _globals['_DATASOURCEMETADATA']._serialized_end=1493
+  _DIMENSION.fields_by_name['value_type']._options = None
+  _DIMENSION.fields_by_name['value_type']._serialized_options = b'\030\001'
+  _DATASOURCEINTEGRATION._serialized_start=1495
+  _DATASOURCEINTEGRATION._serialized_end=1593
+  _DATEGRANULARITY._serialized_start=1595
+  _DATEGRANULARITY._serialized_end=1678
+  _AGGREGATION._serialized_start=1680
+  _AGGREGATION._serialized_end=1807
+  _DIMENSIONTYPE._serialized_start=1810
+  _DIMENSIONTYPE._serialized_end=1981
+  _DIMENSIONVALUETYPE._serialized_start=1984
+  _DIMENSIONVALUETYPE._serialized_end=2116
+  _METRICTYPE._serialized_start=2118
+  _METRICTYPE._serialized_end=2229
+  _METRICVALUETYPE._serialized_start=2232
+  _METRICVALUETYPE._serialized_end=2865
+  _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=1362
+  _DATASOURCEMETADATA._serialized_start=1365
+  _DATASOURCEMETADATA._serialized_end=1493
 # @@protoc_insertion_point(module_scope)

findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi

@@ -36,7 +36,7 @@ DATA_SOURCE_LOCATION_UNKNOWN: DataSourceIntegration.ValueType  # 0
 SEMANTIC_LAYER: DataSourceIntegration.ValueType  # 1
 GA4: DataSourceIntegration.ValueType  # 2
 FB_ADS: DataSourceIntegration.ValueType  # 3
-global___DataSourceIntegration = DataSourceIntegration
+Global___DataSourceIntegration: typing_extensions.TypeAlias = DataSourceIntegration
 
 class _DateGranularity:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -59,7 +59,7 @@ WEEK: DateGranularity.ValueType  # 2
 MONTH: DateGranularity.ValueType  # 3
 QUARTER: DateGranularity.ValueType  # 4
 YEAR: DateGranularity.ValueType  # 5
-global___DateGranularity = DateGranularity
+Global___DateGranularity: typing_extensions.TypeAlias = DateGranularity
 
 class _Aggregation:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -86,7 +86,7 @@ MIN: Aggregation.ValueType  # 4
 MAX: Aggregation.ValueType  # 5
 AVERAGE: Aggregation.ValueType  # 6
 MEDIAN: Aggregation.ValueType  # 7
-global___Aggregation = Aggregation
+Global___Aggregation: typing_extensions.TypeAlias = Aggregation
 
 class _DimensionType:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -125,7 +125,7 @@ FB_ADS_FIELD: DimensionType.ValueType  # 3
 FB_ADS_BREAKDOWN: DimensionType.ValueType  # 4
 FB_ADS_ACTION_BREAKDOWN: DimensionType.ValueType  # 5
 FB_ADS_SUMMARY_ACTION_BREAKDOWN: DimensionType.ValueType  # 6
-global___DimensionType = DimensionType
+Global___DimensionType: typing_extensions.TypeAlias = DimensionType
 
 class _DimensionValueType:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -152,7 +152,7 @@ BOOLEAN: DimensionValueType.ValueType  # 4
 DATE: DimensionValueType.ValueType  # 5
 DATETIME: DimensionValueType.ValueType  # 6
 TIMESTAMP: DimensionValueType.ValueType  # 7
-global___DimensionValueType = DimensionValueType
+Global___DimensionValueType: typing_extensions.TypeAlias = DimensionValueType
 
 class _MetricType:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -204,7 +204,7 @@ Note that if an optional constraint string is applied, the constraint is applied
 DERIVED: MetricType.ValueType  # 4
 SQL_EXPRESSION: MetricType.ValueType  # 5
 """When you are building a metric that involves a SQL expression of multiple measures, you can use an expression metric."""
-global___MetricType = MetricType
+Global___MetricType: typing_extensions.TypeAlias = MetricType
 
 class _MetricValueType:
     ValueType = typing.NewType("ValueType", builtins.int)
@@ -285,7 +285,7 @@ METRIC_VALUE_TYPE_LIST_ADS_ACTION_STATS: MetricValueType.ValueType  # 15
 """A single action for a Statistics result -> https://github.com/facebook/facebook-python-business-sdk/blob/main/facebook_business/adobjects/adsactionstats.py"""
 METRIC_VALUE_TYPE_LIST_ADS_INSIGHTS_DDA_RESULT: MetricValueType.ValueType  # 16
 METRIC_VALUE_TYPE_LIST_ADS_HISTOGRAM_STATS: MetricValueType.ValueType  # 17
-global___MetricValueType = MetricValueType
+Global___MetricValueType: typing_extensions.TypeAlias = MetricValueType
 
 @typing.final
 class Dimension(google.protobuf.message.Message):
@@ -311,7 +311,7 @@ class Dimension(google.protobuf.message.Message):
     And we want to define a date range of interest for our queries
     Use DATE_TRUNC(CAST(dimension.name, DATETIME), DateGranularity) to ensure we can use WHERE date range correctly
     """
-    type: global___DimensionType.ValueType
+    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.
@@ -319,9 +319,9 @@ class Dimension(google.protobuf.message.Message):
     """
     display_name: builtins.str
     """The display name."""
-    value_type_enum: global___DimensionValueType.ValueType
+    value_type_enum: Global___DimensionValueType.ValueType
     @property
-    def type_params(self) -> global___DimensionTypeParams:
+    def type_params(self) -> Global___DimensionTypeParams:
         """The parameters of the dimension type."""
 
     @property
@@ -338,18 +338,18 @@ class Dimension(google.protobuf.message.Message):
         name: builtins.str = ...,
         description: builtins.str = ...,
         expr: builtins.str = ...,
-        type: global___DimensionType.ValueType = ...,
-        type_params: global___DimensionTypeParams | None = ...,
+        type: Global___DimensionType.ValueType = ...,
+        type_params: Global___DimensionTypeParams | None = ...,
         top_n_values: collections.abc.Iterable[builtins.str] | None = ...,
         value_type: builtins.str = ...,
         data_source_names: collections.abc.Iterable[builtins.str] | None = ...,
         display_name: builtins.str = ...,
-        value_type_enum: global___DimensionValueType.ValueType = ...,
+        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: ...
 
-global___Dimension = Dimension
+Global___Dimension: typing_extensions.TypeAlias = Dimension
 
 @typing.final
 class DimensionTypeParams(google.protobuf.message.Message):
@@ -357,7 +357,7 @@ class DimensionTypeParams(google.protobuf.message.Message):
 
     TIME_GRANULARITY_FIELD_NUMBER: builtins.int
     IS_PRIMARY_FIELD_NUMBER: builtins.int
-    time_granularity: global___DateGranularity.ValueType
+    time_granularity: Global___DateGranularity.ValueType
     """The date granularity of the dimension if it is a time dimension."""
     is_primary: builtins.bool
     """Note for Time dimensions: For data sources with a measure involved, a primary time dimension is required (notice the is_primary: True parameter).
@@ -366,12 +366,12 @@ class DimensionTypeParams(google.protobuf.message.Message):
     def __init__(
         self,
         *,
-        time_granularity: global___DateGranularity.ValueType = ...,
+        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: ...
 
-global___DimensionTypeParams = DimensionTypeParams
+Global___DimensionTypeParams: typing_extensions.TypeAlias = DimensionTypeParams
 
 @typing.final
 class Metric(google.protobuf.message.Message):
@@ -428,7 +428,7 @@ class Metric(google.protobuf.message.Message):
     """
     denominator: builtins.str
     """The denominator of the metric if it is a ratio metric. It should be a measure."""
-    type: global___MetricType.ValueType
+    type: Global___MetricType.ValueType
     """The type of the metric, e.g. MEASURE_PROXY, CUMULATIVE, RATIO, etc.
     If the type is MEASURE_PROXY, the name of the metric must match the measure name in the expression
     """
@@ -436,7 +436,7 @@ class Metric(google.protobuf.message.Message):
     """The window of the metric if it is a cumulative metric."""
     grain_to_date: builtins.str
     """The grain of the metric if it is a cumulative metric."""
-    value_type: global___MetricValueType.ValueType
+    value_type: Global___MetricValueType.ValueType
     """The value type of the metric, e.g. INTEGER, FLOAT, etc.
     Always set this field to METRIC_VALUE_TYPE_UNKNOWN = 0
     """
@@ -463,10 +463,10 @@ class Metric(google.protobuf.message.Message):
         measures: collections.abc.Iterable[builtins.str] | None = ...,
         numerator: builtins.str = ...,
         denominator: builtins.str = ...,
-        type: global___MetricType.ValueType = ...,
+        type: Global___MetricType.ValueType = ...,
         window: builtins.str = ...,
         grain_to_date: builtins.str = ...,
-        value_type: global___MetricValueType.ValueType = ...,
+        value_type: Global___MetricValueType.ValueType = ...,
         display_name: builtins.str = ...,
         is_numeric: builtins.bool = ...,
     ) -> None: ...
@@ -474,7 +474,7 @@ class Metric(google.protobuf.message.Message):
     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: ...
 
-global___Metric = Metric
+Global___Metric: typing_extensions.TypeAlias = Metric
 
 @typing.final
 class DateStrRange(google.protobuf.message.Message):
@@ -494,7 +494,7 @@ class DateStrRange(google.protobuf.message.Message):
     ) -> None: ...
     def ClearField(self, field_name: typing.Literal["end_date", b"end_date", "start_date", b"start_date"]) -> None: ...
 
-global___DateStrRange = DateStrRange
+Global___DateStrRange: typing_extensions.TypeAlias = DateStrRange
 
 @typing.final
 class QueryArgs(google.protobuf.message.Message):
@@ -554,7 +554,7 @@ class QueryArgs(google.protobuf.message.Message):
         """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]:
+    def date_ranges(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[Global___DateStrRange]:
         """The date ranges to be queried."""
 
     def __init__(
@@ -570,7 +570,7 @@ class QueryArgs(google.protobuf.message.Message):
         having_clause: builtins.str = ...,
         incompatible_metrics: collections.abc.Iterable[builtins.str] | None = ...,
         incompatible_dimensions: collections.abc.Iterable[builtins.str] | None = ...,
-        date_ranges: collections.abc.Iterable[global___DateStrRange] | None = ...,
+        date_ranges: collections.abc.Iterable[Global___DateStrRange] | None = ...,
         sql_explanation: builtins.str = ...,
         level: builtins.str = ...,
         time_increment: builtins.str = ...,
@@ -578,7 +578,7 @@ class QueryArgs(google.protobuf.message.Message):
     ) -> 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", "main_data_source_name", b"main_data_source_name", "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
+Global___QueryArgs: typing_extensions.TypeAlias = QueryArgs
 
 @typing.final
 class DatasourceMetadata(google.protobuf.message.Message):
@@ -587,16 +587,16 @@ class DatasourceMetadata(google.protobuf.message.Message):
     LOCATION_FIELD_NUMBER: builtins.int
     PROPERTY_ID_FIELD_NUMBER: builtins.int
     PROPERTY_NAME_FIELD_NUMBER: builtins.int
-    location: global___DataSourceIntegration.ValueType
+    location: Global___DataSourceIntegration.ValueType
     property_id: builtins.str
     property_name: builtins.str
     def __init__(
         self,
         *,
-        location: global___DataSourceIntegration.ValueType = ...,
+        location: Global___DataSourceIntegration.ValueType = ...,
         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: ...
 
-global___DatasourceMetadata = DatasourceMetadata
+Global___DatasourceMetadata: typing_extensions.TypeAlias = DatasourceMetadata

{findly_unified_reporting_sdk-0.7.14.dist-info → findly_unified_reporting_sdk-0.7.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: findly.unified-reporting-sdk
-Version: 0.7.14
+Version: 0.7.16
 Summary: 
 License: GPL-3.0-only
 Requires-Python: >=3.9,<4.0
@@ -17,9 +17,8 @@ Requires-Dist: facebook-business (>=22.0.5,<23.0.0)
 Requires-Dist: google-analytics-admin (>=0.24.0,<0.25.0)
 Requires-Dist: google-analytics-data (>=0.18.18,<0.19.0)
 Requires-Dist: google-api-python-client (>=2.169.0,<3.0.0)
-Requires-Dist: oauth2client (>=4.1.3,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
-Requires-Dist: protobuf (>=4.25.3,<5.0.0)
+Requires-Dist: protobuf (>=6.33.5,<7.0.0)
 Requires-Dist: sqlglot (>=26.17.1,<27.0.0)
 Description-Content-Type: text/markdown
 

{findly_unified_reporting_sdk-0.7.14.dist-info → findly_unified_reporting_sdk-0.7.16.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=76yLDRQkSuf0UyxmadPTZ8qvgOnMeSZNvsd4lygnx34,7866
+findly/unified_reporting_sdk/data_sources/common/common_parser.py,sha256=mT5oOTjVMvtKuv7U-Kasp00fNwRqokfQQEKuCSL9r70,10779
 findly/unified_reporting_sdk/data_sources/common/date_range_helper.py,sha256=z2L1YU1Mzbybkl1wZK_mXL9lKFfG6CEomvlTfADD_80,971
 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
@@ -22,12 +22,12 @@ findly/unified_reporting_sdk/data_sources/ga4/metadata/dimensions.jsonl,sha256=n
 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=C6wm38Hu-UozFll71G3b03e2hgLFiC4I5yjcuo9hB4M,934
-findly/unified_reporting_sdk/protos/.gitignore,sha256=jyvVCY11J1OlOGM-nZCWKSR1vfO6fP65lnH65qf5W20,27
+findly/unified_reporting_sdk/protos/.gitignore,sha256=MtrjBS8zHuNNYo71NXCbMBJZpF33x1IsTTXc9Jhz8As,13
 findly/unified_reporting_sdk/protos/__init__.py,sha256=sfz7Yn3hvQrnhTfoZPGTbo0F1_Fw4X494wPSZojRajA,137
-findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.py,sha256=SaY46pOt8sDiVWrpY_f0uDwfgm_OPcHUkCdetnbPnUw,7279
-findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=jjoQm4TljpS8pcF6bqj21ygTQ-ayCzS3ScrRtbd5hPA,31043
+findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.py,sha256=aVZGPhrYEKN8PExrm8GzAZJI6Yzip8XxfIaDJlh4R88,6925
+findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=_07pudIa9mF-Gpkhnfjxq7s9lhCZxXpfGMPX6xqbfG4,31420
 findly/unified_reporting_sdk/urs.py,sha256=-vhOFpi-M0uo_tZ_O_hTDDEGO-ATf78nqEf5JhIcaz4,2956
-findly_unified_reporting_sdk-0.7.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-findly_unified_reporting_sdk-0.7.14.dist-info/METADATA,sha256=0zNhdl6yBerd1pxBEOGD0qA-K67Hni8_yLi63-8brvo,3213
-findly_unified_reporting_sdk-0.7.14.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-findly_unified_reporting_sdk-0.7.14.dist-info/RECORD,,
+findly_unified_reporting_sdk-0.7.16.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+findly_unified_reporting_sdk-0.7.16.dist-info/METADATA,sha256=uQ4KrVzJmt9d3NFWLH9_Vul7rR1bjbpuTEbgRtJMTRc,3168
+findly_unified_reporting_sdk-0.7.16.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+findly_unified_reporting_sdk-0.7.16.dist-info/RECORD,,

{findly_unified_reporting_sdk-0.7.14.dist-info → findly_unified_reporting_sdk-0.7.16.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any