Fix master api call

main.py

@@ -3,7 +3,7 @@ from fastapi.responses import Response
 import logging
 import uvicorn
 from twilio.rest import Client as TW_Client
-import requests
+import requests, json
 from gradio_client import Client as GR_Client, handle_file
 from helper_functions import get_secret
 
@@ -30,42 +30,21 @@ AURA_URL = get_secret("AURA_URL")
 
 client = TW_Client(account_sid, auth_token)
 
-# gr_client = GR_Client(AURA_URL, hf_token=HUG_TOKEN)
-
 app = FastAPI()
 
-# Serving as JSON NOT POSSIBLE  !!!, so serve it as txt next time.
-# New route to serve the JSON file from /aura_response path
-# @app.get("/aura_response/{filename}")
-# async def get_file(filename: str):
-#     file_path = os.path.join(os.getcwd(), filename)
-#     if os.path.exists(file_path):
-#         return Response(content=open(file_path, "rb").read(), media_type="text/richtext")
-#     return {"error": "File not found"}
-
-# def call_aura(audio_path):
-#     logger.info(f"Calling AURA with audio file: {audio_path}")
-#     try:
-#         result = gr_client.predict(
-#             audio=handle_file(audio_path),
-#             llm_name="deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
-#             api_name="/get_aura_response"
-#         )
-#     except Exception as e:
-#         eror_msg = f"An unexpected error occurred: {e}"
-#         logger.error(eror_msg)
-#         raise eror_msg
-#     # logger.info(f"AURA response: {result}")
-#     return result[0]
-
-def call_aura_master(url, payload):
+def call_aura_master(url, payload, file=None):
     headers = {
-        "Content-Type": "application/json",
+        # "Content-Type": "application/json",
         "Authorization": f"Bearer {HUG_TOKEN}"
     }
 
+    if file:
+        logger.info(f"Calling {url} with file: {file}")
+    else:
+        logger.info(f"Calling {url} with payload: {payload}")
+
     try:
-        response = requests.post(url, json=payload, headers=headers)
+        response = requests.post(url, data=payload, headers=headers, files=file)
         response.raise_for_status()
         logger.info(f"Post request successfull")
         return response
@@ -74,14 +53,14 @@ def call_aura_master(url, payload):
         raise e
 
 
-def call_add_message(message):
+def call_add_message(message, file=None):
     url = f"{AURA_URL}/add_message"
     payload = {
         "message": message,
-        "history": []
+        "history": json.dumps([])
     }
 
-    response = call_aura_master(url, payload)
+    response = call_aura_master(url, payload, file)
     history = response.json()["history"]
     return history
 
@@ -89,15 +68,15 @@ def call_add_message(message):
 def call_bot(history, system_prompt):
     url = f"{AURA_URL}/bot"
     payload = {
-        "history": history,
+        "history": json.dumps(history),
         "system_prompt": system_prompt
     }
     response = call_aura_master(url, payload)
-    return response.text
+    return response
 
 
 
-@app.post("/webhook")
+@app.post("/webhook_whatsapp")
 async def receive_audio(request: Request):
     data = await request.form()
     
@@ -117,52 +96,41 @@ async def receive_audio(request: Request):
     
     print(data.get('MediaUrl0'))
     print(data.get("MediaContentType0"))
+    print(data.get("MediaFileExtension0"))
+    print(data.get("Body"))
+
+    files = None
 
     if media_url:
-        # auth = (account_sid, auth_token)
-        # response = requests.get(media_url, auth=auth)
+        auth = (account_sid, auth_token)
+        response = requests.get(media_url, auth=auth)
         
         # # Save audio file
-        # file_extension = data.get("MediaContentType0").split("/")[-1]
-        # # filename = f"whatsapp_audio.{file_extension}"
-        
+        file_extension = data.get("MediaContentType0").split("/")[-1]
         # filename = f"whatsapp_audio.{file_extension}"
-        # with open(filename, "wb") as audio_file:
-        #     audio_file.write(response.content)
-    
-        last_message = {
-            "text": data.get('Body'),
-            "files": [media_url]
-        }
-    else:
-        last_message = {
-            "text": data.get('Body'),
-            "files": []
-        }
+        
+        filename = f"whatsapp_audio.{file_extension}"
+        with open(filename, "wb") as audio_file:
+            audio_file.write(response.content)
 
+        files = {
+            "file": open(filename, "rb")
+        }
 
-    print(last_message)
+    history = call_add_message(data.get("Body"), files)
 
-    history = call_add_message(last_message)
+    if not history:
+        raise ValueError("History is empty")
     
     print(history)
 
     # Filter file elements out of history
     history = [h for h in history if isinstance(h["content"], str)]
 
-    result = call_bot(
+    response = call_bot(
             history,
             system_prompt="Contexte: Tu es AURA, un expert en prospection et en stratégie commerciale, capable d'analyser les besoins des clients et d'optimiser les approches de vente pour maximiser les résultats.",
         )
-    
-    print(result)
-
-    message = client.messages.create(
-            from_=from_whatsapp_number,
-            body=result[:1580], # 1600 charactères max.
-            # media_url='https://34ca-64-43-47-200.ngrok-free.app/aura_response/aura_response.json',
-            to=to_whatsapp_number
-            )
 
     # if media_url:
         # media_type = data.get("MediaContentType0")
@@ -206,7 +174,20 @@ async def receive_audio(request: Request):
         
         # os.remove(filename)
 
-    return Response(content=str(message), media_type="application/xml")
+    if response.status_code != 200:
+        message = client.messages.create(
+                from_=from_whatsapp_number,
+                body="Une erreur s'est produite lors du traitement de votre message. Veuillez réessayer plus tard.",
+                to=to_whatsapp_number
+                )
+    else:
+        message = client.messages.create(
+                from_=from_whatsapp_number,
+                body=response.text[:1599],
+                to=to_whatsapp_number
+                )
+
+    return Response(content=json.dumps({"sid": message.sid, "status": message.status, "body": message.body}), media_type="application/json")
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)