mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-21 13:45:13 +02:00
refactor(copilot): reuse MCP tools via a bridge; extract shared device runners
The copilot and the MCP service maintained two parallel wrapper layers (LangChain BaseTool classes vs @mcp.tool() functions) over the same handlers in gns3_client/api_handlers.py. Descriptions and parameters drifted apart (compute_id and link_type were missing on the copilot side). This makes the MCP registration the single source of truth and removes the duplicated wrappers. tools_v2/mcp_bridge.py adapts the MCP server's tool registration into LangChain tools: names, descriptions and argument schemas come from the MCP tools. The pool is filtered to project-scoped tools (MCP_ALLOWED_TOOLS) because the copilot runs inside one open project — project management, compute/appliance/image administration and server info tools stay out. The bridge carries the copilot's request JWT into the MCP contextvars (username/token_version decoded from the token so ticket-minting tools work) and runs the async MCP functions from the copilot's sync tool node on either thread flavor. Mode toolsets (teaching / lab_automation / troubleshooting_injection) are now composed from adapted MCP tools plus a few copilot-native ones that add value the MCP versions lack: link_create (port-name resolution), wait_seconds, packet_analysis(+skills), and the topology reader. Eight orphaned LangChain wrappers are deleted. The device command tools had the dependency inverted (the MCP handlers instantiated the copilot LangChain classes and round-tripped through JSON strings). The Nornir/Netmiko classes moved verbatim (git mv) into the shared layer as plain runners — DeviceConfigCommandRunner, DeviceShowCommandRunner, VpcsCommandRunner — with _run(json_string) becoming run(params, gns3_ctx). The optional Jinja2 template rendering moved from the MCP handlers into the runners (and into utils/device_configs.render_device_template), so both entry paths get it; the MCP handlers are now pure delegation. This also drops the json.dumps/json.loads detour the MCP path used to take. test_tool_params consistency gate extended: a handler that forwards the whole params dict to a callee is a wildcard (same rationale as the params.items() case) — the per-key check cannot see through delegation.
This commit is contained in:
34 files changed
+986
-2772
No files matched your search
@@ -101,8 +101,8 @@ Systematically inject network faults and validate AIOps detection using the exis
|
||||
|
||||
### 2.2 Fault Injection
|
||||
|
||||
- Use existing `manage_gns3_packet_filter` tool for network-level faults
|
||||
- Use existing `execute_multiple_device_config_commands` for configuration faults
|
||||
- Use existing `link_update` tool for network-level faults
|
||||
- Use existing `device_config_send` for configuration faults
|
||||
- Use existing `InjectionSkillsTool` to query and select appropriate faults
|
||||
- Support combined faults (multiple simultaneous issues)
|
||||
- Auto-recovery between scenarios (restore baseline state)
|
||||
|
||||
@@ -61,4 +61,4 @@ The `troubleshooting_injection.md` prompt in the GNS3-Skills repository gains an
|
||||
- [ ] gns3-server: implement injection fault recording in agent chat session flow
|
||||
- [ ] gns3-server: implement injection history query across sessions per project
|
||||
- [ ] gns3-server: inject history into system prompt via `context_manager.py`
|
||||
- [ ] gns3-server: add `exclude` parameter to `InjectionSkillsTool` for filtering used faults
|
||||
- [ ] gns3-server: add `exclude` parameter to `injection_skill_get` for filtering used faults
|
||||
@@ -161,7 +161,7 @@ User Request: "Configure OSPF on all routers"
|
||||
│ │
|
||||
│ Process: │
|
||||
│ 1. Render template with parameters (0 tokens) │
|
||||
│ 2. Call existing ExecuteMultipleDeviceConfigCommands │
|
||||
│ 2. Call existing device_config_send │
|
||||
│ 3. Return execution results │
|
||||
└─────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
@@ -2068,7 +2068,7 @@ langgraph>=0.0.20
|
||||
|
||||
### Integration Points
|
||||
|
||||
- `gns3server/agent/gns3_copilot/tools_v2/config_tools_nornir.py` (existing)
|
||||
- `gns3server/agent/gns3_copilot/gns3_client/device_config_commands.py` (existing)
|
||||
- `gns3server/agent/gns3_copilot/prompts/lab_automation_assistant_prompt.py` (update)
|
||||
- `gns3server/agent/gns3_copilot/gns3_client/gns3_topology_reader.py` (existing)
|
||||
- `gns3server/agent/gns3_copilot/utils/command_filter.py` (existing)
|
||||
|
||||
Reference in new issue
Block a user