Merge remote-tracking branch 'origin/devops' into devops

Author: Locatelli-Flor

DocsManager/app/api/routes/chatMessage.py

@@ -0,0 +1,42 @@
+from fastapi import APIRouter, Depends
+from sqlalchemy.orm import Session
+
+from app.core.db_connection import get_sessionmaker
+from app.schemas.chatMessage import UserMessageIn, AssistantMessageOut
+from app.services.chatMessage import create_user_message
+
+SessionMaker = get_sessionmaker()
+
+
+def get_db():
+    db = SessionMaker()
+    try:
+        yield db
+    finally:
+        db.close()
+
+
+router = APIRouter(
+    prefix="/chat",
+    tags=["Chat"]
+)
+
+
+@router.post(
+    "/messages",
+    response_model=AssistantMessageOut
+)
+def post_user_message(
+    payload: UserMessageIn,
+    db: Session = Depends(get_db)
+):
+    assistant_msg, session_id = create_user_message(
+        db=db,
+        message=payload.message,
+        session_id=payload.session_id
+    )
+
+    return {
+        "session_id": session_id,
+        "message": assistant_msg.message
+    }

DocsManager/app/models/chat_message.py

@@ -11,9 +11,9 @@
 from sqlalchemy.orm import relationship
 
 
-from schemas.enums.sender_type import SenderType
+from app.schemas.enums.sender_type import SenderType
 
-from DocsManager.app.core.db_connection import Base
+from app.core.db_connection import Base
 
 
 class ChatMessage(Base):

DocsManager/app/models/chat_session.py

@@ -6,7 +6,7 @@
 )
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
-from DocsManager.app.core.db_connection import Base
+from app.core.db_connection import Base
 
 
 class ChatSession(Base):

DocsManager/app/schemas/chatMessage.py

@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+from uuid import UUID
+from typing import Optional
+
+class UserMessageIn(BaseModel):
+    session_id: Optional[UUID] = None
+    message: str
+
+
+class AssistantMessageOut(BaseModel):
+    message: str

DocsManager/app/services/chatMessage.py

@@ -0,0 +1,48 @@
+from sqlalchemy.orm import Session
+
+from app.models.chat_message import ChatMessage
+from app.schemas.enums.sender_type import SenderType
+from app.models.chat_session import ChatSession
+
+def assistant_reply(text: str) -> str:
+    return f"Respuesta del asistente a: {text}"
+
+
+def create_user_message(
+    db: Session,
+    message: str,
+    session_id=None
+):
+    # 1. Si no hay session_id → crear sesión nueva
+    if session_id is None:
+        session = ChatSession()
+        db.add(session)
+        db.flush()  # genera el UUID sin commit
+        session_id = session.id
+    else:
+        session = db.get(ChatSession, session_id)
+        if not session:
+            raise ValueError("Chat session not found")
+
+    # 2. Guardar mensaje del usuario
+    user_msg = ChatMessage(
+        session_id=session_id,
+        sender=SenderType.user,
+        message=message
+    )
+    db.add(user_msg)
+
+    # 3. Respuesta del asistente
+    assistant_text = assistant_reply(message)
+
+    assistant_msg = ChatMessage(
+        session_id=session_id,
+        sender=SenderType.assistant,
+        message=assistant_text
+    )
+    db.add(assistant_msg)
+
+    db.commit()
+    db.refresh(assistant_msg)
+
+    return assistant_msg, session_id

DocsManager/main.py

@@ -4,11 +4,11 @@
 from fastapi import FastAPI
 
 from app.api.routes.base import router as base_router
-
+from app.api.routes.chatMessage import router as chat_router
 
 app = FastAPI()
 
 app.include_router(base_router)
 
-
+app.include_router(chat_router)
 

RAGManager/app/agents/graph.py

@@ -5,11 +5,18 @@
 from app.agents.nodes import (
     agent_host,
     context_builder,
-    fallback,
-    guard,
+    fallback_final,
+    fallback_inicial,
+    generator,
+    guard_final,
+    guard_inicial,
     parafraseo,
     retriever,
 )
+from app.agents.routing import (
+    route_after_guard_final,
+    route_after_guard_inicial,
+)
 from app.agents.state import AgentState
 from app.agents.routing import route_after_guard
 
@@ -18,15 +25,18 @@ def create_agent_graph() -> StateGraph:
     Create and configure the LangGraph agent graph.
 
     The graph implements the following flow:
