added latest models

app/models.py

@@ -191,7 +191,7 @@ class Form(Base):
     questions: Mapped[list["FormQuestion"]] = relationship(back_populates="form", cascade="all, delete-orphan", order_by="FormQuestion.question_order")
     conditional_rules: Mapped[list["ConditionalRule"]] = relationship(back_populates="form", cascade="all, delete-orphan")
     responses: Mapped[list["FormResponse"]] = relationship(back_populates="form", cascade="all, delete-orphan")
-    chat_messages_form: Mapped[list["ChatMessageForm"]] = relationship(back_populates="form", cascade="all, delete-orphan")
+    chat_messages: Mapped[list["ChatMessage"]] = relationship(back_populates="form", cascade="all, delete-orphan")
     versions: Mapped[list["FormVersion"]] = relationship(back_populates="form", cascade="all, delete-orphan")
     analytics_events: Mapped[list["FormAnalyticsEvent"]] = relationship(back_populates="form", cascade="all, delete-orphan")
     uploads: Mapped[list["FormUpload"]] = relationship(back_populates="form", cascade="all, delete-orphan")
@@ -351,23 +351,32 @@ class PublicForm(Base):
     user: Mapped[User] = relationship(back_populates="public_forms")
 
 
-class ChatMessageForm(Base):
-    """Chat messages for form editing context"""
-    __tablename__ = "chat_messages_form"
+class ChatMessage(Base):
+    """Unified chat messages for all AI assistant conversations (form editing + response analysis)"""
+    __tablename__ = "chat_messages"
     
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     form_id: Mapped[int] = mapped_column(ForeignKey("forms.id"), index=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), index=True)
     
+    # Chat type: "form_editing" for add/edit, "response_analysis" for queries
+    chat_type: Mapped[str] = mapped_column(String(30), default="form_editing", index=True)
+    
     role: Mapped[str] = mapped_column(String(20))  # "user", "assistant"
     content: Mapped[str] = mapped_column(Text)
-    query_type: Mapped[str | None] = mapped_column(String(50), nullable=True)
-    question_index: Mapped[int | None] = mapped_column(Integer, nullable=True)  # If related to a specific question
+    query_type: Mapped[str | None] = mapped_column(String(50), nullable=True)  # e.g., "add_component", "edit_component", "summary", "filter"
+    
+    # Form editing specific
+    question_index: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    
+    # Response analysis specific  
+    sql_query: Mapped[str | None] = mapped_column(Text, nullable=True)
+    result_data: Mapped[dict | None] = mapped_column(JSON, nullable=True)
     
     created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, index=True)
     
     # Relationships
-    form: Mapped[Form] = relationship(back_populates="chat_messages_form")
+    form: Mapped[Form] = relationship(back_populates="chat_messages")
     user: Mapped[User] = relationship()
 
 
@@ -466,24 +475,3 @@ class WebhookConfig(Base):
     user: Mapped[User] = relationship()
 
 
-class ResponseChatMessage(Base):
-    """Chat messages for response analysis conversations"""
-    __tablename__ = "response_chat_messages"
-    
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
-    form_id: Mapped[int] = mapped_column(ForeignKey("forms.id"), index=True)
-    user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), index=True)
-    
-    role: Mapped[str] = mapped_column(String(20))  # "user", "assistant"
-    content: Mapped[str] = mapped_column(Text)
-    
-    # Metadata for analysis results
-    query_type: Mapped[str | None] = mapped_column(String(50), nullable=True)  # "summary", "filter", "aggregate", "sentiment", "export"
-    sql_query: Mapped[str | None] = mapped_column(Text, nullable=True)  # Generated SQL query
-    result_data: Mapped[dict | None] = mapped_column(JSON, nullable=True)  # Query results or analysis data
-    
-    created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, index=True)
-    
-    # Relationships
-    form: Mapped[Form] = relationship()
-    user: Mapped[User] = relationship()

app/routes/responses.py

