Injecting tool param usage - InjectedState

agents/jarvis_mcp_memory_agent.py

@@ -17,6 +17,7 @@ from tools.tools_registry import local_tools
 
 class State(TypedDict):
     messages: Annotated[list, add_messages]
+    real_name: str  # Added to pass real_name to tools
 
 server_config_path = "mcp\server_config.json"
 

agents/jarvis_memory_agent.py

@@ -10,6 +10,7 @@ from tools.tools_registry import local_tools
 
 class State(TypedDict):
     messages: Annotated[list, add_messages]
+    real_name: str  # Added to pass real_name to tools
 
 class JarvisMemoryAgent:
     def __init__(self, model_enum: ModelEnum):

agents/session.py

@@ -14,6 +14,8 @@ class ChatState(Enum):
     STARTING_CHAT = "STARTING_CHAT"
     INITIALIZED = "INITIALIZED"
 
+not_verbosed_tools = ["get_upcoming_events_tool"]
+
 
 # === Global caches ===
 _sessions_cache: dict[tuple[ModelEnum, str], "JarvisSession"] = {}
@@ -110,7 +112,7 @@ class JarvisSession:
         return {"role": role, "content": content}
 
     def _build_agent_kwargs(self, messages: list) -> dict:
-        kwargs = {"input": {"messages": messages}}
+        kwargs = {"input": {"messages": messages, "real_name": self.user["real_name"]}}
         if self.model_enum in models_with_memory:
             kwargs["config"] = {"configurable": {"thread_id": self.thread_id}}
         return kwargs
@@ -134,7 +136,8 @@ class JarvisSession:
                     for tool_call in msg.additional_kwargs['tool_calls']:
                         result.append(f"Llamando a la función: {tool_call['function']['name']}")
                 elif isinstance(msg, ToolMessage):
-                    result.append(f"Resultado de la función {msg.name}: {msg.content}")
+                    if not msg.name in not_verbosed_tools:
+                        result.append(f"Resultado de la función {msg.name}: {msg.content}")
                 else:
                     result.append(msg.content)
 
@@ -177,7 +180,12 @@ def ask_jarvis(prompt: str, model: ModelEnum = DEFAULT_MODEL, thread_id: str = "
     session_key = (model, thread_id)
     if session_key not in _sessions_cache:
         _sessions_cache[session_key] = JarvisSession(model, thread_id)
-    return _sessions_cache[session_key].ask(prompt)
+    result = _sessions_cache[session_key].ask(prompt)
+
+    if isinstance(result, list):
+        return result
+    else:
+        return [result]
 
 
 def reset_cache():

api/google_api/jarvis_google_authentication.py

@@ -15,6 +15,9 @@ GOOGLE_API_DIR = os.path.join(PROJECT_ROOT, "api", "google_api")
 
 def get_authentications_for_user(username, allow_logging_popup=False):
     authentications = {}
+    
+    if not os.path.isdir(os.path.join(GOOGLE_API_DIR, username)):
+        raise FileNotFoundError(f"No existe el directorio para el usuario '{username}'. Ruta comprobada: {os.path.join(GOOGLE_API_DIR, username)}")
     for account in os.listdir(os.path.join(GOOGLE_API_DIR, username)):
         for filename in os.listdir(os.path.join(GOOGLE_API_DIR, username, account)):
             if filename.endswith(".json") and not "example" in filename:

tools/google_calendar.py

@@ -0,0 +1,48 @@
+import datetime
+from langchain_core.tools import tool
+from googleapiclient.discovery import build
+from typing_extensions import Annotated
+from langgraph.prebuilt import InjectedState
+
+from api.google_api.jarvis_google_authentication import get_authentications_for_user
+
+@tool
+def get_upcoming_events_tool(
+    real_name: Annotated[str, InjectedState("real_name")],
+    num_events: int = 10
+) -> str:
+    """
+    Get the next upcoming events from the user's Google Calendar.
+    The parameter real_name is the real_name defined for the user.
+    The number of events to return can be specified with num_events.
+    """
+    real_name = real_name.strip().lower()
+    authentications = get_authentications_for_user(real_name, allow_logging_popup=True)
+    events = []
+    for authentication in authentications.values():
+        service = build("calendar", "v3", credentials=authentication)
+        now = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
+        events_result = (
+            service.events()
+            .list(
+                calendarId="primary",
+                timeMin=now,
+                maxResults=num_events,
+                singleEvents=True,
+                orderBy="startTime",
+            )
+            .execute()
+        )
+        events.extend(events_result.get("items", []))
+
+    if not events:
+        return "No upcoming events found."
+    
+    events = sorted(events,key=lambda event: event["start"].get('dateTime', event["start"].get('date')), reverse=False)
+    events = events[:num_events] if len(events) > num_events else events
+
+    result = ""
+    for event in events:
+        result += f"{event['start'].get('dateTime', event['start'].get('date'))} - {event['summary']}\n"
+
+    return result.strip()