-
Notifications
You must be signed in to change notification settings - Fork 52.5k
fix: stabilize BlueBubbles webhook handling #43672
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bryangauvin
wants to merge
1
commit into
NousResearch:main
Choose a base branch
from
bryangauvin:codex/bluebubbles-webhook-stability
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1018,6 +1018,9 @@ def _emit_auxiliary_failure(self, task: str, exc: BaseException) -> None: | |
| detail = (detail or exc.__class__.__name__).strip() | ||
| if len(detail) > 220: | ||
| detail = detail[:217].rstrip() + "..." | ||
| if task.strip().lower() == "title generation": | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This reverses the existing title-generation contract: |
||
| logger.debug("Auxiliary title generation failed: %s", detail) | ||
| return | ||
| self._emit_warning(f"⚠ Auxiliary {task} failed: {detail}") | ||
|
|
||
| def _current_main_runtime(self) -> Dict[str, str]: | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| from run_agent import AIAgent | ||
|
|
||
|
|
||
| def _make_agent(): | ||
| agent = AIAgent.__new__(AIAgent) | ||
| warnings = [] | ||
| agent._emit_warning = warnings.append | ||
| agent._summarize_api_error = lambda exc: str(exc) | ||
| return agent, warnings | ||
|
|
||
|
|
||
| def test_title_generation_aux_failure_not_user_visible(): | ||
| agent, warnings = _make_agent() | ||
| agent._emit_auxiliary_failure("title generation", TypeError("NoneType object is not iterable")) | ||
| assert warnings == [] | ||
|
|
||
|
|
||
| def test_non_title_aux_failure_still_user_visible(): | ||
| agent, warnings = _make_agent() | ||
| agent._emit_auxiliary_failure("vision", RuntimeError("provider timeout")) | ||
| assert len(warnings) == 1 | ||
| assert warnings[0].startswith("⚠ Auxiliary vision failed:") |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This checks the sender/text fallback even after recording a new stable ID. A user who sends the same text twice within 90 seconds gets the second, distinct message acknowledged and dropped. Use the ID exclusively when present; reserve a collision-safe fallback for id-less payloads.