fix(product-assistant): improve generation prompts

ee/hogai/trends/test/test_toolkit.py

@@ -92,6 +92,13 @@ def test_retrieve_entity_properties(self):
             toolkit.retrieve_entity_properties("session"),
         )
 
+    def test_retrieve_entity_properties_returns_descriptive_feedback_without_properties(self):
+        toolkit = TrendsAgentToolkit(self.team)
+        self.assertEqual(
+            toolkit.retrieve_entity_properties("person"),
+            "Properties do not exist in the taxonomy for the entity person.",
+        )
+
     def test_retrieve_entity_property_values(self):
         toolkit = TrendsAgentToolkit(self.team)
         self.assertEqual(
@@ -173,6 +180,13 @@ def test_group_names(self):
         toolkit = TrendsAgentToolkit(self.team)
         self.assertEqual(toolkit._entity_names, ["person", "session", "proj", "org"])
 
+    def test_retrieve_event_properties_returns_descriptive_feedback_without_properties(self):
+        toolkit = TrendsAgentToolkit(self.team)
+        self.assertEqual(
+            toolkit.retrieve_event_properties("pageview"),
+            "Properties do not exist in the taxonomy for the event pageview.",
+        )
+
     def test_empty_events(self):
         toolkit = TrendsAgentToolkit(self.team)
         self.assertEqual(

ee/hogai/trends/toolkit.py

@@ -210,7 +210,7 @@ def tools(self) -> list[ToolkitTool]:
                         ```
 
                         Args:
-                            final_response: List all events, actions, and properties that you want to use to answer the question.
+                            final_response: List all events and properties that you want to use to answer the question.
                     """,
                 },
             ]
@@ -285,6 +285,9 @@ def retrieve_entity_properties(self, entity: str) -> str:
             ).values_list("name", "property_type")
             props = list(qs)
 
+        if not props:
+            return f"Properties do not exist in the taxonomy for the entity {entity}."
+
         return self._generate_properties_xml(props)
 
     def retrieve_event_properties(self, event_name: str) -> str:
@@ -305,15 +308,17 @@ def retrieve_event_properties(self, event_name: str) -> str:
             team=self._team, type=PropertyDefinition.Type.EVENT, name__in=[item.property for item in response.results]
         )
         property_to_type = {property_definition.name: property_definition.property_type for property_definition in qs}
+        props = [
+            (item.property, property_to_type.get(item.property))
+            for item in response.results
+            # Exclude properties that exist in the taxonomy, but don't have a type.
+            if item.property in property_to_type
+        ]
 
-        return self._generate_properties_xml(
-            [
-                (item.property, property_to_type.get(item.property))
-                for item in response.results
-                # Exclude properties that exist in the taxonomy, but don't have a type.
-                if item.property in property_to_type
-            ]
-        )
+        if not props:
+            return f"Properties do not exist in the taxonomy for the event {event_name}."
+
+        return self._generate_properties_xml(props)
 
     def _format_property_values(
         self, sample_values: list, sample_count: Optional[int] = 0, format_as_string: bool = False
@@ -475,6 +480,7 @@ def _flatten_schema(self):
             "PersonPropertyFilter",
             "SessionPropertyFilter",
             "FeaturePropertyFilter",
+            "GroupPropertyFilter",
         )
 
         # Clean up the property filters

frontend/src/queries/schema.json

@@ -1,62 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "definitions": {
-        "AIActionsNode": {
-            "additionalProperties": false,
-            "properties": {
-                "custom_name": {
-                    "type": "string"
-                },
-                "event": {
-                    "description": "The event or `null` for all events.",
-                    "type": ["string", "null"]
-                },
-                "fixedProperties": {
-                    "items": {
-                        "$ref": "#/definitions/AIPropertyFilter"
-                    },
-                    "type": "array"
-                },
-                "kind": {
-                    "const": "EventsNode",
-                    "type": "string"
-                },
-                "math": {
-                    "$ref": "#/definitions/MathType"
-                },
-                "math_group_type_index": {
-                    "enum": [0, 1, 2, 3, 4],
-                    "type": "number"
-                },
-                "math_property": {
-                    "type": "string"
-                },
-                "math_property_type": {
-                    "type": "string"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "orderBy": {
-                    "description": "Columns to order by",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "properties": {
-                    "items": {
-                        "$ref": "#/definitions/AIPropertyFilter"
-                    },
-                    "type": "array"
-                },
-                "response": {
-                    "type": "object"
-                }
-            },
-            "required": ["kind"],
-            "type": "object"
-        },
         "AIEventsNode": {
             "additionalProperties": false,
             "properties": {
@@ -5536,14 +5480,7 @@
                 "series": {
                     "description": "Events and actions to include",
                     "items": {
-                        "anyOf": [
-                            {
-                                "$ref": "#/definitions/AIEventsNode"
-                            },
-                            {
-                                "$ref": "#/definitions/AIActionsNode"
-                            }
-                        ]
+                        "$ref": "#/definitions/AIEventsNode"
                     },
                     "type": "array"
                 },

frontend/src/queries/schema.ts

@@ -916,12 +916,6 @@ export interface AIEventsNode
     fixedProperties?: AIPropertyFilter[]
 }
 
-export interface AIActionsNode
-    extends Omit<EventsNode, 'fixedProperties' | 'properties' | 'math_hogql' | 'limit' | 'groupBy'> {
-    properties?: AIPropertyFilter[]
-    fixedProperties?: AIPropertyFilter[]
-}
-
 export interface ExperimentalAITrendsQuery {
     kind: NodeKind.TrendsQuery
     /**
@@ -931,7 +925,7 @@ export interface ExperimentalAITrendsQuery {
      */
     interval?: IntervalType
     /** Events and actions to include */
-    series: (AIEventsNode | AIActionsNode)[]
+    series: AIEventsNode[]
     /** Properties specific to the trends insight */
     trendsFilter?: TrendsFilter
     /** Breakdown of the events and actions */

posthog/schema.py

@@ -4906,53 +4906,6 @@ class WebOverviewQuery(BaseModel):
     useSessionsTable: Optional[bool] = None
 
 
-class AIActionsNode(BaseModel):
-    model_config = ConfigDict(
-        extra="forbid",
-    )
-    custom_name: Optional[str] = None
-    event: Optional[str] = Field(default=None, description="The event or `null` for all events.")
-    fixedProperties: Optional[
-        list[
-            Union[
-                EventPropertyFilter,
-                PersonPropertyFilter,
-                SessionPropertyFilter,
-                GroupPropertyFilter,
-                FeaturePropertyFilter,
-            ]
-        ]
-    ] = None
-    kind: Literal["EventsNode"] = "EventsNode"
-    math: Optional[
-        Union[
-            BaseMathType,
-            FunnelMathType,
-            PropertyMathType,
-            CountPerActorMathType,
-            Literal["unique_group"],
-            Literal["hogql"],
-        ]
-    ] = None
-    math_group_type_index: Optional[MathGroupTypeIndex] = None
-    math_property: Optional[str] = None
-    math_property_type: Optional[str] = None
-    name: Optional[str] = None
-    orderBy: Optional[list[str]] = Field(default=None, description="Columns to order by")
-    properties: Optional[
-        list[
-            Union[
-                EventPropertyFilter,
-                PersonPropertyFilter,
-                SessionPropertyFilter,
-                GroupPropertyFilter,
-                FeaturePropertyFilter,
-            ]
-        ]
-    ] = None
-    response: Optional[dict[str, Any]] = None
-
-
 class AIEventsNode(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -5129,7 +5082,7 @@ class ExperimentalAITrendsQuery(BaseModel):
         ]
     ] = Field(default=[], description="Property filters for all series")
     samplingFactor: Optional[float] = Field(default=None, description="Sampling rate")
-    series: list[Union[AIEventsNode, AIActionsNode]] = Field(..., description="Events and actions to include")
+    series: list[AIEventsNode] = Field(..., description="Events and actions to include")
     trendsFilter: Optional[TrendsFilter] = Field(default=None, description="Properties specific to the trends insight")