Merge pull request #55 from nextcloud/add-mcp-client

lukasdotcom · web-flow · commit 1ced0458865e · 2025-07-31T08:42:43.000-04:00
feat: allow for specifying mcp clients and convert functions to async
diff --git a/ex_app/lib/agent.py b/ex_app/lib/agent.py
@@ -44,8 +44,8 @@ def export_conversation(checkpointer):
 	return add_signature(checkpointer.serde.dumps(checkpointer.storage).decode('utf-8'), key)
 
 
-def react(task, nc: Nextcloud):
-	safe_tools, dangerous_tools = get_tools(nc)
+async def react(task, nc: Nextcloud):
+	safe_tools, dangerous_tools = await get_tools(nc)
 
 	model.bind_nextcloud(nc)
 
@@ -54,7 +54,7 @@ def react(task, nc: Nextcloud):
 		+ safe_tools
 	)
 
-	def call_model(
+	async def call_model(
 			state: AgentState,
 			config: RunnableConfig,
 	):
@@ -77,12 +77,12 @@ def call_model(
 """.replace("{CURRENT_DATE}", current_date)
 		)
 
-		response = bound_model.invoke([system_prompt] + state["messages"], config)
+		response = await bound_model.ainvoke([system_prompt] + state["messages"], config)
 		# We return a list, because this will get added to the existing list
 		return {"messages": [response]}
 
 	checkpointer = MemorySaver()
-	graph = get_graph(call_model, safe_tools, dangerous_tools, checkpointer)
+	graph = await get_graph(call_model, safe_tools, dangerous_tools, checkpointer)
 
 	load_conversation(checkpointer, task['input']['conversation_token'])
 
@@ -105,7 +105,7 @@ def call_model(
 	else:
 		new_input = {"messages": [("user", task['input']['input'])]}
 
-	for event in graph.stream(new_input, thread, stream_mode="values"):
+	async for event in graph.astream(new_input, thread, stream_mode="values"):
 		last_message = event['messages'][-1]
 		for message in event['messages']:
 			if isinstance(message, HumanMessage):
diff --git a/ex_app/lib/all_tools/audio2text.py b/ex_app/lib/all_tools/audio2text.py
@@ -8,7 +8,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/calendar.py b/ex_app/lib/all_tools/calendar.py
@@ -18,7 +18,7 @@
 from ex_app.lib.logger import log
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/contacts.py b/ex_app/lib/all_tools/contacts.py
@@ -10,7 +10,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@safe_tool
 	def find_person_in_contacts(name: str) -> list[dict[str, typing.Any]]:
diff --git a/ex_app/lib/all_tools/context_chat.py b/ex_app/lib/all_tools/context_chat.py
@@ -7,7 +7,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/deck.py b/ex_app/lib/all_tools/deck.py
@@ -16,7 +16,7 @@
 from ex_app.lib.logger import log
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/doc-gen.py b/ex_app/lib/all_tools/doc-gen.py
@@ -7,7 +7,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/duckduckgo.py b/ex_app/lib/all_tools/duckduckgo.py
@@ -7,7 +7,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	web_search = DuckDuckGoSearchResults(output_format="list")
 	return [
diff --git a/ex_app/lib/all_tools/files.py b/ex_app/lib/all_tools/files.py
@@ -8,7 +8,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool, dangerous_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/here.py b/ex_app/lib/all_tools/here.py
@@ -11,7 +11,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/image_gen.py b/ex_app/lib/all_tools/image_gen.py
@@ -8,7 +8,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	@tool
 	@safe_tool
diff --git a/ex_app/lib/all_tools/lib/decorator.py b/ex_app/lib/all_tools/lib/decorator.py
@@ -20,7 +20,7 @@ def decorator(func):
 		timestamp = {}
 
 		@wraps(func)
-		def wrapper(*args): # needs NextcloudApp as first arg
+		async def wrapper(*args): # needs NextcloudApp as first arg
 			nonlocal cached_result
 			nonlocal timestamp
 			user_id = args[0].user # cache result saved per user
@@ -33,7 +33,7 @@ def wrapper(*args): # needs NextcloudApp as first arg
 					del cached_result[user_id]
 					timestamp[user_id] = 0
 			# Call the function and cache the result
-			result = func(*args)
+			result = await func(*args)
 			cached_result[user_id] = result
 			timestamp[user_id] = current_time
 			return result
diff --git a/ex_app/lib/all_tools/mail.py b/ex_app/lib/all_tools/mail.py
@@ -11,7 +11,7 @@
 from ex_app.lib.logger import log
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@dangerous_tool
 	def send_email(subject: str, body: str, account_id: int, from_email: str, to_emails: list[str]):
diff --git a/ex_app/lib/all_tools/mcp.py b/ex_app/lib/all_tools/mcp.py
@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+from json import JSONDecodeError
+
+from langchain_mcp_adapters.client import MultiServerMCPClient
+from nc_py_api import Nextcloud
+import json
+from ex_app.lib.logger import log
+from nc_py_api.ex_app import LogLvl
+import asyncio
+import traceback
+
+
+async def get_tools(nc: Nextcloud):
+	mcp_json = nc.appconfig_ex.get_value("mcp_config", "{}")
+	try:
+		mcp_config = json.loads(mcp_json)
+	except JSONDecodeError:
+		log(nc, LogLvl.ERROR, "Invalid MCP json config: " + mcp_json)
+		mcp_config = {}
+	try:
+		server = MultiServerMCPClient(mcp_config)
+		tools = await asyncio.wait_for(server.get_tools(), timeout=120)
+		for tool in tools:
+			tool.name = "mcp_" + tool.name
+		return tools
+	except Exception as e:
+		tb_str = "".join(traceback.format_exception(e))
+		log(nc, LogLvl.ERROR, "Failed to load MCP servers: " + tb_str)
+	return []
+
+
+def get_category_name():
+	return "MCP Server"
+
+
+def is_available(nc: Nextcloud):
+	return True
diff --git a/ex_app/lib/all_tools/openproject.py b/ex_app/lib/all_tools/openproject.py
@@ -8,7 +8,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool, dangerous_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@safe_tool
 	def list_projects():
diff --git a/ex_app/lib/all_tools/openstreetmap.py b/ex_app/lib/all_tools/openstreetmap.py
@@ -13,7 +13,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@safe_tool
 	def get_coordinates_for_address(address: str) -> (str, str):
diff --git a/ex_app/lib/all_tools/talk.py b/ex_app/lib/all_tools/talk.py
@@ -7,7 +7,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool, dangerous_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@safe_tool
 	def list_talk_conversations():
diff --git a/ex_app/lib/all_tools/weather.py b/ex_app/lib/all_tools/weather.py
@@ -10,7 +10,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 	@tool
 	@safe_tool
 	def get_current_weather_for_coordinates(lat: str, lon: str) -> dict[str, typing.Any]:
diff --git a/ex_app/lib/all_tools/youtube.py b/ex_app/lib/all_tools/youtube.py
@@ -7,7 +7,7 @@
 from ex_app.lib.all_tools.lib.decorator import safe_tool
 
 
-def get_tools(nc: Nextcloud):
+async def get_tools(nc: Nextcloud):
 
 	yt_search = YouTubeSearchTool()
 	return [
diff --git a/ex_app/lib/graph.py b/ex_app/lib/graph.py
@@ -36,7 +36,7 @@ def create_tool_node_with_fallback(tools: list) -> dict:
 		[RunnableLambda(handle_tool_error)], exception_key="error"
 	)
 
-def get_graph(call_model, safe_tools, dangerous_tools, checkpointer):
+async def get_graph(call_model, safe_tools, dangerous_tools, checkpointer):
 	dangerous_tool_names = {tool.name: tool for tool in dangerous_tools}
 	safe_tool_names = {tool.name: tool for tool in safe_tools}
 
diff --git a/ex_app/lib/main.py b/ex_app/lib/main.py
diff --git a/ex_app/lib/tools.py b/ex_app/lib/tools.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
