letschatty 0.4.349__py3-none-any.whl → 0.4.351__py3-none-any.whl

letschatty/models/ai_microservices/__init__.py

@@ -1,10 +1,10 @@
 from .expected_output import ExpectedOutputQualityTest, ExpectedOutputSmartTag
 from .lambda_events import (
-    IncomingMessageCallbackEvent, QualityTestCallbackEvent, SmartTaggingCallbackEvent,
-    QualityTestInteractionCallbackEvent, IncomingMessageEvent, QualityTestEvent,
-    AllQualityTestEvent, FollowUpEvent, SmartTaggingEvent, QualityTestEventData, AllQualityTestEventData,ChatData,
+    IncomingMessageAIDecision, QualityTestCallbackEvent, SmartTaggingCallbackEvent,
+    QualityTestInteractionCallbackEvent, QualityTestEvent,
+    AllQualityTestEvent, SmartTaggingEvent, QualityTestEventData, AllQualityTestEventData,ChatData,
     ComparisonAnalysisCallbackMetadata, InteractionCallbackMetadata, SmartTaggingCallbackMetadata,
-    SmartTaggingPromptEvent
+    SmartTaggingPromptEvent, UpdateAIAgentPrequalStatusInChatEvent, UpdateAIAgentPrequalStatusInChatEventData
 )
 from .lambda_invokation_types import InvokationType, LambdaAiEvent
 from .openai_payloads import OpenaiPayload, N8nPayload

letschatty/models/ai_microservices/expected_output.py

@@ -6,9 +6,10 @@ from typing import List, Optional, Literal
 from datetime import datetime
 
 from letschatty.models.utils.types.message_types import MessageType
-from ...models.company.assets.ai_agents_v2.ai_agents_decision_output import ChainOfThoughtInChatRequest, IncomingMessageAIDecision, IncomingMessageDecisionAction
+from ...models.company.assets.ai_agents_v2.ai_agents_decision_output import ChainOfThoughtInChatRequest, IncomingMessageAIDecision, IncomingMessageDecisionAction, SmartFollowUpDecision, SmartFollowUpDecisionAction
 from ...models.company.assets.automation import Automation
 from ...models.company.form_field import CollectedData
+from ...models.chat.chat import Area
 
 class ExpectedOutputQualityTest(BaseModel):
     accuracy: float = Field(description="The accuracy of the comparison analysis")
@@ -194,4 +195,30 @@ class ExpectedOutputIncomingMessage(BaseModel):
 
 
 class ExpectedOutputSmartFollowUp(BaseModel):
-    action: Optional[str] = None
+    action: SmartFollowUpDecisionAction
+    messages: List[str] = Field(description="Array of message strings to send to the customer. Required for send/suggest actions, optional for escalate action, empty array for skip/remove/postpone actions.")
+    chain_of_thought: ChainOfThoughtInChatRequest = Field(description="REQUIRED: Your reasoning process and response decision explanation")
+    next_call_time: Optional[datetime] = Field(default=None, description="The next call time for the smart follow up (required for postpone_delta_time action)")
+    reason: Optional[str] = Field(default=None, description="Reason for the decision (especially for postpone/postponed actions)")
+    area: Optional[Area] = Field(default=None, description="The area to move the chat after the decision")
+
+    def to_smart_follow_up_decision_output(self) -> SmartFollowUpDecision:
+        messages_drafts = [
+            MessageDraft(
+                type=MessageType.TEXT,
+                content=ChattyContentText(body=message),
+                is_incoming_message=False
+            )
+            for message in self.messages
+        ]
+        smart_follow_up_decision = SmartFollowUpDecision(
+            action=self.action,
+            next_call_time=self.next_call_time,
+            messages=messages_drafts,
+            chain_of_thought=self.chain_of_thought,
+            reason=self.reason,
+            area=self.area
+        )
+        return smart_follow_up_decision
+
+

letschatty/models/ai_microservices/lambda_events.py

@@ -1,17 +1,19 @@
+from letschatty.models.company.assets.ai_agents_v2.chatty_ai_agent_in_chat import HumanInterventionReason
 from letschatty.models.company.assets.chat_assets import ChainOfThoughtInChatTrigger
 from pydantic import BaseModel, Field, model_validator
