staged

.github/actions/run-backend-tests/action.yml

@@ -136,8 +136,10 @@ runs:
           run: bin/check_kafka_clickhouse_up
 
         - name: Wait for Temporal
+          if: ${{ inputs.segment == 'Temporal' }}
           shell: bash
-          run: bin/check_temporal_up
+          run: |
+              bin/check_temporal_up
 
         - name: Determine if --snapshot-update should be on
           # Skip on forks (due to GITHUB_TOKEN being read-only in PRs coming from them) except for persons-on-events
@@ -165,9 +167,11 @@ runs:
                   --durations=100 --durations-min=1.0 --store-durations \
                   $PYTEST_ARGS
 
-        - name: Setup tmate session
-          if: failure()
-          uses: mxschmitt/action-tmate@v3
+        # Uncomment this code to create an ssh-able console so you can debug issues with github actions
+        # (Consider changing the timeout in ci-backend.yml to have more time)
+        # - name: Setup tmate session
+        #   if: failure()
+        #   uses: mxschmitt/action-tmate@v3
 
         - name: Run /decide read replica tests
           id: run-decide-read-replica-tests

.github/workflows/ci-backend.yml

@@ -224,8 +224,8 @@ jobs:
 
     django:
         needs: changes
-        # change for tmate test
-        timeout-minutes: 60
+        # increase for tmate testing
+        timeout-minutes: 30
 
         name: Django tests – ${{ matrix.segment }} (persons-on-events ${{ matrix.person-on-events && 'on' || 'off' }}), Py ${{ matrix.python-version }}, ${{ matrix.clickhouse-server-image }} (${{matrix.group}}/${{ matrix.concurrency }})
         runs-on: ubuntu-latest

docker-compose.dev-full.yml

@@ -48,7 +48,7 @@ services:
             - ./docker/clickhouse/config.xml:/etc/clickhouse-server/config.xml
             - ./docker/clickhouse/users-dev.xml:/etc/clickhouse-server/users.xml
             - ./docker/clickhouse/user_defined_function.xml:/etc/clickhouse-server/user_defined_function.xml
-            - ./posthog/users_scripts:/var/lib/clickhouse/user_scripts
+            - ./posthog/user_scripts:/var/lib/clickhouse/user_scripts
         depends_on:
             - kafka
             - zookeeper

docker-compose.dev.yml

@@ -69,7 +69,7 @@ services:
             - ./docker/clickhouse/config.xml:/etc/clickhouse-server/config.xml
             - ./docker/clickhouse/users-dev.xml:/etc/clickhouse-server/users.xml
             - ./docker/clickhouse/user_defined_function.xml:/etc/clickhouse-server/user_defined_function.xml
-            - ./posthog/users_scripts:/var/lib/clickhouse/user_scripts
+            - ./posthog/user_scripts:/var/lib/clickhouse/user_scripts
         extra_hosts:
             - 'host.docker.internal:host-gateway'
         depends_on:

posthog/hogql_queries/insights/funnels/base.py

@@ -467,8 +467,7 @@ def _get_inner_event_query_for_udf(
         funnel_events_query.select = [*funnel_events_query.select, *all_step_cols]
 
         if breakdown and breakdownType == BreakdownType.COHORT:
-            if funnel_events_query.select_from is None:
-                raise ValidationError("Apologies, there was an error adding cohort breakdowns to the query.")
+            assert funnel_events_query.select_from is not None
             funnel_events_query.select_from.next_join = self._get_cohort_breakdown_join()
 
         if not skip_step_filter:

posthog/test/user_scripts/test_aggregate_funnel.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from posthog.users_scripts.aggregate_funnel import calculate_funnel_from_user_events
+from posthog.user_scripts.aggregate_funnel import calculate_funnel_from_user_events
 
 
 def test():