jpmschweitzerandClaude
78066fab1b
Mechanical only, and separated from the judgment calls that follow so the reviewable changes are not buried in a 98-file whitespace diff. 227 automatic fixes: 60 blank lines carrying whitespace, 60 unsorted import blocks, 34 Optional[X] to X | None, 28 unused imports, 16 deprecated typing imports, 12 datetime.timezone.utc to datetime.UTC, and assorted smaller modernisations. Then `ruff format` over src and tests: 98 files reformatted, 35 already conforming. No file among the unused-import findings defines __all__ or is an __init__.py, so nothing here removes a re-export. `make test`: 658 passed, unchanged from HEAD. Two things observed while verifying, neither addressed here: `pytest tests/` cannot collect — tests/e2e/test_orchestration_e2e.py uses an `e2e` marker that is not registered, and the config is strict about markers. This fails identically at HEAD, so it predates this change; `make test` passes because it ignores tests/e2e, tests/integration and tests/contracts. test_tatlock_tool_call_logging_calculator is flaky. It failed once in a full run with these changes and passed on the next, passes in isolation with them, and fails in isolation at HEAD. It is order- or timing-dependent, not a regression from this commit — established by running the full suite both ways rather than by reasoning about which change could have caused it. Co-Authored-By: Claude <noreply@anthropic.com>
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
"""
|
|
Snapshot tests for the JSON schemas emitted for librarian tools.
|
|
|
|
Ollama's OpenAI-compatible API mishandles anyOf[X, null] parameter
|
|
schemas, so tool parameters must use empty-string/empty-list sentinels
|
|
translated to None inside the tool (same pattern as the biographer
|
|
tools, commit 9d7ce39). This test fails if a X | None parameter ever
|
|
creeps back in.
|
|
"""
|
|
|
|
import pytest
|
|
from pydantic_ai.tools import Tool
|
|
|
|
from src.agents.librarian.tools import LIBRARIAN_TOOLS
|
|
|
|
|
|
def _nullable_anyof_paths(schema: object, path: str = "") -> list[str]:
|
|
"""Recursively collect JSON-schema paths that are anyOf[..., null]."""
|
|
offenders: list[str] = []
|
|
if isinstance(schema, dict):
|
|
any_of = schema.get("anyOf")
|
|
if isinstance(any_of, list) and any(
|
|
isinstance(sub, dict) and sub.get("type") == "null" for sub in any_of
|
|
):
|
|
offenders.append(path or "<root>")
|
|
for key, value in schema.items():
|
|
offenders.extend(_nullable_anyof_paths(value, f"{path}/{key}"))
|
|
elif isinstance(schema, list):
|
|
for i, item in enumerate(schema):
|
|
offenders.extend(_nullable_anyof_paths(item, f"{path}[{i}]"))
|
|
return offenders
|
|
|
|
|
|
@pytest.mark.unit
|
|
class TestLibrarianToolSchemas:
|
|
"""All registered librarian tools emit Ollama-safe parameter schemas."""
|
|
|
|
@pytest.mark.parametrize("tool_func", LIBRARIAN_TOOLS, ids=lambda f: f.__name__)
|
|
def test_no_nullable_anyof_in_schema(self, tool_func):
|
|
schema = Tool(tool_func).function_schema.json_schema
|
|
|
|
offenders = _nullable_anyof_paths(schema)
|
|
|
|
assert offenders == [], (
|
|
f"{tool_func.__name__} emits anyOf[..., null] at {offenders}; "
|
|
"use empty-string/empty-list sentinels instead of X | None"
|
|
)
|