-from typing import Dict, Any, List, Optional
+from typing import Dict, Any, List, Optional, TYPE_CHECKING
 
 from letschatty.models.base_models.ai_agent_component import AiAgentComponentType
+from letschatty.models.company.assets.ai_agents_v2.statuses import DataCollectionStatus, PreQualifyStatus
 from letschatty.models.utils.types.identifier import StrObjectId
 from .lambda_invokation_types import InvokationType, LambdaAiEvent
-from .expected_output import ExpectedOutputIncomingMessage, ExpectedOutputSmartTag, ExpectedOutputQualityTest, ExpectedOutputSmartFollowUp, IncomingMessageAIDecision
-from ...models.company.assets.ai_agents_v2.ai_agents_decision_output import IncomingMessageDecisionAction
-from ...models.company.assets.ai_agents_v2.chatty_ai_agent_in_chat import HumanInterventionReason
+from .expected_output import ExpectedOutputIncomingMessage, ExpectedOutputSmartFollowUp, ExpectedOutputSmartTag, ExpectedOutputQualityTest, IncomingMessageAIDecision
+from ...models.company.assets.ai_agents_v2.ai_agents_decision_output import IncomingMessageDecisionAction, SmartFollowUpDecision
 
 class SmartTaggingCallbackMetadata(BaseModel):
     chat_id: StrObjectId
     company_id: StrObjectId
+    trigger: ChainOfThoughtInChatTrigger
 
 class ComparisonAnalysisCallbackMetadata(BaseModel):
     test_case_id: StrObjectId
@@ -23,21 +25,8 @@ class InteractionCallbackMetadata(BaseModel):
     ai_agent_id: StrObjectId
     company_id: StrObjectId
     interaction_index: int
-
-class IncomingMessageCallbackMetadata(BaseModel):
-    chat_id: StrObjectId
-    company_id: StrObjectId
-    ai_agent_id: StrObjectId
-    cot_id: StrObjectId
-    trigger: str
-    # Trigger info is in: incoming_message_ids for user_message,
-    # triggered_by_user_id for manual_trigger, smart_follow_up_id for follow_up
-    triggered_by_user_id: Optional[StrObjectId] = None
-
-class IncomingMessageCallbackEvent(LambdaAiEvent):
-    type: InvokationType = InvokationType.INCOMING_MESSAGE_CALLBACK
-    data: IncomingMessageAIDecision
-    callback_metadata: IncomingMessageCallbackMetadata
+    trigger: ChainOfThoughtInChatTrigger
+    chain_of_thought_id: StrObjectId
 
 class QualityTestCallbackEvent(LambdaAiEvent):
     type: InvokationType = InvokationType.SINGLE_QUALITY_TEST_CALLBACK
@@ -55,6 +44,50 @@ class QualityTestInteractionCallbackEvent(LambdaAiEvent):
             data["data"]["chain_of_thought"]["chatty_ai_agent_id"] = data["callback_metadata"]["ai_agent_id"]
         return data
 
+    @model_validator(mode="before")
+    @classmethod
+    def set_chain_of_thought_id(cls, values: Dict[str, Any]):
+        """
+        Get the chain_of_thought_id from callback_metadata and set it in data.chain_of_thought.id
+
+        Handles both cases:
+        - data is a JSON string (needs parsing)
+        - data is already a dict
+        """
+        import json
+
+        data = values.get("data")
+        callback_metadata = values.get("callback_metadata")
+
+        if not data or not callback_metadata:
+            return values
+
+        # Get chain_of_thought_id from callback_metadata (could be dict or object)
+        if isinstance(callback_metadata, dict):
+            chain_of_thought_id = callback_metadata.get("chain_of_thought_id")
+        else:
+            chain_of_thought_id = getattr(callback_metadata, "chain_of_thought_id", None)
+
+        if not chain_of_thought_id:
+            return values
+
+        # Parse data if it's a JSON string
+        if isinstance(data, str):
+            try:
+                data = json.loads(data)
+                values["data"] = data
+            except (json.JSONDecodeError, TypeError):
+                return values
+
+        # If data is a dict, set the id in chain_of_thought
+        if isinstance(data, dict):
+            chain_of_thought = data.get("chain_of_thought")
+            if isinstance(chain_of_thought, dict):
+                chain_of_thought["id"] = chain_of_thought_id
+
+        return values
+
+
 class SmartTaggingCallbackEvent(LambdaAiEvent):
     type: InvokationType = InvokationType.SMART_TAGGING_CALLBACK
     data: ExpectedOutputSmartTag
