fix(confluence): limit simple-search fallback - #1646
Open
atirna wants to merge 2 commits into
Open
Conversation
AmirF194
reviewed
Sep 4, 2026
cql() raises ApiValueError for a 400, which the fetcher's handle_atlassian_api_errors wraps in RuntimeError, so the previous HTTPError-only except never fired and the sooperset#270 fallback regressed. Unwrap the ApiError reason when the 400 arrives as RuntimeError and drive both carriers in the tests.
|
That matches the chain I traced. Makes sense that ApiValueError cannot be caught directly at this layer since the decorator already wraps it in RuntimeError before the tool sees it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
I limited the simple-query
confluence_searchfallback to HTTP 400 responses. Read timeouts and other transport failures now return after the firstsiteSearchrequest instead of starting a second search.Testing
uv run pytest tests/unit/servers/test_confluence_server.py -quv run pre-commit run --files src/mcp_atlassian/servers/confluence.py tests/unit/servers/test_confluence_server.pyFixes #1644