Categorize MCP server modules (#1425)

tamohannes · gwarmstrong · web-flow · commit f81cb4e1f93d · 2026-05-04T09:58:50.000-07:00
Signed-off-by: tamohannes &lt;hovhannes.tamoyan@gmail.com&gt;
Co-authored-by: George Armstrong &lt;georgea@nvidia.com&gt;
diff --git a/docs/agentic_inference/tool_calling.md b/docs/agentic_inference/tool_calling.md
@@ -370,10 +370,10 @@ For vLLM, you may need to specify tool calling arguments:
 ### Built-in Tools
 
 - [`nemo_skills.mcp.servers.python_tool.PythonTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/python_tool.py) - Python code execution
-- [`nemo_skills.mcp.servers.arxiv_tool.ArxivSearchTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/arxiv_tool.py) - ArXiv paper search and retrieval (no API key required)
+- [`nemo_skills.mcp.servers.web.arxiv_tool.ArxivSearchTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/web/arxiv_tool.py) - ArXiv paper search and retrieval (no API key required)
 - [`nemo_skills.mcp.servers.exa_tool.ExaTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/exa_tool.py) - Web search via Exa API
-- [`nemo_skills.mcp.servers.periodictable_tool.PeriodictableTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/periodictable_tool.py) - Direct element, isotope, and neutron scattering lookup via periodictable (requires `periodictable`)
-- [`nemo_skills.mcp.servers.particle_tool.ParticleTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/particle_tool.py) - Direct particle physics lookup from the PDG database via particle (requires `particle`)
-- [`nemo_skills.mcp.servers.radioactivedecay_tool.RadioactivedecayTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/radioactivedecay_tool.py) - Direct nuclear nuclide and decay-chain lookup via radioactivedecay (requires `radioactivedecay`)
-- [`nemo_skills.mcp.servers.coolprop_tool.CoolPropTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/coolprop_tool.py) - Direct thermophysical fluid property lookup via CoolProp (requires `CoolProp`)
-- [`nemo_skills.mcp.servers.wikipedia_tool.WikipediaSearchTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/wikipedia_tool.py) - Direct Wikipedia article search and retrieval (no API key required)
+- [`nemo_skills.mcp.servers.chemistry.periodictable_tool.PeriodictableTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/chemistry/periodictable_tool.py) - Direct element, isotope, and neutron scattering lookup via periodictable (requires `periodictable`)
+- [`nemo_skills.mcp.servers.physics.particle_tool.ParticleTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/physics/particle_tool.py) - Direct particle physics lookup from the PDG database via particle (requires `particle`)
+- [`nemo_skills.mcp.servers.physics.radioactivedecay_tool.RadioactivedecayTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/physics/radioactivedecay_tool.py) - Direct nuclear nuclide and decay-chain lookup via radioactivedecay (requires `radioactivedecay`)
+- [`nemo_skills.mcp.servers.physics.coolprop_tool.CoolPropTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/physics/coolprop_tool.py) - Direct thermophysical fluid property lookup via CoolProp (requires `CoolProp`)
+- [`nemo_skills.mcp.servers.web.wikipedia_tool.WikipediaSearchTool`](https://github.com/NVIDIA-NeMo/Skills/tree/main/nemo_skills/mcp/servers/web/wikipedia_tool.py) - Direct Wikipedia article search and retrieval (no API key required)
diff --git a/nemo_skills/mcp/servers/chemistry/__init__.py b/nemo_skills/mcp/servers/chemistry/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/nemo_skills/mcp/servers/chemistry/periodictable_tool.py b/nemo_skills/mcp/servers/chemistry/periodictable_tool.py
@@ -21,7 +21,7 @@
     pip install periodictable
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.periodictable_tool::PeriodictableTool]
+    ++tool_modules=[nemo_skills.mcp.servers.chemistry.periodictable_tool::PeriodictableTool]
 """
 
 import logging
diff --git a/nemo_skills/mcp/servers/physics/__init__.py b/nemo_skills/mcp/servers/physics/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/nemo_skills/mcp/servers/physics/coolprop_tool.py b/nemo_skills/mcp/servers/physics/coolprop_tool.py
@@ -21,7 +21,7 @@
     pip install CoolProp
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.coolprop_tool::CoolPropTool]
+    ++tool_modules=[nemo_skills.mcp.servers.physics.coolprop_tool::CoolPropTool]
 """
 
 import logging
diff --git a/nemo_skills/mcp/servers/physics/particle_tool.py b/nemo_skills/mcp/servers/physics/particle_tool.py
@@ -21,7 +21,7 @@
     pip install particle
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.particle_tool::ParticleTool]
+    ++tool_modules=[nemo_skills.mcp.servers.physics.particle_tool::ParticleTool]
 """
 
 import logging
diff --git a/nemo_skills/mcp/servers/physics/radioactivedecay_tool.py b/nemo_skills/mcp/servers/physics/radioactivedecay_tool.py
@@ -21,7 +21,7 @@
     pip install radioactivedecay
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.radioactivedecay_tool::RadioactivedecayTool]
+    ++tool_modules=[nemo_skills.mcp.servers.physics.radioactivedecay_tool::RadioactivedecayTool]
 """
 
 import logging
diff --git a/nemo_skills/mcp/servers/web/__init__.py b/nemo_skills/mcp/servers/web/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/nemo_skills/mcp/servers/web/arxiv_tool.py b/nemo_skills/mcp/servers/web/arxiv_tool.py
@@ -23,7 +23,7 @@
 compatibility with prior generation runs that already learned to use them.
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.arxiv_tool::ArxivSearchTool]
+    ++tool_modules=[nemo_skills.mcp.servers.web.arxiv_tool::ArxivSearchTool]
 """
 
 import asyncio
diff --git a/nemo_skills/mcp/servers/web/wikipedia_tool.py b/nemo_skills/mcp/servers/web/wikipedia_tool.py
@@ -29,7 +29,7 @@
 - `wikipedia-section(title, section)`  — fetch a single named section
 
 Usage:
-    ++tool_modules=[nemo_skills.mcp.servers.wikipedia_tool::WikipediaSearchTool]
+    ++tool_modules=[nemo_skills.mcp.servers.web.wikipedia_tool::WikipediaSearchTool]
 """
 
 import asyncio
diff --git a/tests/test_mcp_clients.py b/tests/test_mcp_clients.py
@@ -1009,14 +1009,14 @@ async def failing_delete(session_id):
 
 class TestRadioactivedecayTool:
     def test_radioactivedecay_tool_config(self):
-        from nemo_skills.mcp.servers.radioactivedecay_tool import RadioactivedecayTool
+        from nemo_skills.mcp.servers.physics.radioactivedecay_tool import RadioactivedecayTool
 
         tool = RadioactivedecayTool()
         assert tool.default_config()["time_unit"] == "s"
 
     @pytest.mark.asyncio
     async def test_radioactivedecay_direct_list_tools(self):
-        from nemo_skills.mcp.servers.radioactivedecay_tool import RadioactivedecayTool
+        from nemo_skills.mcp.servers.physics.radioactivedecay_tool import RadioactivedecayTool
 
         tool = RadioactivedecayTool()
         tool.configure()
@@ -1029,7 +1029,7 @@ async def test_radioactivedecay_direct_list_tools(self):
 
     @pytest.mark.asyncio
     async def test_radioactivedecay_rejects_non_finite_time(self):
-        from nemo_skills.mcp.servers.radioactivedecay_tool import RadioactivedecayTool
+        from nemo_skills.mcp.servers.physics.radioactivedecay_tool import RadioactivedecayTool
 
         tool = RadioactivedecayTool()
         tool.configure()
@@ -1042,14 +1042,14 @@ async def test_radioactivedecay_rejects_non_finite_time(self):
 
 class TestParticleTool:
     def test_particle_tool_config(self):
-        from nemo_skills.mcp.servers.particle_tool import ParticleTool
+        from nemo_skills.mcp.servers.physics.particle_tool import ParticleTool
 
         tool = ParticleTool()
         assert tool.default_config() == {}
 
     @pytest.mark.asyncio
     async def test_particle_direct_list_tools(self):
-        from nemo_skills.mcp.servers.particle_tool import ParticleTool
+        from nemo_skills.mcp.servers.physics.particle_tool import ParticleTool
 
         tool = ParticleTool()
         tool.configure()
@@ -1059,7 +1059,7 @@ async def test_particle_direct_list_tools(self):
 
     @pytest.mark.asyncio
     async def test_particle_tool_rejects_extra_args(self):
-        from nemo_skills.mcp.servers.particle_tool import ParticleTool
+        from nemo_skills.mcp.servers.physics.particle_tool import ParticleTool
 
         tool = ParticleTool()
         with pytest.raises(ValueError, match="does not support extra_args"):
@@ -1071,14 +1071,14 @@ async def test_particle_tool_rejects_extra_args(self):
 
 class TestPeriodictableTool:
     def test_periodictable_tool_config(self):
-        from nemo_skills.mcp.servers.periodictable_tool import PeriodictableTool
+        from nemo_skills.mcp.servers.chemistry.periodictable_tool import PeriodictableTool
 
         tool = PeriodictableTool()
         assert tool.default_config() == {}
 
     @pytest.mark.asyncio
     async def test_periodictable_direct_list_tools(self):
-        from nemo_skills.mcp.servers.periodictable_tool import PeriodictableTool
+        from nemo_skills.mcp.servers.chemistry.periodictable_tool import PeriodictableTool
 
         tool = PeriodictableTool()
         tool.configure()
@@ -1092,14 +1092,14 @@ async def test_periodictable_direct_list_tools(self):
 
 class TestCoolPropTool:
     def test_coolprop_tool_config(self):
-        from nemo_skills.mcp.servers.coolprop_tool import CoolPropTool
+        from nemo_skills.mcp.servers.physics.coolprop_tool import CoolPropTool
 
         tool = CoolPropTool()
         assert tool.default_config() == {}
 
     @pytest.mark.asyncio
     async def test_coolprop_direct_list_tools(self):
-        from nemo_skills.mcp.servers.coolprop_tool import CoolPropTool
+        from nemo_skills.mcp.servers.physics.coolprop_tool import CoolPropTool
 
         tool = CoolPropTool()
         tool.configure()
@@ -1113,14 +1113,14 @@ async def test_coolprop_direct_list_tools(self):
 
 class TestWikipediaTool:
     def test_wikipedia_tool_config(self):
-        from nemo_skills.mcp.servers.wikipedia_tool import WikipediaSearchTool
+        from nemo_skills.mcp.servers.web.wikipedia_tool import WikipediaSearchTool
 
         tool = WikipediaSearchTool()
         assert tool.default_config()["num_results"] == 3
 
     @pytest.mark.asyncio
     async def test_wikipedia_search_rejects_out_of_range_num_results(self):
-        from nemo_skills.mcp.servers.wikipedia_tool import WikipediaSearchTool
+        from nemo_skills.mcp.servers.web.wikipedia_tool import WikipediaSearchTool
 
         tool = WikipediaSearchTool()
         tool.configure()
@@ -1129,7 +1129,7 @@ async def test_wikipedia_search_rejects_out_of_range_num_results(self):
 
     @pytest.mark.asyncio
     async def test_wikipedia_direct_list_tools(self):
-        from nemo_skills.mcp.servers.wikipedia_tool import WikipediaSearchTool
+        from nemo_skills.mcp.servers.web.wikipedia_tool import WikipediaSearchTool
 
         tool = WikipediaSearchTool()
         tool.configure()
@@ -1154,8 +1154,8 @@ async def test_wikipedia_direct_list_tools(self):
 
     @pytest.mark.asyncio
     async def test_wikipedia_execute_dispatch_contracts(self, monkeypatch):
-        from nemo_skills.mcp.servers import wikipedia_tool
-        from nemo_skills.mcp.servers.wikipedia_tool import WikipediaSearchTool
+        from nemo_skills.mcp.servers.web import wikipedia_tool
+        from nemo_skills.mcp.servers.web.wikipedia_tool import WikipediaSearchTool
 
         async def fake_page(title):
             return f"page:{title}"
@@ -1187,14 +1187,14 @@ async def fake_query_summary(title, query, max_chars=700):
 
 class TestArxivTool:
     def test_arxiv_tool_config(self):
-        from nemo_skills.mcp.servers.arxiv_tool import ArxivSearchTool
+        from nemo_skills.mcp.servers.web.arxiv_tool import ArxivSearchTool
 
         tool = ArxivSearchTool()
         assert tool.default_config()["max_results"] == 3
 
     @pytest.mark.asyncio
     async def test_arxiv_search_rejects_non_positive_max_results(self):
-        from nemo_skills.mcp.servers.arxiv_tool import ArxivSearchTool
+        from nemo_skills.mcp.servers.web.arxiv_tool import ArxivSearchTool
 
         tool = ArxivSearchTool()
         tool.configure()
@@ -1203,7 +1203,7 @@ async def test_arxiv_search_rejects_non_positive_max_results(self):
 
     @pytest.mark.asyncio
     async def test_arxiv_direct_list_tools(self):
-        from nemo_skills.mcp.servers.arxiv_tool import ArxivSearchTool
+        from nemo_skills.mcp.servers.web.arxiv_tool import ArxivSearchTool
 
         tool = ArxivSearchTool()
         tool.configure()