@@ -149,11 +182,9 @@ class DoubleCheckerCallbackMetadata(BaseModel):
     company_id: StrObjectId
     ai_agent_id: StrObjectId
     incoming_messages_ids: List[str]
-    # Trigger info
-    trigger: str
-    # Trigger info is in: incoming_messages_ids for user_message,
-    # triggered_by_user_id for manual_trigger, smart_follow_up_id for follow_up
-    triggered_by_user_id: Optional[StrObjectId] = None
+    trigger: ChainOfThoughtInChatTrigger
+    chain_of_thought_id: StrObjectId
+
 
 class DoubleCheckerForIncomingMessagesAnswerEvent(LambdaAiEvent):
     type: InvokationType = InvokationType.DOUBLE_CHECKER_FOR_INCOMING_MESSAGES_ANSWER
@@ -161,13 +192,73 @@ class DoubleCheckerForIncomingMessagesAnswerEvent(LambdaAiEvent):
 
 class DoubleCheckerForIncomingMessagesAnswerCallbackEvent(LambdaAiEvent):
     type: InvokationType = InvokationType.DOUBLE_CHECKER_FOR_INCOMING_MESSAGES_ANSWER_CALLBACK
-    data: DoubleCheckerForIncomingMessagesAnswerData
+    data: ExpectedOutputIncomingMessage
     callback_metadata: DoubleCheckerCallbackMetadata
 
-class DoubleCheckerForIncomingMessagesAnswerCallbackMetadata(BaseModel):
+    @model_validator(mode="before")
+    @classmethod
+    def set_chain_of_thought_id(cls, values: Dict[str, Any]):
+        """
+        Get the chain_of_thought_id from callback_metadata and set it in data.chain_of_thought.id
+
+        Handles both cases:
+        - data is a JSON string (needs parsing)
+        - data is already a dict
+        """
+        import json
+
+        data = values.get("data")
+        callback_metadata = values.get("callback_metadata")
+
+        if not data or not callback_metadata:
+            return values
+
+        # Get chain_of_thought_id from callback_metadata (could be dict or object)
+        if isinstance(callback_metadata, dict):
+            chain_of_thought_id = callback_metadata.get("chain_of_thought_id")
+        else:
+            chain_of_thought_id = getattr(callback_metadata, "chain_of_thought_id", None)
+
+        if not chain_of_thought_id:
+            return values
+
+        # Parse data if it's a JSON string
+        if isinstance(data, str):
+            try:
+                data = json.loads(data)
+                values["data"] = data
+            except (json.JSONDecodeError, TypeError):
+                return values
+
+        # If data is a dict, set the id in chain_of_thought
+        if isinstance(data, dict):
+            chain_of_thought = data.get("chain_of_thought")
+            if isinstance(chain_of_thought, dict):
+                chain_of_thought["id"] = chain_of_thought_id
+
+        return values
+
+
+
+# Smart Follow-Up Decision Output Events
+
+class SmartFollowUpDecisionOutputData(BaseModel):
+    """Data for smart follow-up decision output"""
     chat_id: StrObjectId
     company_id: StrObjectId
     ai_agent_id: StrObjectId
+    smart_follow_up_output: ExpectedOutputSmartFollowUp
+    smart_follow_up_id: Optional[StrObjectId] = None
+
+class SmartFollowUpDecisionOutputEvent(LambdaAiEvent):
+    """
+    Event for smart follow-up decision output.
+
+    Similar to incoming message decision but for follow-ups.
+    Bypasses double checker and sends directly to API.
+    """
+    type: InvokationType = InvokationType.SMART_FOLLOW_UP_DECISION_OUTPUT
+    data: SmartFollowUpDecisionOutputData
 
 
 # New AI Agent Context Building Events (for new architecture)
@@ -202,7 +293,7 @@ class GetChatWithPromptForFollowUpEventData(BaseModel):
     """Data for get chat with prompt for follow-up event"""
     chat_id: StrObjectId
     company_id: StrObjectId
-    smart_follow_up_id: StrObjectId
+    smart_follow_up_id: Optional[StrObjectId] = Field(default=None, description="Smart follow-up ID")
     # Trigger information
     trigger: ChainOfThoughtInChatTrigger
     # trigger_id is derived from: smart_follow_up_id
@@ -318,11 +409,29 @@ class UpdateAIAgentModeInChatEvent(LambdaAiEvent):
     data: UpdateAIAgentModeInChatEventData
 
 
+class UpdateAIAgentPrequalStatusInChatEventData(BaseModel):
+    """Data for updating pre-qualification and data collection status in a chat"""
+    chat_id: StrObjectId
+    company_id: StrObjectId
+    data_collection_status: Optional[DataCollectionStatus] = Field(default=None, description="New data collection status")
+    pre_qualify_status: Optional[PreQualifyStatus] = Field(default=None, description="New pre-qualification status")
+    updated_by: Optional[StrObjectId] = Field(default=None, description="User who updated the status")
+
+
+class UpdateAIAgentPrequalStatusInChatEvent(LambdaAiEvent):
+    """
+    Event to update data_collection_status and/or pre_qualify_status for a chat's AI agent.
+    """
+    type: InvokationType = InvokationType.UPDATE_AI_AGENT_PREQUAL_STATUS_IN_CHAT
+    data: UpdateAIAgentPrequalStatusInChatEventData
+
+
 class EscalateAIAgentInChatEventData(BaseModel):
     """Data for escalating an AI agent (requiring human intervention)"""
     chat_id: StrObjectId
     company_id: StrObjectId
-    reason: str = Field(description="Reason for escalation (e.g., 'Complex technical issue', 'Customer request')")
+    reason: HumanInterventionReason = Field(description="Reason for escalation", default=HumanInterventionReason.SOMETHING_WENT_WRONG)
+    message: Optional[str] = Field(default="El agente de IA requiere de tu intervención", description="The message to display to the user if any")
 
 
 class EscalateAIAgentInChatEvent(LambdaAiEvent):
@@ -354,6 +463,24 @@ class UnescalateAIAgentInChatEvent(LambdaAiEvent):
     data: UnescalateAIAgentInChatEventData
 
 
+
+class GetChainOfThoughtsByChatIdEventData(BaseModel):
+    """Data for getting chain of thoughts by chat ID"""
+    chat_id: StrObjectId
+    company_id: StrObjectId
+    skip: int = Field(default=0, description="Number of results to skip for pagination")
+    limit: int = Field(default=10, description="Number of results to return")
+
+
+class GetChainOfThoughtsByChatIdEvent(LambdaAiEvent):
+    """
+    Event to get chain of thoughts for a chat.
+
+    Returns a list of chain of thoughts associated with the given chat ID,
+    sorted by created_at (newest first), with pagination support via skip.
+    """
+    type: InvokationType = InvokationType.GET_CHAIN_OF_THOUGHTS_BY_CHAT_ID
+    data: GetChainOfThoughtsByChatIdEventData
 # Launch Events
 
 class LaunchCommunicationEventData(BaseModel):

letschatty/models/ai_microservices/lambda_invokation_types.py

@@ -11,13 +11,14 @@ class InvokationType(StrEnum):
     SMART_TAGGING_PROMPT = "smart_tagging_prompt"
     QUALITY_TEST_INTERACTION = "quality_test_interaction"
     # Callback-specific types
-    INCOMING_MESSAGE_CALLBACK = "incoming_message_callback"
     SINGLE_QUALITY_TEST_CALLBACK = "single_quality_test_callback"
     SMART_TAGGING_CALLBACK = "smart_tagging_callback"
     QUALITY_TESTS_FOR_UPDATED_AI_COMPONENT = "quality_tests_for_updated_ai_component"
     FIX_BUGGED_AI_AGENTS_CALLS_IN_CHATS = "fix_bugged_ai_agents_calls_in_chats"
     DOUBLE_CHECKER_FOR_INCOMING_MESSAGES_ANSWER = "double_checker_for_incoming_messages_answer"
     DOUBLE_CHECKER_FOR_INCOMING_MESSAGES_ANSWER_CALLBACK = "double_checker_for_incoming_messages_answer_callback"
