API fixes

api/main_api.py

@@ -1,23 +1,28 @@
+import sys
+import os
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
 from fastapi import FastAPI, Request, Form
 from fastapi.responses import PlainTextResponse
 from pydantic import BaseModel
-from agents.assistant import ask_jarvis, reset_agents_cache
+from agents.session import ask_jarvis, reset_cache
+from enums.core_enums import ModelEnum
+from config import DEFAULT_MODEL
 import uvicorn
 
 app = FastAPI()
 
-# ---------- MODELO PARA USO JSON ----------
 class AskInput(BaseModel):
     message: str
-    model_name: str = "GPT_3_5"
+    model_name: str = DEFAULT_MODEL.name
+    thread_id: str
 
-# ---------- ENDPOINT API REST JSON ----------
 @app.post("/ask")
 async def ask_json(input_data: AskInput):
-    answer = ask_jarvis(input_data.message, input_data.model_name)
+    model_enum = ModelEnum[input_data.model_name]
+    answer = ask_jarvis(input_data.message, model_enum, input_data.thread_id)
     return {"response": answer}
 
-# ---------- ENDPOINT PARA TWILIO WHATSAPP ----------
 @app.post("/whatsapp")
 async def whatsapp_webhook(
     request: Request,
@@ -25,15 +30,16 @@ async def whatsapp_webhook(
     From: str = Form(...),
     ProfileName: str = Form(None)
 ):
-    response_text = ask_jarvis(Body, "GPT_3_5")
+    model_enum = DEFAULT_MODEL
+    thread_id = From     # Use the phone number as thread_id to maintain continuity between messages from the same user
+    responses = ask_jarvis(Body, model_enum, thread_id)
+    response_text = "\n".join(responses)
     return PlainTextResponse(response_text)
 
-# ---------- RESET AGENTES EN AMBOS CASOS ----------
 @app.post("/reset")
 async def reset_memory():
-    reset_agents_cache()
+    reset_cache()
     return {"status": "ok", "message": "Memory reset"}
 
-# ---------- EJECUCIÓN LOCAL ----------
 if __name__ == "__main__":
     uvicorn.run("api.main_api:app", host="0.0.0.0", port=8000, reload=True)

requirements.txt

@@ -8,3 +8,4 @@ cryptography
 python-dotenv
 langchain-mcp-adapters
 mcp
+fastapi