Normalize get_page_content tool naming

The Q&A agent had an odd naming wart: the helper in openkb.agent.tools
was called get_page_content (no wiki_ prefix like its siblings
read_wiki_file, list_wiki_files, read_wiki_image, write_wiki_file), so
the @function_tool wrapper had to be named get_page_content_tool and
do a lazy local import to avoid a name collision. The instructions
template meanwhile referred to the tool as get_page_content — a third
name — leaving three spellings for one concept.

Rename the helper to get_wiki_page_content so it matches the wiki_
convention, rename the wrapper to get_page_content so the tool name
the model sees matches what the instructions have always said, and
drop the lazy-import workaround. Update the test imports, call sites,
class name, and the one assertion in test_query that was still
checking for the old wrapper name (that assertion was already broken
by earlier work).

Author: rejojer

openkb/agent/query.py

@@ -6,7 +6,7 @@
 from agents import Agent, Runner, function_tool
 
 from agents import ToolOutputImage, ToolOutputText
-from openkb.agent.tools import read_wiki_file, read_wiki_image
+from openkb.agent.tools import get_wiki_page_content, read_wiki_file, read_wiki_image
 
 MAX_TURNS = 50
 from openkb.schema import get_agents_md
@@ -55,16 +55,15 @@ def read_file(path: str) -> str:
         return read_wiki_file(path, wiki_root)
 
     @function_tool
-    def get_page_content_tool(doc_name: str, pages: str) -> str:
+    def get_page_content(doc_name: str, pages: str) -> str:
         """Get text content of specific pages from a PageIndex (long) document.
         Only use for documents with doc_type: pageindex. For short documents,
         use read_file instead.
         Args:
             doc_name: Document name (e.g. 'attention-is-all-you-need').
             pages: Page specification (e.g. '3-5,7,10-12').
         """
-        from openkb.agent.tools import get_page_content
-        return get_page_content(doc_name, pages, wiki_root)
+        return get_wiki_page_content(doc_name, pages, wiki_root)
 
     @function_tool
     def get_image(image_path: str) -> ToolOutputImage | ToolOutputText:
@@ -86,7 +85,7 @@ def get_image(image_path: str) -> ToolOutputImage | ToolOutputText:
     return Agent(
         name="wiki-query",
         instructions=instructions,
-        tools=[read_file, get_page_content_tool, get_image],
+        tools=[read_file, get_page_content, get_image],
         model=f"litellm/{model}",
         model_settings=ModelSettings(parallel_tool_calls=False),
     )

openkb/agent/tools.py

@@ -89,7 +89,7 @@ def parse_pages(pages: str) -> list[int]:
     return sorted(n for n in result if n > 0)
 
 
-def get_page_content(doc_name: str, pages: str, wiki_root: str) -> str:
+def get_wiki_page_content(doc_name: str, pages: str, wiki_root: str) -> str:
     """Return formatted content for specified pages of a document.
 
     Reads ``{wiki_root}/sources/{doc_name}.json`` which must be a JSON array of

tests/test_agent_tools.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from openkb.agent.tools import get_page_content, list_wiki_files, parse_pages, read_wiki_file, write_wiki_file
+from openkb.agent.tools import get_wiki_page_content, list_wiki_files, parse_pages, read_wiki_file, write_wiki_file
 
 
 # ---------------------------------------------------------------------------
@@ -159,11 +159,11 @@ def test_ignores_zero_and_negative(self):
 
 
 # ---------------------------------------------------------------------------
-# get_page_content
+# get_wiki_page_content
 # ---------------------------------------------------------------------------
 
 
-class TestGetPageContent:
+class TestGetWikiPageContent:
     def test_reads_pages_from_json(self, tmp_path):
         import json
         wiki_root = str(tmp_path)
@@ -175,7 +175,7 @@ def test_reads_pages_from_json(self, tmp_path):
             {"page": 3, "content": "Page three text."},
         ]
         (sources / "paper.json").write_text(json.dumps(pages), encoding="utf-8")
-        result = get_page_content("paper", "1,3", wiki_root)
+        result = get_wiki_page_content("paper", "1,3", wiki_root)
         assert "[Page 1]" in result
         assert "Page one text." in result
         assert "[Page 3]" in result
@@ -185,7 +185,7 @@ def test_reads_pages_from_json(self, tmp_path):
     def test_returns_error_for_missing_file(self, tmp_path):
         wiki_root = str(tmp_path)
         (tmp_path / "sources").mkdir()
-        result = get_page_content("nonexistent", "1", wiki_root)
+        result = get_wiki_page_content("nonexistent", "1", wiki_root)
         assert "not found" in result.lower()
 
     def test_returns_error_for_no_matching_pages(self, tmp_path):
@@ -195,7 +195,7 @@ def test_returns_error_for_no_matching_pages(self, tmp_path):
         sources.mkdir()
         pages = [{"page": 1, "content": "Only page."}]
         (sources / "paper.json").write_text(json.dumps(pages), encoding="utf-8")
-        result = get_page_content("paper", "99", wiki_root)
+        result = get_wiki_page_content("paper", "99", wiki_root)
         assert "no content" in result.lower()
 
     def test_includes_images_info(self, tmp_path):
@@ -205,11 +205,11 @@ def test_includes_images_info(self, tmp_path):
         sources.mkdir()
         pages = [{"page": 1, "content": "Text.", "images": [{"path": "images/p/img.png", "width": 100, "height": 80}]}]
         (sources / "doc.json").write_text(json.dumps(pages), encoding="utf-8")
-        result = get_page_content("doc", "1", wiki_root)
+        result = get_wiki_page_content("doc", "1", wiki_root)
         assert "img.png" in result
 
     def test_path_escape_denied(self, tmp_path):
         wiki_root = str(tmp_path)
         (tmp_path / "sources").mkdir()
-        result = get_page_content("../../etc/passwd", "1", wiki_root)
+        result = get_wiki_page_content("../../etc/passwd", "1", wiki_root)
         assert "denied" in result.lower() or "not found" in result.lower()

tests/test_query.py

@@ -23,7 +23,7 @@ def test_agent_tool_names(self, tmp_path):
         agent = build_query_agent(str(tmp_path), "gpt-4o-mini")
         names = {t.name for t in agent.tools}
         assert "read_file" in names
-        assert "get_page_content_tool" in names
+        assert "get_page_content" in names
         assert "get_image" in names
 
     def test_instructions_mention_get_page_content(self, tmp_path):