-    1. START -> agent_host (Nodo 1)
-    2. agent_host -> guard (Nodo 2)
-    3. guard -> [conditional] -> fallback (Nodo 3) or END
-    4. fallback -> parafraseo (Nodo 4)
+    1. START -> agent_host (Nodo 1) - Prepares state, no DB operations
+    2. agent_host -> guard (Nodo 2) - Validates for malicious content
+    3. guard -> [conditional]:
+       - malicious -> fallback -> END (stops processing, no DB save)
+       - continue -> parafraseo (Nodo 4)
+    4. parafraseo -> Saves message to DB, retrieves chat history, paraphrases
     5. parafraseo -> retriever (Nodo 5)
     6. retriever -> context_builder (Nodo 6)
-    7. context_builder -> generator (Nodo 7)
-    8. generator -> fallback (Nodo 8)
-    9. fallback -> [conditional] -> END (with final_response) or END (with error)
+    7. context_builder -> guard (validates response)
+    8. guard -> [conditional]:
+       - malicious -> fallback -> END
+       - continue -> END (success)
 
     Returns:
         Configured StateGraph instance ready for execution
@@ -36,29 +46,35 @@ def create_agent_graph() -> StateGraph:
 
     # Add nodes
     workflow.add_node("agent_host", agent_host)
-    workflow.add_node("guard", guard)
-    workflow.add_node("fallback", fallback)
+    workflow.add_node("guard_inicial", guard_inicial)
+    workflow.add_node("fallback_inicial", fallback_inicial)
     workflow.add_node("parafraseo", parafraseo)
     workflow.add_node("retriever", retriever)
     workflow.add_node("context_builder", context_builder)
+    workflow.add_node("generator", generator)
+    workflow.add_node("guard_final", guard_final)
+    workflow.add_node("fallback_final", fallback_final)
 
     # Define edges
     # Start -> agent_host
     workflow.add_edge(START, "agent_host")
 
-    # agent_host -> guard
-    workflow.add_edge("agent_host", "guard")
+    # agent_host -> guard_inicial
+    workflow.add_edge("agent_host", "guard_inicial")
 
-    # guard -> conditional routing
+    # guard_inicial -> conditional routing
     workflow.add_conditional_edges(
-        "guard",
-        route_after_guard,
+        "guard_inicial",
+        route_after_guard_inicial,
         {
-            "malicious": "fallback",  # go to fallback if malicious
-            "continue": "parafraseo",  # Continue to parafraseo if valid
+            "malicious": "fallback_inicial",  # Exception path: malicious content detected
+            "continue": "parafraseo",  # Normal path: continue processing
         },
     )
 
+    # fallback_inicial -> END (stop flow with error message)
+    workflow.add_edge("fallback_inicial", END)
+
     # parafraseo -> retriever
     workflow.add_edge("parafraseo", "retriever")
 
@@ -68,15 +84,21 @@ def create_agent_graph() -> StateGraph:
     # context_builder -> guard
     workflow.add_edge("context_builder", "guard")
 
-    # guard -> conditional routing
+    # generator -> guard_final
+    workflow.add_edge("generator", "guard_final")
+
+    # guard_final -> conditional routing
     workflow.add_conditional_edges(
-        "guard",
-        route_after_guard,
+        "guard_final",
+        route_after_guard_final,
         {
-            "malicious": "fallback",  # go to fallback if malicious
-            "continue": END,  # if there's no error ends
+            "risky": "fallback_final",  # Exception path: risky content detected
+            "continue": END,  # Normal path: end successfully
         },
     )
-    workflow.add_edge("fallback", END)
+
+    # fallback_final -> END (stop flow with error message)
+    workflow.add_edge("fallback_final", END)
+
     # Compile the graph
     return workflow.compile()

RAGManager/app/agents/nodes/__init__.py

@@ -2,15 +2,19 @@
 
 from app.agents.nodes.agent_host import agent_host
 from app.agents.nodes.context_builder import context_builder
-from app.agents.nodes.fallback import fallback
-from app.agents.nodes.guard import guard
+from app.agents.nodes.fallback_final import fallback_final
+from app.agents.nodes.fallback_inicial import fallback_inicial
+from app.agents.nodes.generator import generator
+from app.agents.nodes.guard_final import guard_final
+from app.agents.nodes.guard_inicial import guard_inicial
 from app.agents.nodes.parafraseo import parafraseo
 from app.agents.nodes.retriever import retriever
 
 __all__ = [
     "agent_host",
-    "guard",
-    "fallback",
+    "guard_inicial",
+    "guard_final",
+    "fallback_inicial",
     "parafraseo",
     "retriever",
     "context_builder",