+    # Decision output events
+    SMART_FOLLOW_UP_DECISION_OUTPUT = "smart_follow_up_decision_output"
     # AI Agent context building events (new architecture)
     GET_CHAT_WITH_PROMPT_INCOMING_MESSAGE = "get_chat_with_prompt_incoming_message"
     GET_CHAT_WITH_PROMPT_FOLLOW_UP = "get_chat_with_prompt_follow_up"
@@ -28,8 +29,10 @@ class InvokationType(StrEnum):
     ASSIGN_AI_AGENT_TO_CHAT = "assign_ai_agent_to_chat"
     REMOVE_AI_AGENT_FROM_CHAT = "remove_ai_agent_from_chat"
     UPDATE_AI_AGENT_MODE_IN_CHAT = "update_ai_agent_mode_in_chat"
+    UPDATE_AI_AGENT_PREQUAL_STATUS_IN_CHAT = "update_ai_agent_prequal_status_in_chat"
     ESCALATE_AI_AGENT_IN_CHAT = "escalate_ai_agent_in_chat"
     UNESCALATE_AI_AGENT_IN_CHAT = "unescalate_ai_agent_in_chat"
+    GET_CHAIN_OF_THOUGHTS_BY_CHAT_ID = "get_chain_of_thoughts_by_chat_id"
     # Launch events
     LAUNCH_COMMUNICATION = "launch_communication"
     LAUNCH_WELCOME_KIT = "launch_welcome_kit"

letschatty/models/ai_microservices/n8n_ai_agents_payload.py

@@ -1,3 +1,4 @@
+from letschatty.models.company.assets.chat_assets import ChainOfThoughtInChatTrigger
 from pydantic import BaseModel, Field
 from letschatty.models import StrObjectId
 from letschatty.models.company.assets.ai_agents_v2.chatty_ai_agent import N8NWorkspaceAgentType
@@ -10,4 +11,5 @@ class SmartFollowUpN8NPayload(BaseModel):
 class ManualTriggerN8NPayload(BaseModel):
     chat_id: StrObjectId = Field(description="The id of the chat")
     company_id: StrObjectId = Field(description="The id of the company")
-    n8n_agent_type: N8NWorkspaceAgentType = Field(description="The type of agent to redirect the message to")
+    n8n_agent_type: N8NWorkspaceAgentType = Field(description="The type of agent to redirect the message to")
+    trigger: ChainOfThoughtInChatTrigger = Field(default=ChainOfThoughtInChatTrigger.MANUAL_TRIGGER)

letschatty/models/analytics/events/__init__.py

@@ -3,9 +3,8 @@ from .chat_based_events.contact_point import ContactPointEvent, ContactPointData
 from .chat_based_events.business_area import ChatBusinessAreaEvent, BusinessAreaData
 from .chat_based_events.workflow import WorkflowEvent, WorkflowEventData
 from .chat_based_events.chat_status import ChatStatusEvent, ChatStatusEventData, ChatStatusModification, ChatCreatedFrom
-from .chat_based_events.chat_client import ChatClientEvent
 from .chat_based_events.chat_funnel import ChatFunnelEvent, FunnelEventData
-from ...company.CRM.funnel import ChatFunnel, StageTransition, ActiveFunnel
+from ...company.CRM.funnel import ClientFunnel, StageTransition
 from .company_based_events.user_events import UserEvent, UserEventData
 from .chat_based_events.quality_scoring import QualityScoringEvent
 from .chat_based_events.message import MessageEvent, MessageData
@@ -29,4 +28,5 @@ from ...messages.chatty_messages import ChattyMessage
 from ...company.CRM.funnel import Funnel, FunnelStage
 from ...utils.types import Status
 from .chat_based_events.chat_based_event import CustomerEventData
-from .chat_based_events.ai_agent_chat import ChattyAIChatEvent, ChattyAIChatData
+from .chat_based_events.ai_agent_chat import ChattyAIChatEvent, ChattyAIChatData
+from .chat_based_events.ai_agent_execution_event import AIAgentExecutionEvent, AIAgentExecutionEventData

letschatty/models/analytics/events/chat_based_events/ai_agent_execution_event.py

@@ -0,0 +1,71 @@
+"""AI Agent Execution Events - Track AI agent lifecycle and decision-making"""
+
+from ..base import Event, EventData
+from ..event_types import EventType
+from .chat_based_event import CustomerEventData
+from typing import ClassVar, Optional, Dict, Any
+from ....utils.types.identifier import StrObjectId
+
+
+class AIAgentExecutionEventData(CustomerEventData):
+    """Data for AI agent execution events"""
+    ai_agent_id: StrObjectId
+    chain_of_thought_id: StrObjectId
+    trigger: str  # USER_MESSAGE, FOLLOW_UP, MANUAL_TRIGGER, RETRY
+    decision_type: Optional[str] = None  # send, suggest, escalate, skip
+    error_message: Optional[str] = None
+    duration_ms: Optional[int] = None
+    user_rating: Optional[int] = None  # 1-5 stars
+    metadata: Optional[Dict[str, Any]] = None
+
+
+class AIAgentExecutionEvent(Event):
+    """
+    Events for AI agent execution lifecycle.
+
+    This event type covers the entire AI agent decision-making process,
+    from trigger to final decision, including all intermediate steps.
+    """
+    data: AIAgentExecutionEventData
+
+    VALID_TYPES: ClassVar[set] = {
+        # Trigger events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_TRIGGER_USER_MESSAGE,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_TRIGGER_FOLLOW_UP,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_TRIGGER_MANUAL,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_TRIGGER_RETRY,
+
+        # State events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_STATE_PROCESSING_STARTED,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_STATE_CALL_STARTED,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_STATE_ESCALATED,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_STATE_UNESCALATED,
+
+        # Call events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALL_GET_CHAT_WITH_PROMPT,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALL_TAGGER,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALL_DOUBLE_CHECKER,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALL_DEBUGGER,
+
+        # Callback events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALLBACK_GET_CHAT_WITH_PROMPT,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALLBACK_TAGGER,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALLBACK_DOUBLE_CHECKER,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_CALLBACK_OUTPUT_RECEIVED,
+
+        # Decision events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_SEND,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_SUGGEST,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_ESCALATE,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_SKIP,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_SENT_TO_API,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_DECISION_COMPLETED,
+
+        # Error events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_ERROR_CALL_FAILED,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_ERROR_CALL_CANCELLED,
+        EventType.CHATTY_AI_AGENT_IN_CHAT_ERROR_VALIDATION_FAILED,
+
+        # Rating events
+        EventType.CHATTY_AI_AGENT_IN_CHAT_RATING_RECEIVED,
+    }

letschatty/models/analytics/events/chat_based_events/chat_funnel.py

@@ -4,93 +4,37 @@ from ..base import Event
 from ..event_types import EventType
 from .chat_based_event import CustomerEventData
 from ....utils.types.identifier import StrObjectId
-from ....company.CRM.funnel import StageTransition
+from ....company.CRM.funnel import ClientFunnel, StageTransition
 import json
 
-
 class FunnelEventData(CustomerEventData):
