Update app.py

app.py

@@ -1,4 +1,6 @@
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, HTTPException
+from pydantic import BaseModel
+from typing import Optional
 from huggingface_hub import InferenceClient
 import uvicorn
 
@@ -6,35 +8,36 @@ app = FastAPI()
 
 client = InferenceClient("scb10x/llama-3-typhoon-v1.5-8b-instruct")
 
+class Query(BaseModel):
+    queryResult: Optional[dict] = None
+    queryText: Optional[str] = None
+
 @app.post("/webhook")
-async def webhook(request: Request):
-    # รับข้อมูลจาก Dialogflow
-    data = await request.json()
-    query_text = data['queryResult']['queryText']
-    
-    # สร้าง messages สำหรับ Huggingface API
-    messages = [
-        {"role": "system", "content": "You are a friendly Chatbot."},
-        {"role": "user", "content": query_text}
-    ]
-    
-    # เรียกใช้ Huggingface API
-    response = client.chat_completion(
-        messages,
-        max_tokens=512,
-        temperature=0.7,
-        top_p=0.95,
-    )
-    
-    # ดึงข้อความตอบกลับ
-    answer = response.choices[0].message.content
-    
-    # สร้างการตอบกลับสำหรับ Dialogflow
-    dialogflow_response = {
-        "fulfillmentText": answer,
-    }
-    
-    return dialogflow_response
+async def webhook(query: Query):
+    try:
+        # ใช้ queryText จาก queryResult ถ้ามี มิฉะนั้นใช้ queryText โดยตรง
+        user_query = query.queryResult.get('queryText') if query.queryResult else query.queryText
+        
+        if not user_query:
+            raise HTTPException(status_code=400, detail="No query text provided")
+
+        messages = [
+            {"role": "system", "content": "You are a friendly Chatbot."},
+            {"role": "user", "content": user_query}
+        ]
+
+        response = client.chat_completion(
+            messages,
+            max_tokens=512,
+            temperature=0.7,
+            top_p=0.95,
+        )
+
+        model_reply = response.choices[0].message.content.strip()
+        
+        return {"fulfillmentText": model_reply}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)