Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 42 additions & 4 deletions cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -16389,6 +16389,34 @@ def transfer_to(self, cli) -> None:
self._cli_owner = cli
self._pending_owner = None

def publish_fallback(self, *, interrupted: bool = False) -> bool:
"""Publish one safe terminal frame when a valid query stops early."""

cli = self._cli_owner
if cli is not None:
owner = getattr(cli, "result_meta_fd", None)
if owner is None or owner.closed:
return False
cli._publish_abnormal_result_metadata(interrupted=interrupted)
return True

owner = self._pending_owner
if owner is None or owner.closed:
return False
from hermes_cli.result_metadata import (
PUBLIC_ERROR_MESSAGE,
ResultMetadataError,
publish_abnormal_result_metadata_fd,
)

try:
publish_abnormal_result_metadata_fd(owner, interrupted=interrupted)
except ResultMetadataError:
print(PUBLIC_ERROR_MESSAGE, file=sys.stderr)
raise SystemExit(1) from None
self._pending_owner = None
return True

def close(self) -> None:
cli = self._cli_owner
self._cli_owner = None
Expand Down Expand Up @@ -16461,10 +16489,20 @@ def main(
if not query:
print("Error: --result-meta-fd requires --query.", file=sys.stderr)
raise SystemExit(2)
return _main_impl(
**call_kwargs,
_result_meta_fd_ownership=ownership,
)
try:
result = _main_impl(
**call_kwargs,
_result_meta_fd_ownership=ownership,
)
except BaseException as exc:
if ownership.publish_fallback(
interrupted=isinstance(exc, KeyboardInterrupt)
):
raise SystemExit(0) from None
raise
else:
ownership.publish_fallback()
return result
finally:
try:
ownership.close()
Expand Down
Loading
Loading