From aca6425ee9044aaa9f1edcc7a168b72ac0c7a6de Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Wed, 2 Sep 2026 21:17:48 -0700 Subject: [PATCH] refactor(agent/relay): Noop host via staticmethod lambdas; grouped default-flag declarations --- agent/relay_llm.py | 10 +++------- agent/relay_runtime.py | 23 +++++++---------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/agent/relay_llm.py b/agent/relay_llm.py index b599d3cfee..6f6a3358f4 100644 --- a/agent/relay_llm.py +++ b/agent/relay_llm.py @@ -268,17 +268,13 @@ class ManagedLlmStream(Iterator[Any]): """Synchronous view of one Relay-managed provider stream, driven from the worker thread.""" final_response: Any = None - output_modified = False + output_modified = _closed = _provider_completed = False _loop: asyncio.AbstractEventLoop | None = None - _stream: Any = None - _raw_stream_resource: Any = None - _closed = False + _stream = _raw_stream_resource = None _runtime_lease: relay_runtime.RelayOperationLease | None = None - _close_error: BaseException | None = None - _callback_error: BaseException | None = None + _close_error = _callback_error = None # BaseException | None _logical: _LogicalCall | None = None _logical_response_model_name: str | None = None - _provider_completed = False def __init__( self, request: dict[str, Any], stream_factory: Callable[[dict[str, Any]], Any], *, session_id: str, diff --git a/agent/relay_runtime.py b/agent/relay_runtime.py index 103d9f7cc2..dcff78b1a7 100644 --- a/agent/relay_runtime.py +++ b/agent/relay_runtime.py @@ -197,16 +197,14 @@ class RelayOperationLease: def run_in_session(self, session: RelaySession, callback: Callable[..., Any], *args: Any, **kwargs: Any) -> Any: """Run cleanup while this lease still owns the runtime lifetime.""" with self._lock: - runtime = self._runtime - if runtime is None: + if self._runtime is None: raise RuntimeError("Hermes Relay operation lease is released") - return runtime._run_in_session_untracked(session, callback, *args, **kwargs) + return self._runtime._run_in_session_untracked(session, callback, *args, **kwargs) def release(self) -> None: """Release this lease exactly once.""" with self._lock: - runtime = self._runtime - self._runtime = None + runtime, self._runtime = self._runtime, None if runtime is not None: runtime._end_operation() @@ -348,8 +346,7 @@ class RelayRuntime: self._sessions: dict[str, RelaySession] = {} self._subagent_parents: dict[str, str] = {} self._subagent_parent_handles: dict[str, Any] = {} - self._closing = False - self._shutdown_started = False + self._closing = self._shutdown_started = False self._shutdown_complete = threading.Event() self._operations_idle = threading.Event() self._operations_idle.set() @@ -734,8 +731,7 @@ class RelayRuntime: with self._sessions_lock: if self._shutdown_started: return - self._shutdown_started = True - self._closing = True + self._shutdown_started = self._closing = True has_active_operations = self._active_operations > 0 if not has_active_operations: self._finish_shutdown() @@ -788,13 +784,8 @@ class NoopRelayRuntime: pass release_managed_execution = retain_managed_execution - - @staticmethod - def managed_execution_enabled() -> bool: - return False - - def shutdown(self) -> None: - """No resources are allocated on unsupported platforms.""" + managed_execution_enabled = staticmethod(lambda: False) + shutdown = staticmethod(lambda: None) # no resources are allocated on unsupported platforms RelayHost = RelayRuntime | NoopRelayRuntime