-    """
-    Event data for chat funnel events.
-    
-    Fields required per event type:
-    - STARTED: funnel_id, chat_funnel_id, stage_transition
-    - STAGE_CHANGED: funnel_id, chat_funnel_id, stage_transition (with time_in_previous_stage_seconds)
-    - COMPLETED: funnel_id, chat_funnel_id, time_in_funnel_seconds, time_in_last_stage_seconds
-    - ABANDONED: funnel_id, chat_funnel_id, time_in_funnel_seconds, time_in_last_stage_seconds
-    """
-    funnel_id: StrObjectId = Field(description="The funnel the chat is in")
-    chat_funnel_id: StrObjectId = Field(description="Reference to the ChatFunnel record")
-    
-    # For STARTED and STAGE_CHANGED events
-    stage_transition: Optional[StageTransition] = Field(
-        default=None,
-        description="The stage transition details (for STARTED and STAGE_CHANGED)"
-    )
-    
-    # For COMPLETED and ABANDONED events
-    time_in_funnel_seconds: Optional[int] = Field(
-        default=None,
-        description="Total time spent in the funnel (for COMPLETED and ABANDONED)"
-    )
-    time_in_last_stage_seconds: Optional[int] = Field(
-        default=None,
-        description="Time spent in the last stage before completion/abandonment"
-    )
-
+    funnel_id: StrObjectId
+    funnel_stage_transition: StageTransition
+    time_in_funnel_seconds: Optional[int] = None
 
 class ChatFunnelEvent(Event):
-    """
-    Event for tracking chat funnel lifecycle.
-    
-    Events:
-    - CHAT_FUNNEL_STARTED: Chat entered a funnel
-    - CHAT_FUNNEL_STAGE_CHANGED: Chat moved between stages
-    - CHAT_FUNNEL_COMPLETED: Chat completed the funnel
-    - CHAT_FUNNEL_ABANDONED: Chat abandoned the funnel
-    """
+    """Event for tracking chat funnel stage transitions"""
     data: FunnelEventData
 
+    # Define valid event types for this event class
     VALID_TYPES: ClassVar[set] = {
+        EventType.CHAT_FUNNEL_UPDATED,
         EventType.CHAT_FUNNEL_STARTED,
-        EventType.CHAT_FUNNEL_STAGE_CHANGED,
         EventType.CHAT_FUNNEL_COMPLETED,
         EventType.CHAT_FUNNEL_ABANDONED
     }
 
+
     @field_validator('data')
     def validate_data_fields(cls, v: FunnelEventData, info: ValidationInfo):
         """Validate that appropriate fields are set based on event type"""
-        event_type = info.data.get('type')
-        
-        # STARTED: requires stage_transition
-        if event_type == EventType.CHAT_FUNNEL_STARTED:
-            if v.stage_transition is None:
-                raise ValueError("stage_transition must be set for CHAT_FUNNEL_STARTED events")
-        
-        # STAGE_CHANGED: requires stage_transition with time_in_previous_stage_seconds
-        elif event_type == EventType.CHAT_FUNNEL_STAGE_CHANGED:
-            if v.stage_transition is None:
-                raise ValueError("stage_transition must be set for CHAT_FUNNEL_STAGE_CHANGED events")
-            if v.stage_transition.time_in_previous_stage_seconds is None:
-                raise ValueError("time_in_previous_stage_seconds must be set in stage_transition for CHAT_FUNNEL_STAGE_CHANGED events")
-        
-        # COMPLETED: requires time metrics
-        elif event_type == EventType.CHAT_FUNNEL_COMPLETED:
-            if v.time_in_funnel_seconds is None:
-                raise ValueError("time_in_funnel_seconds must be set for CHAT_FUNNEL_COMPLETED events")
-            if v.time_in_last_stage_seconds is None:
-                raise ValueError("time_in_last_stage_seconds must be set for CHAT_FUNNEL_COMPLETED events")
-        
-        # ABANDONED: requires time metrics
-        elif event_type == EventType.CHAT_FUNNEL_ABANDONED:
-            if v.time_in_funnel_seconds is None:
-                raise ValueError("time_in_funnel_seconds must be set for CHAT_FUNNEL_ABANDONED events")
-            if v.time_in_last_stage_seconds is None:
-                raise ValueError("time_in_last_stage_seconds must be set for CHAT_FUNNEL_ABANDONED events")
-        
+        if info.data.get('type') == EventType.CHAT_FUNNEL_UPDATED and v.time_in_funnel_seconds is None:
+            raise ValueError("time_in_funnel_seconds must be set for CHAT_FUNNEL_UPDATED events")
+        if info.data.get('type') == EventType.CHAT_FUNNEL_UPDATED and v.funnel_stage_transition.time_in_previous_stage_seconds is None:
+            raise ValueError("time_in_previous_stage_seconds must be set for CHAT_FUNNEL_UPDATED events")
         return v
 
     def model_dump_json(self, *args, **kwargs):
         dump = json.loads(super().model_dump_json(*args, **kwargs))
         dump['data'] = self.data.model_dump_json()
