Merge branch 'master' into retention-modal-for-personless

bin/mprocs.yaml

@@ -19,8 +19,7 @@ procs:
         shell: 'bin/check_kafka_clickhouse_up && bin/check_temporal_up && python manage.py start_temporal_worker'
 
     docker-compose:
-        shell: 'docker compose -f docker-compose.dev.yml up'
-        stop:
-            send-keys: ['<C-c>']
+        # docker-compose makes sure the stack is up, and then follows its logs - but doesn't tear down on exit for speed
+        shell: 'docker compose -f docker-compose.dev.yml up -d && docker compose -f docker-compose.dev.yml logs --tail=0 -f'
 
 mouse_scroll_speed: 1

bin/start

@@ -9,4 +9,14 @@ export HOG_HOOK_URL=${HOG_HOOK_URL:-http://localhost:3300/hoghook}
 
 [ ! -f ./share/GeoLite2-City.mmdb ] && ( curl -L "https://mmdbcdn.posthog.net/" --http1.1 | brotli --decompress --output=./share/GeoLite2-City.mmdb )
 
+if ! command -v mprocs &> /dev/null; then
+    if command -v brew &> /dev/null; then
+        echo "🔁 Installing mprocs via Homebrew..."
+        brew install mprocs
+    else
+        echo "👉 To run bin/start, install mprocs: https://github.com/pvolok/mprocs#installation"
+        exit 1
+    fi
+fi
+
 exec mprocs --config bin/mprocs.yaml

cypress/e2e/insights-reload-query.ts

@@ -1,5 +1,3 @@
-import JSONCrush from 'jsoncrush'
-
 describe('ReloadInsight component', () => {
     beforeEach(() => {
         // Clear local storage before each test to ensure a clean state
@@ -21,8 +19,7 @@ describe('ReloadInsight component', () => {
             const draftQuery = window.localStorage.getItem(`draft-query-${currentTeamId}`)
             expect(draftQuery).to.not.be.null
 
-            const draftQueryObjUncrushed = JSONCrush.uncrush(draftQuery)
-            const draftQueryObj = JSON.parse(draftQueryObjUncrushed)
+            const draftQueryObj = JSON.parse(draftQuery)
 
             expect(draftQueryObj).to.have.property('query')
 

ee/hogai/eval/conftest.py

@@ -1,28 +1,107 @@
+import functools
+from collections.abc import Generator
+from pathlib import Path
+
 import pytest
+from django.conf import settings
+from django.test import override_settings
+from langchain_core.runnables import RunnableConfig
+
+from ee.models import Conversation
+from posthog.demo.matrix.manager import MatrixManager
+from posthog.models import Organization, Project, Team, User
+from posthog.tasks.demo_create_data import HedgeboxMatrix
+from posthog.test.base import BaseTest
+
+
+# Flaky is a handy tool, but it always runs setup fixtures for retries.
+# This decorator will just retry without re-running setup.
+def retry_test_only(max_retries=3):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            last_error: Exception | None = None
+            for attempt in range(max_retries):
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    last_error = e
+                    print(f"\nRetrying test (attempt {attempt + 1}/{max_retries})...")  # noqa
+            if last_error:
+                raise last_error
+
+        return wrapper
+
+    return decorator
+
+
+# Apply decorators to all tests in the package.
+def pytest_collection_modifyitems(items):
+    current_dir = Path(__file__).parent
+    for item in items:
+        if Path(item.fspath).is_relative_to(current_dir):
+            item.add_marker(
+                pytest.mark.skipif(not settings.IN_EVAL_TESTING, reason="Only runs for the assistant evaluation")
+            )
+            # Apply our custom retry decorator to the test function
+            item.obj = retry_test_only(max_retries=3)(item.obj)
+
+
+@pytest.fixture(scope="package")
+def team(django_db_blocker) -> Generator[Team, None, None]:
+    with django_db_blocker.unblock():
+        organization = Organization.objects.create(name=BaseTest.CONFIG_ORGANIZATION_NAME)
+        project = Project.objects.create(id=Team.objects.increment_id_sequence(), organization=organization)
+        team = Team.objects.create(
+            id=project.id,
+            project=project,
+            organization=organization,
+            test_account_filters=[
+                {
+                    "key": "email",
+                    "value": "@posthog.com",
+                    "operator": "not_icontains",
+                    "type": "person",
+                }
+            ],
+            has_completed_onboarding_for={"product_analytics": True},
+        )
+        yield team
+        organization.delete()
 
-from posthog.test.base import run_clickhouse_statement_in_parallel
 
+@pytest.fixture(scope="package")
+def user(team, django_db_blocker) -> Generator[User, None, None]:
+    with django_db_blocker.unblock():
+        user = User.objects.create_and_join(team.organization, "[email protected]", "password1234")
+        yield user
+        user.delete()
 
-@pytest.fixture(scope="module", autouse=True)
-def setup_kafka_tables(django_db_setup):
-    from posthog.clickhouse.client import sync_execute
-    from posthog.clickhouse.schema import (
-        CREATE_KAFKA_TABLE_QUERIES,
-        build_query,
-    )
-    from posthog.settings import CLICKHOUSE_CLUSTER, CLICKHOUSE_DATABASE
 
-    kafka_queries = list(map(build_query, CREATE_KAFKA_TABLE_QUERIES))
-    run_clickhouse_statement_in_parallel(kafka_queries)
+@pytest.mark.django_db(transaction=True)
+@pytest.fixture
+def runnable_config(team, user) -> Generator[RunnableConfig, None, None]:
+    conversation = Conversation.objects.create(team=team, user=user)
+    yield {
+        "configurable": {
+            "thread_id": conversation.id,
+        }
+    }
+    conversation.delete()
 
-    yield
 
-    kafka_tables = sync_execute(
-        f"""
-        SELECT name
-        FROM system.tables
-        WHERE database = '{CLICKHOUSE_DATABASE}' AND name LIKE 'kafka_%'
-        """,
-    )
-    kafka_truncate_queries = [f"DROP TABLE {table[0]} ON CLUSTER '{CLICKHOUSE_CLUSTER}'" for table in kafka_tables]
-    run_clickhouse_statement_in_parallel(kafka_truncate_queries)
+@pytest.fixture(scope="package", autouse=True)
+def setup_test_data(django_db_setup, team, user, django_db_blocker):
+    with django_db_blocker.unblock():
+        matrix = HedgeboxMatrix(
+            seed="b1ef3c66-5f43-488a-98be-6b46d92fbcef",  # this seed generates all events
+            days_past=120,
+            days_future=30,
+            n_clusters=500,
+            group_type_index_offset=0,
+        )
+        matrix_manager = MatrixManager(matrix, print_steps=True)
+        with override_settings(TEST=False):
+            # Simulation saving should occur in non-test mode, so that Kafka isn't mocked. Normally in tests we don't
+            # want to ingest via Kafka, but simulation saving is specifically designed to use that route for speed
+            matrix_manager.run_on_team(team, user)

ee/hogai/eval/tests/test_eval_funnel_generator.py

@@ -1,40 +1,46 @@
+from collections.abc import Callable
 from typing import cast
 
+import pytest
 from langgraph.graph.state import CompiledStateGraph
 
 from ee.hogai.assistant import AssistantGraph
-from ee.hogai.eval.utils import EvalBaseTest
 from ee.hogai.utils.types import AssistantNodeName, AssistantState
 from posthog.schema import AssistantFunnelsQuery, HumanMessage, VisualizationMessage
 
 
-class TestEvalFunnelGenerator(EvalBaseTest):
-    def _call_node(self, query: str, plan: str) -> AssistantFunnelsQuery:
-        graph: CompiledStateGraph = (
-            AssistantGraph(self.team)
-            .add_edge(AssistantNodeName.START, AssistantNodeName.FUNNEL_GENERATOR)
-            .add_funnel_generator(AssistantNodeName.END)
-            .compile()
-        )
+@pytest.fixture
+def call_node(team, runnable_config) -> Callable[[str, str], AssistantFunnelsQuery]:
+    graph: CompiledStateGraph = (
+        AssistantGraph(team)
+        .add_edge(AssistantNodeName.START, AssistantNodeName.FUNNEL_GENERATOR)
+        .add_funnel_generator(AssistantNodeName.END)
+        .compile()
+    )
+
+    def callable(query: str, plan: str) -> AssistantFunnelsQuery:
         state = graph.invoke(
             AssistantState(messages=[HumanMessage(content=query)], plan=plan),
-            self._get_config(),
+            runnable_config,
         )
         return cast(VisualizationMessage, AssistantState.model_validate(state).messages[-1]).answer
 
-    def test_node_replaces_equals_with_contains(self):
-        query = "what is the conversion rate from a page view to sign up for users with name John?"
-        plan = """Sequence:
-        1. $pageview
-        - property filter 1
-            - person
-            - name
-            - equals
-            - John
-        2. signed_up
-        """
-        actual_output = self._call_node(query, plan).model_dump_json(exclude_none=True)
-        assert "exact" not in actual_output
-        assert "icontains" in actual_output
-        assert "John" not in actual_output
-        assert "john" in actual_output
+    return callable
+
+
+def test_node_replaces_equals_with_contains(call_node):
+    query = "what is the conversion rate from a page view to sign up for users with name John?"
+    plan = """Sequence:
+    1. $pageview
+    - property filter 1
+        - person
+        - name
+        - equals
+        - John
+    2. signed_up
+    """
+    actual_output = call_node(query, plan).model_dump_json(exclude_none=True)
+    assert "exact" not in actual_output
+    assert "icontains" in actual_output
+    assert "John" not in actual_output
+    assert "john" in actual_output