qs-ask: report why it went quiet on stderr
Silence on stdout is the launcher's fall-back-to-Wikipedia signal, so it
has to stay clean — but that made a misconfigured key indistinguishable
from a working fallback. Every reason now prints on stderr, which the
launcher discards and a human running qs-ask by hand can read.
Drops curl -f so a 4xx body's own error message ("API key is invalid.")
surfaces instead of just an exit code, and guards the specific mistake of
pasting the sk-ant-... placeholder literally.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
958dc9b333
commit
dbed82bab4
1 changed files with 37 additions and 11 deletions
|
|
@ -78,15 +78,23 @@
|
||||||
# printf '%s' sk-ant-... > ~/.config/anthropic/api-key
|
# printf '%s' sk-ant-... > ~/.config/anthropic/api-key
|
||||||
# chmod 600 ~/.config/anthropic/api-key
|
# chmod 600 ~/.config/anthropic/api-key
|
||||||
#
|
#
|
||||||
# Prints nothing on a missing key, a failed call, or an UNKNOWN reply —
|
# STDOUT is the launcher's channel: the answer, or nothing at all on a
|
||||||
# the launcher reads silence as "fall back to Wikipedia".
|
# missing key, a failed call, or an UNKNOWN reply — silence is what the
|
||||||
|
# launcher reads as "fall back to Wikipedia", so it must stay clean.
|
||||||
|
# Every reason for that silence is reported on STDERR instead, which the
|
||||||
|
# launcher discards but a human running `qs-ask` by hand can read.
|
||||||
(pkgs.writeShellScriptBin "qs-ask" ''
|
(pkgs.writeShellScriptBin "qs-ask" ''
|
||||||
q=$(${pkgs.coreutils}/bin/cat)
|
q=$(${pkgs.coreutils}/bin/cat)
|
||||||
[ -z "$q" ] && exit 0
|
[ -z "$q" ] && { echo "qs-ask: no question on stdin" >&2; exit 0; }
|
||||||
key_file="$HOME/.config/anthropic/api-key"
|
key_file="$HOME/.config/anthropic/api-key"
|
||||||
[ -r "$key_file" ] || exit 0
|
[ -r "$key_file" ] || { echo "qs-ask: no readable key at $key_file" >&2; exit 0; }
|
||||||
key=$(${pkgs.coreutils}/bin/tr -d '\n' < "$key_file")
|
key=$(${pkgs.coreutils}/bin/tr -d '\n' < "$key_file")
|
||||||
[ -z "$key" ] && exit 0
|
[ -z "$key" ] && { echo "qs-ask: key file is empty" >&2; exit 0; }
|
||||||
|
# Catches the classic paste-the-placeholder-literally mistake, which
|
||||||
|
# otherwise only shows up as an opaque 401.
|
||||||
|
case "$key" in
|
||||||
|
sk-ant-...|*...) echo "qs-ask: key file holds a placeholder, not a real key" >&2; exit 0 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
# jq builds the body, so a question containing quotes or backslashes
|
# jq builds the body, so a question containing quotes or backslashes
|
||||||
# can't break out of the JSON string.
|
# can't break out of the JSON string.
|
||||||
|
|
@ -97,16 +105,34 @@
|
||||||
messages: [ { role: "user", content: $q } ]
|
messages: [ { role: "user", content: $q } ]
|
||||||
}')
|
}')
|
||||||
|
|
||||||
ans=$(${pkgs.curl}/bin/curl -sf --max-time 10 https://api.anthropic.com/v1/messages \
|
# No -f here: a 4xx body carries the API's own error message, which is
|
||||||
|
# far more useful on stderr than curl's exit code. Status is appended on
|
||||||
|
# its own line so it can be split off the JSON.
|
||||||
|
resp=$(${pkgs.curl}/bin/curl -s -w '\n%{http_code}' --max-time 10 \
|
||||||
|
https://api.anthropic.com/v1/messages \
|
||||||
-H 'content-type: application/json' \
|
-H 'content-type: application/json' \
|
||||||
-H "x-api-key: $key" \
|
-H "x-api-key: $key" \
|
||||||
-H 'anthropic-version: 2023-06-01' \
|
-H 'anthropic-version: 2023-06-01' \
|
||||||
--data-raw "$body" \
|
--data-raw "$body") \
|
||||||
| ${pkgs.jq}/bin/jq -r '[.content[]? | select(.type == "text") | .text] | join(" ")')
|
|| { echo "qs-ask: request failed (network or timeout)" >&2; exit 0; }
|
||||||
|
|
||||||
# UNKNOWN, a refusal (empty content), or any transport error: stay quiet
|
code=''${resp##*$'\n'}
|
||||||
# so the launcher's Wikipedia path answers instead.
|
json=''${resp%$'\n'*}
|
||||||
case "$ans" in ""|null|UNKNOWN*) exit 0 ;; esac
|
|
||||||
|
if [ "$code" != 200 ]; then
|
||||||
|
printf 'qs-ask: HTTP %s — %s\n' "$code" \
|
||||||
|
"$(printf '%s' "$json" | ${pkgs.jq}/bin/jq -r '.error.message // "no error message"')" >&2
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
ans=$(printf '%s' "$json" | ${pkgs.jq}/bin/jq -r '[.content[]? | select(.type == "text") | .text] | join(" ")')
|
||||||
|
|
||||||
|
# UNKNOWN or a refusal (empty content): stay quiet on stdout so the
|
||||||
|
# launcher's Wikipedia path answers instead.
|
||||||
|
case "$ans" in
|
||||||
|
"" |null) echo "qs-ask: empty answer (refusal or no text block)" >&2; exit 0 ;;
|
||||||
|
UNKNOWN*) echo "qs-ask: model replied UNKNOWN" >&2; exit 0 ;;
|
||||||
|
esac
|
||||||
printf '%s' "$ans"
|
printf '%s' "$ans"
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue