From cd6c2a549582d138ac8db0541748a28c2b5c09fb Mon Sep 17 00:00:00 2001 From: emme1t <149944796+emme1t@users.noreply.github.com> Date: Fri, 20 Nov 2026 23:36:06 -0800 Subject: [PATCH 1/2] fix: close output suppression streams after use --- CHANGELOG.md | 1 + llama_cpp/_utils.py | 79 +++++++++------------------- tests/test_suppress_stdout_stderr.py | 41 +++++++++++++++ 3 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 tests/test_suppress_stdout_stderr.py diff --git a/CHANGELOG.md b/CHANGELOG.md index c582001020..1e1475a7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- fix: close output suppression streams after use by @emme1t - fix(ci): remove unsupported macOS 14 release runners by @abetlen in #2416 ## [0.3.37] diff --git a/llama_cpp/_utils.py b/llama_cpp/_utils.py index 08ede64205..71872fe0d7 100644 --- a/llama_cpp/_utils.py +++ b/llama_cpp/_utils.py @@ -1,12 +1,8 @@ import os import sys - +from contextlib import ExitStack from typing import Any, Dict -# Avoid "LookupError: unknown encoding: ascii" when open() called in a destructor -outnull_file = open(os.devnull, "w") -errnull_file = open(os.devnull, "w") - STDOUT_FILENO = 1 STDERR_FILENO = 2 @@ -16,65 +12,42 @@ class suppress_stdout_stderr(object): # this context manager inside of a __del__ method sys = sys os = os + _open = staticmethod(open) def __init__(self, disable: bool = True): self.disable = disable - # Oddly enough this works better than the contextlib version def __enter__(self): if self.disable: return self - self.old_stdout_fileno_undup = STDOUT_FILENO - self.old_stderr_fileno_undup = STDERR_FILENO - - self.old_stdout_fileno = self.os.dup(self.old_stdout_fileno_undup) - self.old_stderr_fileno = self.os.dup(self.old_stderr_fileno_undup) - - self.old_stdout = self.sys.stdout - self.old_stderr = self.sys.stderr - - # In Jupyter notebooks, ipykernel replaces sys.stdout/stderr with - # OutStream objects that hold their own copy of the original fd in - # _original_stdstream_copy. This bypasses our dup2 redirect, so we - # need to point that copy at the real fd temporarily. - # https://github.com/ipython/ipykernel/blob/912923542d55e6c80c0e7c1f94c648b52a225011/ipykernel/iostream.py#L618-L622 - self._saved_stdout_copy = getattr( - self.sys.stdout, "_original_stdstream_copy", None - ) - self._saved_stderr_copy = getattr( - self.sys.stderr, "_original_stdstream_copy", None - ) - if self._saved_stdout_copy is not None: - self.sys.stdout._original_stdstream_copy = self.old_stdout_fileno_undup - if self._saved_stderr_copy is not None: - self.sys.stderr._original_stdstream_copy = self.old_stderr_fileno_undup - - self.os.dup2(outnull_file.fileno(), self.old_stdout_fileno_undup) - self.os.dup2(errnull_file.fileno(), self.old_stderr_fileno_undup) - - self.sys.stdout = outnull_file - self.sys.stderr = errnull_file + with ExitStack() as redirects: + # An explicit encoding also works when called during interpreter shutdown. + null_stream = redirects.enter_context( + self._open(self.os.devnull, "w", encoding="utf-8") + ) + for name, fd in (("stdout", STDOUT_FILENO), ("stderr", STDERR_FILENO)): + original_fd = self.os.dup(fd) + redirects.callback(self.os.close, original_fd) + self.os.dup2(null_stream.fileno(), fd) + redirects.callback(self.os.dup2, original_fd, fd) + + stream = getattr(self.sys, name) + # ipykernel's OutStream also writes through its own saved fd. + saved_copy = getattr(stream, "_original_stdstream_copy", None) + if saved_copy is not None: + stream._original_stdstream_copy = fd + redirects.callback( + setattr, stream, "_original_stdstream_copy", saved_copy + ) + setattr(self.sys, name, null_stream) + redirects.callback(setattr, self.sys, name, stream) + self._redirects = redirects.pop_all() return self def __exit__(self, *_): - if self.disable: - return - - self.sys.stdout = self.old_stdout - self.sys.stderr = self.old_stderr - - self.os.dup2(self.old_stdout_fileno, self.old_stdout_fileno_undup) - self.os.dup2(self.old_stderr_fileno, self.old_stderr_fileno_undup) - - self.os.close(self.old_stdout_fileno) - self.os.close(self.old_stderr_fileno) - - # Restore ipykernel's OutStream fd copies - if self._saved_stdout_copy is not None: - self.sys.stdout._original_stdstream_copy = self._saved_stdout_copy - if self._saved_stderr_copy is not None: - self.sys.stderr._original_stdstream_copy = self._saved_stderr_copy + if not self.disable: + self._redirects.close() class MetaSingleton(type): diff --git a/tests/test_suppress_stdout_stderr.py b/tests/test_suppress_stdout_stderr.py new file mode 100644 index 0000000000..fb57249c7b --- /dev/null +++ b/tests/test_suppress_stdout_stderr.py @@ -0,0 +1,41 @@ +import subprocess +import sys +from textwrap import dedent + + +def test_suppression_releases_null_streams_at_shutdown(): + script = dedent( + """ + import gc + import os + import sys + from llama_cpp._utils import suppress_stdout_stderr + + with suppress_stdout_stderr(disable=False): + print("hidden", flush=True) + with suppress_stdout_stderr(disable=False): + os.write(2, b"hidden") + os.write(1, b"hidden") + + print("restored", flush=True) + print("restored", file=sys.stderr, flush=True) + + class Cleanup: + def __del__(self): + with suppress_stdout_stderr(disable=False): + os.write(2, b"hidden during shutdown") + print("cleanup finished", file=sys.stderr, flush=True) + + gc.disable() + cleanup = Cleanup() + cleanup.cycle = cleanup + """ + ) + result = subprocess.run( + [sys.executable, "-Walways::ResourceWarning", "-c", script], + capture_output=True, + text=True, + check=True, + ) + assert result.stdout == "restored\n" + assert result.stderr == "restored\ncleanup finished\n" From 83c5bc1286d4dccc7a285163ca453e730988c04a Mon Sep 17 00:00:00 2001 From: emme1t <149944796+emme1t@users.noreply.github.com> Date: Fri, 20 Nov 2026 23:38:28 -0800 Subject: [PATCH 2/2] docs: link the output suppression fix in the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e1475a7db..5dac992627 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- fix: close output suppression streams after use by @emme1t +- fix: close output suppression streams after use by @emme1t in #2427 - fix(ci): remove unsupported macOS 14 release runners by @abetlen in #2416 ## [0.3.37]