mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-08 03:01:47 +00:00
fix(cli): replace get_event_loop() with get_running_loop() to silence RuntimeWarning in process_loop thread (#19285)
This commit is contained in:
parent
2c1921241c
commit
edbbc96b55
2 changed files with 143 additions and 2 deletions
14
cli.py
14
cli.py
|
|
@ -1408,7 +1408,13 @@ def _cprint(text: str):
|
|||
|
||||
import asyncio as _asyncio
|
||||
try:
|
||||
current_loop = _asyncio.get_event_loop_policy().get_event_loop()
|
||||
# Use get_running_loop() instead of get_event_loop() to avoid the
|
||||
# DeprecationWarning / RuntimeWarning emitted by Python 3.10+ when
|
||||
# get_event_loop() is called from a thread that has no current event
|
||||
# loop set (e.g. the process_loop background thread). Fixes #19285.
|
||||
current_loop = _asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
current_loop = None
|
||||
except Exception:
|
||||
current_loop = None
|
||||
# Same thread as the app's loop → safe to print directly.
|
||||
|
|
@ -12190,8 +12196,12 @@ class HermesCLI:
|
|||
# Set the custom handler on prompt_toolkit's event loop
|
||||
try:
|
||||
import asyncio as _aio
|
||||
_loop = _aio.get_event_loop()
|
||||
# Use get_running_loop() to avoid DeprecationWarning on
|
||||
# Python 3.10+ when called outside an async context.
|
||||
_loop = _aio.get_running_loop()
|
||||
_loop.set_exception_handler(_suppress_closed_loop_errors)
|
||||
except RuntimeError:
|
||||
pass # No running loop -- nothing to patch
|
||||
except Exception:
|
||||
pass
|
||||
app.run()
|
||||
|
|
|
|||
131
tests/test_process_loop_event_loop_warning.py
Normal file
131
tests/test_process_loop_event_loop_warning.py
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
"""Tests for the process_loop RuntimeWarning fix -- issue #19285.
|
||||
|
||||
In Python 3.10+, calling asyncio.get_event_loop() from a non-main thread
|
||||
that has no current event loop emits a DeprecationWarning (3.10/3.11) or
|
||||
RuntimeWarning (3.12+). The fix replaces get_event_loop() with
|
||||
get_running_loop(), which raises RuntimeError (no warning) when there is no
|
||||
running loop.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import sys
|
||||
import threading
|
||||
import warnings
|
||||
|
||||
|
||||
class TestGetRunningLoopReplacement:
|
||||
|
||||
def test_get_running_loop_raises_runtime_error_not_warning(self):
|
||||
warnings_caught = []
|
||||
|
||||
def _thread_target():
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
warnings.simplefilter("always")
|
||||
try:
|
||||
asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
pass
|
||||
warnings_caught.extend(w)
|
||||
|
||||
t = threading.Thread(target=_thread_target, daemon=True)
|
||||
t.start()
|
||||
t.join(timeout=5)
|
||||
|
||||
runtime_warnings = [
|
||||
x for x in warnings_caught
|
||||
if issubclass(x.category, RuntimeWarning)
|
||||
]
|
||||
assert runtime_warnings == [], (
|
||||
f"Unexpected RuntimeWarning(s): {[str(w.message) for w in runtime_warnings]}"
|
||||
)
|
||||
|
||||
def test_get_running_loop_is_silent_get_event_loop_is_not(self):
|
||||
caught_from_running = []
|
||||
|
||||
def _test_get_running_loop():
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
warnings.simplefilter("always")
|
||||
try:
|
||||
asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
pass
|
||||
caught_from_running.extend(w)
|
||||
|
||||
t = threading.Thread(target=_test_get_running_loop, daemon=True)
|
||||
t.start()
|
||||
t.join(timeout=5)
|
||||
|
||||
assert all(
|
||||
not issubclass(w.category, RuntimeWarning)
|
||||
for w in caught_from_running
|
||||
), "get_running_loop() must never emit RuntimeWarning"
|
||||
|
||||
def test_get_running_loop_returns_loop_when_running(self):
|
||||
async def _check():
|
||||
loop = asyncio.get_running_loop()
|
||||
assert loop is not None
|
||||
assert loop.is_running()
|
||||
|
||||
asyncio.run(_check())
|
||||
|
||||
def test_no_warning_from_background_thread_with_fix(self):
|
||||
warnings_caught = []
|
||||
|
||||
def _thread_target():
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
warnings.simplefilter("always")
|
||||
try:
|
||||
current_loop = asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
current_loop = None
|
||||
except Exception:
|
||||
current_loop = None
|
||||
assert current_loop is None
|
||||
warnings_caught.extend(w)
|
||||
|
||||
t = threading.Thread(target=_thread_target, daemon=True)
|
||||
t.start()
|
||||
t.join(timeout=5)
|
||||
|
||||
runtime_warnings = [
|
||||
x for x in warnings_caught
|
||||
if issubclass(x.category, RuntimeWarning)
|
||||
]
|
||||
assert runtime_warnings == [], (
|
||||
f"RuntimeWarning emitted despite fix: "
|
||||
f"{[str(w.message) for w in runtime_warnings]}"
|
||||
)
|
||||
|
||||
def test_fixed_pattern_in_process_loop_context(self):
|
||||
results = {}
|
||||
warnings_list = []
|
||||
|
||||
def _process_loop_simulation():
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
warnings.simplefilter("always")
|
||||
try:
|
||||
current_loop = asyncio.get_running_loop()
|
||||
except RuntimeError:
|
||||
current_loop = None
|
||||
except Exception:
|
||||
current_loop = None
|
||||
results["current_loop"] = current_loop
|
||||
warnings_list.extend(w)
|
||||
|
||||
t = threading.Thread(
|
||||
target=_process_loop_simulation,
|
||||
name="Thread-3 (process_loop)",
|
||||
daemon=True,
|
||||
)
|
||||
t.start()
|
||||
t.join(timeout=5)
|
||||
|
||||
assert results.get("current_loop") is None
|
||||
runtime_warnings = [
|
||||
x for x in warnings_list
|
||||
if issubclass(x.category, RuntimeWarning)
|
||||
]
|
||||
assert runtime_warnings == [], (
|
||||
f"process_loop simulation still emits RuntimeWarning: "
|
||||
f"{[str(w.message) for w in runtime_warnings]}"
|
||||
)
|
||||
Loading…
Add table
Add a link
Reference in a new issue