-        return dump
+        return dump

letschatty/models/analytics/events/company_based_events/asset_events.py

@@ -58,9 +58,6 @@ class AssetEvent(Event):
         EventType.FUNNEL_STAGE_CREATED,
         EventType.FUNNEL_STAGE_UPDATED,
         EventType.FUNNEL_STAGE_DELETED,
-        EventType.FUNNEL_MEMBER_ADDED,
-        EventType.FUNNEL_MEMBER_UPDATED,
-        EventType.FUNNEL_MEMBER_REMOVED,
         EventType.WORKFLOW_CREATED,
         EventType.WORKFLOW_UPDATED,
         EventType.WORKFLOW_DELETED,
@@ -73,9 +70,6 @@ class AssetEvent(Event):
         EventType.FILTER_CRITERIA_CREATED,
         EventType.FILTER_CRITERIA_UPDATED,
         EventType.FILTER_CRITERIA_DELETED,
-        EventType.FORM_FIELD_CREATED,
-        EventType.FORM_FIELD_UPDATED,
-        EventType.FORM_FIELD_DELETED,
         EventType.COMPANY_CREATED,
         EventType.COMPANY_UPDATED,
         EventType.COMPANY_DELETED
@@ -83,9 +77,8 @@ class AssetEvent(Event):
 
     @model_validator(mode='after')
     def validate_data_fields(self):
-        # Asset is not required for deleted/removed events
-        if "deleted" not in self.type.value and "removed" not in self.type.value and not self.data.asset:
-            raise ValueError("asset must be set for all events except DELETED/REMOVED")
+        if "deleted" not in self.type.value and not self.data.asset:
+            raise ValueError("asset must be set for all events except DELETED")
         return self
 
     def model_dump_json(self, *args, **kwargs):

letschatty/models/analytics/events/event_type_to_classes.py

@@ -8,7 +8,6 @@ EVENT_TO_TYPE_CLASSES = {
     EventType.CHAT_CREATED : ChatStatusEvent,
     EventType.CHAT_STATUS_UPDATED : ChatStatusEvent,
     EventType.CHAT_DELETED : ChatStatusEvent,
-    EventType.CHAT_CLIENT_UPDATED : ChatClientEvent,
     #TAGS
     EventType.TAG_ASSIGNED : TagChatEvent,
     EventType.TAG_REMOVED : TagChatEvent,
@@ -42,9 +41,10 @@ EVENT_TO_TYPE_CLASSES = {
     #CONTINUOUS CONVERSATION
     EventType.CONTINUOUS_CONVERSATION_CREATED : ContinuousConversationEvent,
     EventType.CONTINUOUS_CONVERSATION_UPDATED : ContinuousConversationEvent,
-    #CHAT FUNNEL EVENTS
+    #FUNNEL STAGES
+    # Funnel-level events
     EventType.CHAT_FUNNEL_STARTED : ChatFunnelEvent,
-    EventType.CHAT_FUNNEL_STAGE_CHANGED : ChatFunnelEvent,
+    EventType.CHAT_FUNNEL_UPDATED : ChatFunnelEvent,
     EventType.CHAT_FUNNEL_COMPLETED : ChatFunnelEvent,
     EventType.CHAT_FUNNEL_ABANDONED : ChatFunnelEvent,
 
@@ -86,10 +86,6 @@ EVENT_TO_TYPE_CLASSES = {
     EventType.WORKFLOW_CREATED : AssetEvent,
     EventType.WORKFLOW_UPDATED : AssetEvent,
     EventType.WORKFLOW_DELETED : AssetEvent,
-    #FORM FIELDS
-    EventType.FORM_FIELD_CREATED : AssetEvent,
-    EventType.FORM_FIELD_UPDATED : AssetEvent,
-    EventType.FORM_FIELD_DELETED : AssetEvent,
     #AGENTS
     EventType.USER_CREATED : UserEvent,
     EventType.USER_UPDATED : UserEvent,