@@ -920,7 +920,7 @@ async def delete_response(
 # ============================================================================
 
 from pydantic import BaseModel
-from ..models import ResponseChatMessage
+from ..models import ChatMessage
 from ..services.response_chat_service import response_chat_service
 from ..services.agents import response_chat_module
 
@@ -930,11 +930,12 @@ class ResponseChatRequest(BaseModel):
     message: str
 
 
-class ResponseChatMessageResponse(BaseModel):
+class ChatMessageResponse(BaseModel):
     """Response model for a single chat message."""
     id: int
     role: str
     content: str
+    chat_type: str = "response_analysis"
     query_type: str | None = None
     sql_query: str | None = None
     result_data: dict | None = None
@@ -946,7 +947,7 @@ class ResponseChatMessageResponse(BaseModel):
 
 class ResponseChatResponse(BaseModel):
     """Response model for chat endpoint."""
-    message: ResponseChatMessageResponse
+    message: ChatMessageResponse
     query_type: str
     data: dict | None = None
 
@@ -1107,7 +1108,7 @@ async def chat_with_responses(
         conn.close()
         
         return {
-            "message": ResponseChatMessageResponse.model_validate(assistant_message),
+            "message": ChatMessageResponse.model_validate(assistant_message),
             "query_type": query_type,
             "data": result_data
         }
@@ -1148,7 +1149,7 @@ async def get_response_chat_history(
     )
     
     return {
-        "messages": [ResponseChatMessageResponse.model_validate(msg) for msg in history],
+        "messages": [ChatMessageResponse.model_validate(msg) for msg in history],
         "total": len(history)
     }
 
@@ -1172,10 +1173,11 @@ async def clear_response_chat_history(
             detail="Form not found"
         )
     
-    # Delete all chat messages for this form and user
-    db.query(ResponseChatMessage).filter(
-        ResponseChatMessage.form_id == form_id,
-        ResponseChatMessage.user_id == current_user.id
+    # Delete all response analysis chat messages for this form and user
+    db.query(ChatMessage).filter(
+        ChatMessage.form_id == form_id,
+        ChatMessage.user_id == current_user.id,
+        ChatMessage.chat_type == "response_analysis"
     ).delete()
     db.commit()
     

app/services/response_chat_service.py

@@ -15,7 +15,7 @@ from typing import Dict, Any, List, Optional, Tuple
 from datetime import datetime
 from sqlalchemy.orm import Session
 
-from ..models import Form, FormQuestion, FormResponse, ResponseAnswer, ResponseChatMessage, User
+from ..models import Form, FormQuestion, FormResponse, ResponseAnswer, ChatMessage, User
 
 logger = logging.getLogger(__name__)
 
@@ -411,14 +411,16 @@ class ResponseChatService:
         user_id: int,
         role: str,
         content: str,
+        chat_type: str = "response_analysis",
         query_type: Optional[str] = None,
         sql_query: Optional[str] = None,
         result_data: Optional[Dict] = None
-    ) -> ResponseChatMessage:
+    ) -> ChatMessage:
         """Save a chat message to the database."""
-        message = ResponseChatMessage(
+        message = ChatMessage(
             form_id=form_id,
             user_id=user_id,
+            chat_type=chat_type,
             role=role,
             content=content,
             query_type=query_type,
@@ -435,22 +437,24 @@ class ResponseChatService:
         db: Session,
         form_id: int,
         user_id: int,
+        chat_type: str = "response_analysis",
         limit: int = None
-    ) -> List[ResponseChatMessage]:
+    ) -> List[ChatMessage]:
         """Get chat history for a form."""
         limit = limit or self.max_history_messages
         
-        messages = db.query(ResponseChatMessage).filter(
-            ResponseChatMessage.form_id == form_id,
-            ResponseChatMessage.user_id == user_id
-        ).order_by(ResponseChatMessage.created_at.desc()).limit(limit).all()
+        messages = db.query(ChatMessage).filter(
+            ChatMessage.form_id == form_id,
+            ChatMessage.user_id == user_id,
+            ChatMessage.chat_type == chat_type
+        ).order_by(ChatMessage.created_at.desc()).limit(limit).all()
         
         # Return in chronological order
         return list(reversed(messages))
     
     def format_history_for_context(
         self,
-        history: List[ResponseChatMessage]
+        history: List[ChatMessage]
     ) -> str:
         """Format chat history as context for the AI."""
         if not history: