Spaces:

devpatel1012
/

shl-recommender

Sleeping

App Files Files Community

devpatel1012 commited on Jul 2

Commit

71a3245

1 Parent(s): 4e7c264

updated main.py

Browse files

Files changed (1) hide show

app/main.py +37 -65

app/main.py CHANGED Viewed

@@ -1,25 +1,45 @@
 from fastapi import FastAPI
 from fastapi.responses import HTMLResponse
 from contextlib import asynccontextmanager
-from app.schemas import ChatRequest, ChatResponse
 from app.database import db_manager
 from app.agent import shl_agent
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    # Setup step executed before the API server accepts traffic
     catalog_file_path = "shl_product_catalog.json"
     db_manager.initialize_catalog(catalog_file_path)
     yield
 app = FastAPI(lifespan=lifespan)
-# --- FRONTEND HTML & JS ---
 html_content = """
 <!DOCTYPE html>
 <html>
 <head>
-    <title>SHL Assessment Recommender</title>
     <style>
         body { font-family: Arial, sans-serif; max-width: 800px; margin: 0 auto; padding: 20px; background-color: #f4f4f9; }
         #chat-container { background: white; padding: 20px; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1); height: 500px; overflow-y: auto; margin-bottom: 20px; }
@@ -33,7 +53,6 @@ html_content = """
         .input-area { display: flex; gap: 10px; }
         input[type="text"] { flex-grow: 1; padding: 10px; border: 1px solid #ccc; border-radius: 4px; }
         button { padding: 10px 20px; background-color: #2196f3; color: white; border: none; border-radius: 4px; cursor: pointer; }
-        button:hover { background-color: #0b7dda; }
     </style>
 </head>
 <body>
@@ -41,83 +60,43 @@ html_content = """
     <div id="chat-container">
         <div class="message system">Start a conversation. E.g., "I'm hiring a Java developer."</div>
     </div>
     <div class="input-area">
-        <input type="text" id="user-input" placeholder="Type your message here..." onkeypress="if(event.key === 'Enter') sendMessage()">
         <button onclick="sendMessage()">Send</button>
     </div>
     <script>
-        // CLIENT-SIDE MEMORY: this array holds the stateless conversation history.
-        // NOTE: Agent turns now also carry `recommendations`, mirroring the
-        // structured list the server returned for that turn. This is required
-        // for confirmation/"that works" turns to reuse the REAL prior shortlist
-        // instead of the model having to recall it from plain text.
         let conversationHistory = [];
         async function sendMessage() {
             const inputField = document.getElementById('user-input');
             const userText = inputField.value.trim();
             if (!userText) return;
             const chatContainer = document.getElementById('chat-container');
-            // 1. Add User Message to UI & History
             chatContainer.innerHTML += `<div class="message user"><strong>You:</strong> ${userText}</div>`;
-            conversationHistory.push({ "role": "User", "content": userText });
             inputField.value = '';
-            chatContainer.scrollTop = chatContainer.scrollHeight;
-            // 2. Add loading indicator
-            const loadingId = "loading-" + Date.now();
-            chatContainer.innerHTML += `<div id="${loadingId}" class="message system">Consultant is typing...</div>`;
-            chatContainer.scrollTop = chatContainer.scrollHeight;
             try {
-                // 3. Send stateless array to FastAPI backend
                 const response = await fetch('/chat', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ conversation: conversationHistory })
                 });
                 const data = await response.json();
-                document.getElementById(loadingId).remove();
-                // 4. Format Agent Reply & Recommendations
-                let agentHtml = `<strong>Consultant:</strong> ${data.reply}`;
-                if (data.recommendations && data.recommendations.length > 0) {
-                    agentHtml += `<table><tr><th>Test Name</th><th>Type</th><th>Link</th></tr>`;
-                    data.recommendations.forEach(rec => {
-                        agentHtml += `<tr>
-                            <td>${rec.name}</td>
-                            <td>${rec.test_type}</td>
-                            <td><a href="${rec.url}" target="_blank">View</a></td>
-                        </tr>`;
-                    });
-                    agentHtml += `</table>`;
-                }
-                // Add Agent Message to UI & History (recommendations included!)
-                chatContainer.innerHTML += `<div class="message agent">${agentHtml}</div>`;
-                conversationHistory.push({
-                    "role": "Agent",
-                    "content": data.reply,
-                    "recommendations": data.recommendations && data.recommendations.length > 0 ? data.recommendations : null
-                });
-                // 5. Handle Memory Wipe on Conversation End
                 if (data.end_of_conversation) {
-                    chatContainer.innerHTML += `<div class="message system">--- Conversation Closed. Memory wiped for next session. ---</div>`;
-                    conversationHistory = []; // Wipes the memory instantly
                 }
             } catch (error) {
-                document.getElementById(loadingId).remove();
-                chatContainer.innerHTML += `<div class="message system" style="color: red;">Error connecting to server.</div>`;
             }
             chatContainer.scrollTop = chatContainer.scrollHeight;
         }
     </script>
@@ -125,10 +104,8 @@ html_content = """
 </html>
 """
-# --- ROUTES ---
 @app.get("/", response_class=HTMLResponse)
 async def get_frontend():
-    # Serves the UI directly at the root URL
     return html_content
 @app.get("/health")
@@ -137,18 +114,13 @@ def health_check():
 @app.post("/chat", response_model=ChatResponse)
 def chat_endpoint(request: ChatRequest):
-    # All orchestration (NLU -> planner -> retrieval -> responder -> validation)
-    # now lives in app.agent.SHLAgent.handle_conversation. The endpoint itself
-    # is just I/O plus a safety net for unexpected pipeline failures.
     try:
-        response_dict = shl_agent.handle_conversation(request.conversation)
         return ChatResponse(**response_dict)
     except Exception as e:
-        import traceback
-        traceback.print_exc()
         return ChatResponse(
-            reply="I ran into an issue processing that — could you rephrase it?",
             recommendations=[],
             end_of_conversation=False
         )

 from fastapi import FastAPI
 from fastapi.responses import HTMLResponse
+from pydantic import BaseModel, Field
 from contextlib import asynccontextmanager
+from typing import List, Optional
 from app.database import db_manager
 from app.agent import shl_agent
+# 1. Define Schemas inside main.py to ensure compliance
+class Recommendation(BaseModel):
+    name: str
+    url: str
+    test_type: str
+class ChatMessage(BaseModel):
+    role: str
+    content: str
+class ChatRequest(BaseModel):
+    # CRITICAL: The grader expects 'messages', not 'conversation'
+    messages: List[ChatMessage]
+class ChatResponse(BaseModel):
+    reply: str
+    recommendations: List[Recommendation] = Field(default_factory=list)
+    end_of_conversation: bool = False
+# 2. Lifecycle
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     catalog_file_path = "shl_product_catalog.json"
     db_manager.initialize_catalog(catalog_file_path)
     yield
 app = FastAPI(lifespan=lifespan)
+# 3. Frontend UI
 html_content = """
 <!DOCTYPE html>
 <html>
 <head>
+    <title>SHL Assessment Consultant</title>
     <style>
         body { font-family: Arial, sans-serif; max-width: 800px; margin: 0 auto; padding: 20px; background-color: #f4f4f9; }
         #chat-container { background: white; padding: 20px; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1); height: 500px; overflow-y: auto; margin-bottom: 20px; }
         .input-area { display: flex; gap: 10px; }
         input[type="text"] { flex-grow: 1; padding: 10px; border: 1px solid #ccc; border-radius: 4px; }
         button { padding: 10px 20px; background-color: #2196f3; color: white; border: none; border-radius: 4px; cursor: pointer; }
     </style>
 </head>
 <body>
     <div id="chat-container">
         <div class="message system">Start a conversation. E.g., "I'm hiring a Java developer."</div>
     </div>
     <div class="input-area">
+        <input type="text" id="user-input" placeholder="Type your message..." onkeypress="if(event.key === 'Enter') sendMessage()">
         <button onclick="sendMessage()">Send</button>
     </div>
     <script>
         let conversationHistory = [];
         async function sendMessage() {
             const inputField = document.getElementById('user-input');
             const userText = inputField.value.trim();
             if (!userText) return;
             const chatContainer = document.getElementById('chat-container');
             chatContainer.innerHTML += `<div class="message user"><strong>You:</strong> ${userText}</div>`;
+            conversationHistory.push({ "role": "user", "content": userText });
             inputField.value = '';
             try {
+                // CRITICAL: Sending 'messages' key, not 'conversation'
                 const response = await fetch('/chat', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ messages: conversationHistory })
                 });
                 const data = await response.json();
+                chatContainer.innerHTML += `<div class="message agent"><strong>Consultant:</strong> ${data.reply}</div>`;
+                conversationHistory.push({ "role": "assistant", "content": data.reply });
                 if (data.end_of_conversation) {
+                    conversationHistory = [];
                 }
             } catch (error) {
+                chatContainer.innerHTML += `<div class="message system" style="color:red;">Error.</div>`;
             }
             chatContainer.scrollTop = chatContainer.scrollHeight;
         }
     </script>
 </html>
 """
 @app.get("/", response_class=HTMLResponse)
 async def get_frontend():
     return html_content
 @app.get("/health")
 @app.post("/chat", response_model=ChatResponse)
 def chat_endpoint(request: ChatRequest):
     try:
+        # CRITICAL: Processing 'messages' not 'conversation'
+        response_dict = shl_agent.handle_conversation(request.messages)
         return ChatResponse(**response_dict)
     except Exception as e:
         return ChatResponse(
+            reply="I ran into an issue — could you rephrase it?",
             recommendations=[],
             end_of_conversation=False
         )