fix(ai-kimi): add source fallback, simplify reauth, check claude presence
- source helpers with 2>/dev/null || true and quoted /home/nikitenko path - remove redundant reauth flag and extra prompt - check that claude is installed before exec - apply same source fix to ai-deepseek for consistency
This commit is contained in:
17
ai-setup.sh
17
ai-setup.sh
@@ -479,7 +479,7 @@ chmod +x "$BIN_DIR/ai-gpt"
|
|||||||
# === ai-deepseek ===
|
# === ai-deepseek ===
|
||||||
cat > "$BIN_DIR/ai-deepseek" << 'DEEPSEEKEOF'
|
cat > "$BIN_DIR/ai-deepseek" << 'DEEPSEEKEOF'
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source ~/.local/bin/ai-api-helpers.sh
|
source "$HOME/.local/bin/ai-api-helpers.sh" 2>/dev/null || true
|
||||||
|
|
||||||
key_file="$HOME/.config/ai-setup/deepseek_key"
|
key_file="$HOME/.config/ai-setup/deepseek_key"
|
||||||
api_key=""
|
api_key=""
|
||||||
@@ -550,11 +550,10 @@ chmod +x "$BIN_DIR/ai-deepseek"
|
|||||||
cat > "$BIN_DIR/ai-kimi" << 'KIMIEOF'
|
cat > "$BIN_DIR/ai-kimi" << 'KIMIEOF'
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# ai-kimi - запуск Claude Code через официальный Kimi Code API
|
# ai-kimi - запуск Claude Code через официальный Kimi Code API
|
||||||
source ~/.local/bin/ai-api-helpers.sh
|
source "$HOME/.local/bin/ai-api-helpers.sh" 2>/dev/null || true
|
||||||
|
|
||||||
key_file="$HOME/.config/ai-setup/kimi_key"
|
key_file="$HOME/.config/ai-setup/kimi_key"
|
||||||
api_key=""
|
api_key=""
|
||||||
reauth=0
|
|
||||||
|
|
||||||
[ -f "$key_file" ] && api_key=$(cat "$key_file")
|
[ -f "$key_file" ] && api_key=$(cat "$key_file")
|
||||||
|
|
||||||
@@ -566,7 +565,6 @@ if [ -n "$api_key" ]; then
|
|||||||
if [ $ret -eq 401 ]; then
|
if [ $ret -eq 401 ]; then
|
||||||
rm -f "$key_file"
|
rm -f "$key_file"
|
||||||
api_key=""
|
api_key=""
|
||||||
reauth=1
|
|
||||||
elif [ $ret -eq 429 ]; then
|
elif [ $ret -eq 429 ]; then
|
||||||
echo -n "Продолжить всё равно? (запросы могут не проходить) [y/N] "
|
echo -n "Продолжить всё равно? (запросы могут не проходить) [y/N] "
|
||||||
read -r _ans; case "${_ans:-N}" in [Yy]*) ;; *) exit 1 ;; esac
|
read -r _ans; case "${_ans:-N}" in [Yy]*) ;; *) exit 1 ;; esac
|
||||||
@@ -575,11 +573,6 @@ if [ -n "$api_key" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$api_key" ] && [ "$reauth" -eq 1 ]; then
|
|
||||||
echo -n "Хотите ввести новый Kimi ключ? [Y/n] "
|
|
||||||
read -r _ans; case "${_ans:-Y}" in [Yy]*) ;; *) exit 1 ;; esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$api_key" ]; then
|
if [ -z "$api_key" ]; then
|
||||||
echo "Получить ключ: https://www.kimi.com/code"
|
echo "Получить ключ: https://www.kimi.com/code"
|
||||||
read -r -p "Введите ваш Kimi API ключ: " api_key
|
read -r -p "Введите ваш Kimi API ключ: " api_key
|
||||||
@@ -604,6 +597,12 @@ if [ -z "$api_key" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! command -v claude &>/dev/null; then
|
||||||
|
echo "Ошибка: Claude Code не найден. Установите через npm:"
|
||||||
|
echo " npm install -g @anthropic-ai/claude-code"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
SYS_PROMPT=$(_build_ai_sys_prompt)
|
SYS_PROMPT=$(_build_ai_sys_prompt)
|
||||||
ANTHROPIC_BASE_URL=https://api.kimi.com/coding \
|
ANTHROPIC_BASE_URL=https://api.kimi.com/coding \
|
||||||
ANTHROPIC_AUTH_TOKEN="$api_key" \
|
ANTHROPIC_AUTH_TOKEN="$api_key" \
|
||||||
|
|||||||
Reference in New Issue
Block a user