-
Notifications
You must be signed in to change notification settings - Fork 3.3k
fix(cli):detailed error message on sse stream specifying stacktrack,error type on client side as well #4248
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
DineshThumma9
wants to merge
6
commits into
google:main
Choose a base branch
from
DineshThumma9:sse-detailed-error
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 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
787e933
fix(cli):detailed error message on sse stream specifying stacktrack ,…
DineshThumma9 2d296d6
minor changes
DineshThumma9 046302f
formatted and linted
DineshThumma9 5027627
Merge branch 'main' into sse-detailed-error
DineshThumma9 4805259
Merge branch 'main' into sse-detailed-error
DineshThumma9 63d552e
Merge branch 'main' into sse-detailed-error
DineshThumma9 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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| from typing import List | ||
| from typing import Literal | ||
| from typing import Optional | ||
| import uuid | ||
|
|
||
| from fastapi import FastAPI | ||
| from fastapi import HTTPException | ||
|
|
@@ -761,7 +762,7 @@ async def internal_lifespan(app: FastAPI): | |
| async def list_apps( | ||
| detailed: bool = Query( | ||
| default=False, description="Return detailed app information" | ||
| ) | ||
| ), | ||
| ) -> list[str] | ListAppsResponse: | ||
| if detailed: | ||
| apps_info = self.agent_loader.list_agents_detailed() | ||
|
|
@@ -1554,16 +1555,27 @@ async def event_generator(): | |
| by_alias=True, | ||
| ) | ||
| logger.debug( | ||
| "Generated event in agent run streaming: %s", sse_event | ||
| "Generated event in agent run streaming: %s", | ||
| sse_event, | ||
| ) | ||
| yield f"data: {sse_event}\n\n" | ||
| except Exception as e: | ||
| logger.exception("Error in event_generator: %s", e) | ||
| # Yield a proper Event object for the error | ||
| logger.debug("Exception in agent run streaming: %s", e) | ||
|
Contributor
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. |
||
|
|
||
| error_details = { | ||
| "error_type": type(e).__name__, | ||
| "error_message": str(e), | ||
| "timestamp": time.time(), | ||
|
DineshThumma9 marked this conversation as resolved.
DineshThumma9 marked this conversation as resolved.
|
||
| } | ||
|
|
||
| if logger.isEnabledFor(logging.DEBUG): | ||
| error_details["stacktrace"] = traceback.format_exc() | ||
|
|
||
| error_event = Event( | ||
| author="system", | ||
| content=types.Content( | ||
| role="model", parts=[types.Part(text=f"Error: {e}")] | ||
| role="model", | ||
| parts=[types.Part(text=json.dumps(error_details))], | ||
| ), | ||
| ) | ||
| yield ( | ||
|
|
||
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.
Consider using
logger.debugwith theextraparameter to include additional context, such as the session ID or user ID, in the log message. This can aid in debugging and tracing issues in multi-user environments.For example: