Skip to content

fix: Catch BaseException in worker thread to prevent tracebacks on interruption #540

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.

Sign up for GitHub

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

Merged
dwash96 merged 2 commits into from
Jun 1, 2026
Merged

fix: Catch BaseException in worker thread to prevent tracebacks on interruption #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da1ae6b
cli-29: finally fix interruption exception on acompletion
May 27, 2026
3cdd958
fix: Catch BaseException in worker thread to prevent tracebacks
May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cecli/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,11 @@ async def simple_send_with_retries(
continue
except AttributeError:
return None
except KeyboardInterrupt:
# An interrupt was not caught within the async run loop.
# We'll just pass to allow the thread to exit gracefully
# without a scary traceback.
pass

def model_error_response(self):
return litellm.ModelResponse(
Expand Down
12 changes: 3 additions & 9 deletions cecli/tui/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ def _run_thread(self):

try:
self.loop.run_until_complete(self._async_run())
except asyncio.CancelledError:
pass
except RuntimeError:
# Event loop stopped - this is expected during shutdown
except BaseException:
# Catch anything that could bring down the thread, and just let it exit.
# This includes KeyboardInterrupt, SystemExit, etc.
pass
finally:
self._cleanup_loop()
Expand Down Expand Up @@ -188,11 +187,6 @@ def stop(self):
# We'll just pass to allow the thread to exit gracefully
# without a scary traceback.
pass
except KeyboardInterrupt:
# An interrupt was not caught within the async run loop.
# We'll just pass to allow the thread to exit gracefully
# without a scary traceback.
pass
self.interrupt()

# Wait for thread to finish
Expand Down
Loading