feat(hogql): trends funnel (#20370)

PostHog · Feb 20, 2024 · 65e1bb4 · 65e1bb4
1 parent 8e92a4b
commit 65e1bb4
Show file tree

Hide file tree

Showing 21 changed files with 2,103 additions and 18 deletions.
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths--light--webkit.png b/frontend/__snapshots__/scenes-app-insights--user-paths--light--webkit.png
diff --git a/...nd/__snapshots__/scenes-app-insights-error-empty-states--server-error--dark.png b/...nd/__snapshots__/scenes-app-insights-error-empty-states--server-error--dark.png
diff --git a/...d/__snapshots__/scenes-app-insights-error-empty-states--server-error--light.png b/...d/__snapshots__/scenes-app-insights-error-empty-states--server-error--light.png
diff --git a/frontend/__snapshots__/scenes-app-persons-groups--persons--light.png b/frontend/__snapshots__/scenes-app-persons-groups--persons--light.png
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page--light.png
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-configuration--light.png
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics--light.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-node-metrics--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-organization--light.png b/frontend/__snapshots__/scenes-other-settings--settings-organization--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-project--light.png b/frontend/__snapshots__/scenes-other-settings--settings-project--light.png
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -1675,6 +1675,12 @@
             "required": ["average_conversion_time", "bins"],
             "type": "object"
         },
+        "FunnelTrendsResults": {
+            "items": {
+                "type": "object"
+            },
+            "type": "array"
+        },
         "FunnelVizType": {
             "enum": ["steps", "time_to_convert", "trends"],
             "type": "string"
@@ -1873,6 +1879,9 @@
                         },
                         {
                             "$ref": "#/definitions/FunnelTimeToConvertResults"
+                        },
+                        {
+                            "$ref": "#/definitions/FunnelTrendsResults"
                         }
                     ]
                 },

diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
@@ -705,8 +705,9 @@ export type FunnelTimeToConvertResults = {
     average_conversion_time: number
     bins: [BinNumber, BinNumber][]
 }
+export type FunnelTrendsResults = Record<string, any>[]
 export interface FunnelsQueryResponse extends QueryResponse {
-    results: FunnelStepsResults | FunnelStepsBreakdownResults | FunnelTimeToConvertResults
+    results: FunnelStepsResults | FunnelStepsBreakdownResults | FunnelTimeToConvertResults | FunnelTrendsResults
 }
 
 /** `RetentionFilterType` minus everything inherited from `FilterType` */

diff --git a/posthog/hogql_queries/insights/funnels/__init__.py b/posthog/hogql_queries/insights/funnels/__init__.py
@@ -3,3 +3,4 @@
 from .funnel_strict import FunnelStrict
 from .funnel_unordered import FunnelUnordered
 from .funnel_time_to_convert import FunnelTimeToConvert
+from .funnel_trends import FunnelTrends
diff --git a/posthog/hogql_queries/insights/funnels/base.py b/posthog/hogql_queries/insights/funnels/base.py
@@ -39,10 +39,7 @@ class FunnelBase(ABC):
     _extra_event_fields: List[ColumnName]
     _extra_event_properties: List[PropertyName]
 
-    def __init__(
-        self,
-        context: FunnelQueryContext,
-    ):
+    def __init__(self, context: FunnelQueryContext):
         self.context = context
 
         self._extra_event_fields: List[ColumnName] = []
@@ -56,10 +53,10 @@ def __init__(
     def get_query(self) -> ast.SelectQuery:
         raise NotImplementedError()
 
-    def get_step_counts_query(self) -> str:
+    def get_step_counts_query(self) -> ast.SelectQuery:
         raise NotImplementedError()
 
-    def get_step_counts_without_aggregation_query(self) -> str:
+    def get_step_counts_without_aggregation_query(self) -> ast.SelectQuery:
         raise NotImplementedError()
 
     @cached_property

diff --git a/posthog/hogql_queries/insights/funnels/funnel_query_context.py b/posthog/hogql_queries/insights/funnels/funnel_query_context.py
@@ -13,6 +13,7 @@
     FunnelsFilter,
     FunnelsQuery,
     HogQLQueryModifiers,
+    IntervalType,
 )
 
 
@@ -21,6 +22,8 @@ class FunnelQueryContext(QueryContext):
     funnelsFilter: FunnelsFilter
     breakdownFilter: BreakdownFilter
 
+    interval: IntervalType
+
     breakdown: List[Union[str, int]] | None
     breakdownType: BreakdownType
     breakdownAttributionType: BreakdownAttributionType
@@ -42,6 +45,8 @@ def __init__(
         self.breakdownFilter = self.query.breakdownFilter or BreakdownFilter()
 
         # defaults
+        self.interval = self.query.interval or IntervalType.day
+
         self.breakdownType = self.breakdownFilter.breakdown_type or BreakdownType.event
         self.breakdownAttributionType = (
             self.funnelsFilter.breakdownAttributionType or BreakdownAttributionType.first_touch