HomeLab/unraid-mcp
2
0
Fork 1
mirror of https://github.com/jmagar/unraid-mcp.git synced 2026-03-23 12:39:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct source_entry_ids var, allow empty children_ids, fix strict short-ID

Browse Source 
- create_folder_with_items: forward source_entry_ids not entry_ids to sourceEntryIds
- set_folder_children: use `is not None` guard to allow children_ids=[]
- _resolve_container_id: allow short hex ID matching independent of strict mode

Resolves review threads PRRT_kwDOO6Hdxs50FgOr PRRT_kwDOO6Hdxs50FgPO PRRT_kwDOO6Hdxs50E2iH
This commit is contained in:
Jacob Magar
2026-03-13 10:33:35 -04:00
parent 0283006374
commit c913e6bce9
1 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
unraid_mcp/tools/docker.py
View File

@@ -315,8 +315,8 @@ async def _resolve_container_id(container_id: str, *, strict: bool = False) -> s
data = await make_graphql_request(list_query) data = await make_graphql_request(list_query)
containers = safe_get(data, "docker", "containers", default=[]) containers = safe_get(data, "docker", "containers", default=[])
# Short hex prefix: match by ID prefix before trying name matching (strict bypasses this) # Short hex prefix: match by ID prefix before trying name matching
if not strict and _DOCKER_SHORT_ID_PATTERN.match(container_id): if _DOCKER_SHORT_ID_PATTERN.match(container_id):
id_lower = container_id.lower() id_lower = container_id.lower()
matches: list[dict[str, Any]] = [] matches: list[dict[str, Any]] = []
for c in containers: for c in containers:
@@ -501,22 +501,36 @@ def register_docker_tool(mcp: FastMCP) -> None:
if children_ids is not None: if children_ids is not None:
_vars["childrenIds"] = children_ids _vars["childrenIds"] = children_ids
data = await make_graphql_request(MUTATIONS["create_folder"], _vars) data = await make_graphql_request(MUTATIONS["create_folder"], _vars)
return {"success": True, "action": "create_folder", "organizer": data.get("createDockerFolder")} return {
"success": True,
"action": "create_folder",
"organizer": data.get("createDockerFolder"),
}
if action == "set_folder_children": if action == "set_folder_children":
if not children_ids: if children_ids is None:
raise ToolError("children_ids is required for 'set_folder_children' action") raise ToolError("children_ids is required for 'set_folder_children' action")
_vars = {"childrenIds": children_ids} _vars = {"childrenIds": children_ids}
if folder_id is not None: if folder_id is not None:
_vars["folderId"] = folder_id _vars["folderId"] = folder_id
data = await make_graphql_request(MUTATIONS["set_folder_children"], _vars) data = await make_graphql_request(MUTATIONS["set_folder_children"], _vars)
return {"success": True, "action": "set_folder_children", "organizer": data.get("setDockerFolderChildren")} return {
"success": True,
"action": "set_folder_children",
"organizer": data.get("setDockerFolderChildren"),
}
if action == "delete_entries": if action == "delete_entries":
if not entry_ids: if not entry_ids:
raise ToolError("entry_ids is required for 'delete_entries' action") raise ToolError("entry_ids is required for 'delete_entries' action")
data = await make_graphql_request(MUTATIONS["delete_entries"], {"entryIds": entry_ids}) data = await make_graphql_request(
return {"success": True, "action": "delete_entries", "organizer": data.get("deleteDockerEntries")} MUTATIONS["delete_entries"], {"entryIds": entry_ids}
)
return {
"success": True,
"action": "delete_entries",
"organizer": data.get("deleteDockerEntries"),
}
if action == "move_to_folder": if action == "move_to_folder":
if not source_entry_ids: if not source_entry_ids:
@@ -525,22 +539,39 @@ def register_docker_tool(mcp: FastMCP) -> None:
raise ToolError("destination_folder_id is required for 'move_to_folder' action") raise ToolError("destination_folder_id is required for 'move_to_folder' action")
data = await make_graphql_request( data = await make_graphql_request(
MUTATIONS["move_to_folder"], MUTATIONS["move_to_folder"],
{"sourceEntryIds": source_entry_ids, "destinationFolderId": destination_folder_id}, {
"sourceEntryIds": source_entry_ids,
"destinationFolderId": destination_folder_id,
},
) )
return {"success": True, "action": "move_to_folder", "organizer": data.get("moveDockerEntriesToFolder")} return {
"success": True,
"action": "move_to_folder",
"organizer": data.get("moveDockerEntriesToFolder"),
}
if action == "move_to_position": if action == "move_to_position":
if not source_entry_ids: if not source_entry_ids:
raise ToolError("source_entry_ids is required for 'move_to_position' action") raise ToolError("source_entry_ids is required for 'move_to_position' action")
if not destination_folder_id: if not destination_folder_id:
raise ToolError("destination_folder_id is required for 'move_to_position' action") raise ToolError(
"destination_folder_id is required for 'move_to_position' action"
)
if position is None: if position is None:
raise ToolError("position is required for 'move_to_position' action") raise ToolError("position is required for 'move_to_position' action")
data = await make_graphql_request( data = await make_graphql_request(
MUTATIONS["move_to_position"], MUTATIONS["move_to_position"],
{"sourceEntryIds": source_entry_ids, "destinationFolderId": destination_folder_id, "position": position}, {
"sourceEntryIds": source_entry_ids,
"destinationFolderId": destination_folder_id,
"position": position,
},
) )
return {"success": True, "action": "move_to_position", "organizer": data.get("moveDockerItemsToPosition")} return {
"success": True,
"action": "move_to_position",
"organizer": data.get("moveDockerItemsToPosition"),
}
if action == "rename_folder": if action == "rename_folder":
if not folder_id: if not folder_id:
@@ -550,7 +581,11 @@ def register_docker_tool(mcp: FastMCP) -> None:
data = await make_graphql_request( data = await make_graphql_request(
MUTATIONS["rename_folder"], {"folderId": folder_id, "newName": new_folder_name} MUTATIONS["rename_folder"], {"folderId": folder_id, "newName": new_folder_name}
) )
return {"success": True, "action": "rename_folder", "organizer": data.get("renameDockerFolder")} return {
"success": True,
"action": "rename_folder",
"organizer": data.get("renameDockerFolder"),
}
if action == "create_folder_with_items": if action == "create_folder_with_items":
if not folder_name: if not folder_name:
@@ -558,12 +593,16 @@ def register_docker_tool(mcp: FastMCP) -> None:
_vars = {"name": folder_name} _vars = {"name": folder_name}
if parent_id is not None: if parent_id is not None:
_vars["parentId"] = parent_id _vars["parentId"] = parent_id
if entry_ids is not None: if source_entry_ids is not None:
_vars["sourceEntryIds"] = entry_ids _vars["sourceEntryIds"] = source_entry_ids
if position is not None: if position is not None:
_vars["position"] = position _vars["position"] = position
data = await make_graphql_request(MUTATIONS["create_folder_with_items"], _vars) data = await make_graphql_request(MUTATIONS["create_folder_with_items"], _vars)
return {"success": True, "action": "create_folder_with_items", "organizer": data.get("createDockerFolderWithItems")} return {
"success": True,
"action": "create_folder_with_items",
"organizer": data.get("createDockerFolderWithItems"),
}
if action == "update_view_prefs": if action == "update_view_prefs":
if view_prefs is None: if view_prefs is None:
@@ -571,19 +610,35 @@ def register_docker_tool(mcp: FastMCP) -> None:
data = await make_graphql_request( data = await make_graphql_request(
MUTATIONS["update_view_prefs"], {"viewId": view_id, "prefs": view_prefs} MUTATIONS["update_view_prefs"], {"viewId": view_id, "prefs": view_prefs}
) )
return {"success": True, "action": "update_view_prefs", "organizer": data.get("updateDockerViewPreferences")} return {
"success": True,
"action": "update_view_prefs",
"organizer": data.get("updateDockerViewPreferences"),
}
if action == "sync_templates": if action == "sync_templates":
data = await make_graphql_request(MUTATIONS["sync_templates"]) data = await make_graphql_request(MUTATIONS["sync_templates"])
return {"success": True, "action": "sync_templates", "result": data.get("syncDockerTemplatePaths")} return {
"success": True,
"action": "sync_templates",
"result": data.get("syncDockerTemplatePaths"),
}
if action == "reset_template_mappings": if action == "reset_template_mappings":
data = await make_graphql_request(MUTATIONS["reset_template_mappings"]) data = await make_graphql_request(MUTATIONS["reset_template_mappings"])
return {"success": True, "action": "reset_template_mappings", "result": data.get("resetDockerTemplateMappings")} return {
"success": True,
"action": "reset_template_mappings",
"result": data.get("resetDockerTemplateMappings"),
}
if action == "refresh_digests": if action == "refresh_digests":
data = await make_graphql_request(MUTATIONS["refresh_digests"]) data = await make_graphql_request(MUTATIONS["refresh_digests"])
return {"success": True, "action": "refresh_digests", "result": data.get("refreshDockerDigests")} return {
"success": True,
"action": "refresh_digests",
"result": data.get("refreshDockerDigests"),
}
# Single-container mutations # Single-container mutations
if action in MUTATIONS: if action in MUTATIONS: