OpenAI Conversation: Lookup

backend/app/api/routes/openai_conversation.py

@@ -10,7 +10,6 @@
     get_conversation_by_ancestor_id,
     get_conversations_by_project,
     get_conversations_count_by_project,
-    create_conversation,
     delete_conversation,
 )
 from app.models import (

backend/app/api/routes/responses.py

@@ -11,7 +11,12 @@
 from app.api.routes.threads import send_callback
 from app.crud.assistants import get_assistant_by_id
 from app.crud.credentials import get_provider_credential
-from app.models import UserProjectOrg
+from app.crud.openai_conversation import (
+    create_conversation,
+    get_ancestor_id_from_response,
+    get_conversation_by_ancestor_id,
+)
+from app.models import UserProjectOrg, OpenAIConversationCreate
 from app.utils import APIResponse, mask_string
 from app.core.langfuse.langfuse import LangfuseTracer
 
@@ -21,8 +26,20 @@
 
 def handle_openai_error(e: openai.OpenAIError) -> str:
     """Extract error message from OpenAI error."""
-    if isinstance(e.body, dict) and "message" in e.body:
+    # Try to get error message from different possible attributes
+    if hasattr(e, "body") and isinstance(e.body, dict) and "message" in e.body:
         return e.body["message"]
+    elif hasattr(e, "message"):
+        return e.message
+    elif hasattr(e, "response") and hasattr(e.response, "json"):
+        try:
+            error_data = e.response.json()
+            if isinstance(error_data, dict) and "error" in error_data:
+                error_info = error_data["error"]
+                if isinstance(error_info, dict) and "message" in error_info:
+                    return error_info["message"]
+        except:
+            pass
     return str(e)
 
 
@@ -98,6 +115,8 @@ def process_response(
     assistant,
     tracer: LangfuseTracer,
     project_id: int,
+    organization_id: int,
+    session: Session,
 ):
     """Process a response and send callback with results, with Langfuse tracing."""
     logger.info(
@@ -117,9 +136,21 @@ def process_response(
     )
 
     try:
+        # Get the latest conversation by ancestor ID to use as previous_response_id
+        ancestor_id = request.response_id
+        latest_conversation = None
+        if ancestor_id:
+            latest_conversation = get_conversation_by_ancestor_id(
+                session=session,
+                ancestor_response_id=ancestor_id,
+                project_id=project_id,
+            )
+            if latest_conversation:
+                ancestor_id = latest_conversation.response_id
+
         params = {
             "model": assistant.model,
-            "previous_response_id": request.response_id,
+            "previous_response_id": ancestor_id,
             "instructions": assistant.instructions,
             "temperature": assistant.temperature,
             "input": [{"role": "user", "content": request.question}],
@@ -165,6 +196,35 @@ def process_response(
                 "error": None,
             },
         )
+        # Set ancestor_response_id using CRUD function
+        ancestor_response_id = (
+            latest_conversation.ancestor_response_id
+            if latest_conversation
+            else get_ancestor_id_from_response(
+                session=session,
+                current_response_id=response.id,
+                previous_response_id=response.previous_response_id,
+                project_id=project_id,
+            )
+        )
+
+        # Create conversation record in database
+        conversation_data = OpenAIConversationCreate(
+            response_id=response.id,
+            previous_response_id=response.previous_response_id,
+            ancestor_response_id=ancestor_response_id,
+            user_question=request.question,
+            response=response.output_text,
+            model=response.model,
+            assistant_id=request.assistant_id,
+        )
+
+        create_conversation(
+            session=session,
+            conversation=conversation_data,
+            project_id=project_id,
+            organization_id=organization_id,
+        )
 
         request_dict = request.model_dump()
         callback_response = ResponsesAPIResponse.success_response(
@@ -264,6 +324,8 @@ async def responses(
         assistant,
         tracer,
         project_id,
+        organization_id,
+        _session,
     )
 
     logger.info(

backend/app/crud/openai_conversation.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 from sqlmodel import Session, select, func
+
 from app.models import OpenAIConversation, OpenAIConversationCreate
 from app.core.util import now
 
@@ -57,6 +58,47 @@ def get_conversation_by_ancestor_id(
     return result
 
 
+def get_ancestor_id_from_response(
+    session: Session,
+    current_response_id: str,
+    previous_response_id: str | None,
+    project_id: int,
+) -> str:
+    """
+    Set the ancestor_response_id based on previous_response_id.
+
+    Logic:
+    1. If previous_response_id is None, then ancestor_response_id = current_response_id
+    2. If previous_response_id is not None, look in db for that ID
+       - If found, use that conversation's ancestor_id
+       - If not found, ancestor_response_id = previous_response_id
+
+    Args:
+        session: Database session
+        current_response_id: The current response ID
+        previous_response_id: The previous response ID (can be None)
+        project_id: The project ID for scoping the search
+
+    Returns:
+        str: The determined ancestor_response_id
+    """
+    if previous_response_id is None:
+        # If previous_response_id is None, then ancestor_response_id = current_response_id
+        return current_response_id
+
+    # If previous_response_id is not None, look in db for that ID
+    previous_conversation = get_conversation_by_response_id(
+        session=session, response_id=previous_response_id, project_id=project_id
+    )
+
+    if previous_conversation:
+        # If found, use that conversation's ancestor_id
+        return previous_conversation.ancestor_response_id
+    else:
+        # If not found, ancestor_response_id = previous_response_id
+        return previous_response_id
+
+
 def get_conversations_count_by_project(
     session: Session,
     project_id: int,

backend/app/models/openai_conversation.py

@@ -1,7 +1,7 @@
-from datetime import datetime
-from typing import Optional
 import re
 
+from datetime import datetime
+from typing import Optional
 from pydantic import field_validator
 from sqlmodel import Field, Relationship, SQLModel
 

backend/app/tests/api/routes/test_openai_conversation.py

@@ -1,8 +1,8 @@
 from sqlmodel import Session
 from fastapi.testclient import TestClient
 
-from app.models import APIKeyPublic
 from app.crud.openai_conversation import create_conversation
+from app.models import APIKeyPublic
 from app.models import OpenAIConversationCreate
 from app.tests.utils.openai import generate_openai_id
 
@@ -431,7 +431,6 @@ def test_delete_conversation_success(
         project_id=user_api_key.project_id,
         organization_id=user_api_key.organization_id,
     )
-
     conversation_id = conversation.id
 
     response = client.delete(