@hybridlabor-api/aos 4.4.2-beta.7 → 4.4.2-beta.9

package/skills/global_config/openwiki-skill/scripts/install_daemon.sh

@@ -92,29 +92,58 @@ else
     echo " -> google-genai installed; daemon will run under $DAEMON_PYTHON"
 fi
 
-# 3. Resolve API key
-GEMINI_KEY="${GEMINI_API_KEY:-}"
-if [ -z "$GEMINI_KEY" ]; then
-    echo ""
-    echo "GEMINI_API_KEY is not set in your environment."
-    read -rp "Enter your Gemini API key (or press Enter to skip): " GEMINI_KEY
-fi
+# 3. Resolve provider and API key
+OPENWIKI_PROVIDER="${OPENWIKI_PROVIDER:-google}"
+
+# Map provider to its API key environment variable name
+case "$OPENWIKI_PROVIDER" in
+    google)     API_KEY_VAR="GEMINI_API_KEY" ;;
+    groq)       API_KEY_VAR="GROQ_API_KEY" ;;
+    grok|xai)   API_KEY_VAR="XAI_API_KEY" ;;
+    nvidia)     API_KEY_VAR="NVIDIA_API_KEY" ;;
+    openrouter) API_KEY_VAR="OPENROUTER_API_KEY" ;;
+    openai)     API_KEY_VAR="OPENAI_API_KEY" ;;
+    custom)     API_KEY_VAR="OPENWIKI_API_KEY" ;;
+    ollama)     API_KEY_VAR="" ;;
+    *)          OPENWIKI_PROVIDER="google"; API_KEY_VAR="GEMINI_API_KEY" ;;
+esac
+
+# For Google provider, use the existing interactive flow with verification
+if [ "$OPENWIKI_PROVIDER" = "google" ]; then
+    GEMINI_KEY="${GEMINI_API_KEY:-}"
+    if [ -z "$GEMINI_KEY" ]; then
+        echo ""
+        echo "GEMINI_API_KEY is not set in your environment."
+        read -rp "Enter your Gemini API key (or press Enter to skip): " GEMINI_KEY
+    fi
 
-if [ -n "$GEMINI_KEY" ]; then
-    export GEMINI_API_KEY="$GEMINI_KEY"
-    echo "Verifying API key..."
-    VERIFY_OUTPUT=$("$DAEMON_PYTHON" "$SCRIPTS_DIR/verify_api_key.py" 2>&1)
-    VERIFY_CODE=$?
-    if [ $VERIFY_CODE -eq 0 ] && echo "$VERIFY_OUTPUT" | grep -q "VERIFIED_OK"; then
-        echo " -> API key verified successfully."
+    if [ -n "$GEMINI_KEY" ]; then
+        export GEMINI_API_KEY="$GEMINI_KEY"
+        echo "Verifying API key..."
+        VERIFY_OUTPUT=$("$DAEMON_PYTHON" "$SCRIPTS_DIR/verify_api_key.py" 2>&1)
+        VERIFY_CODE=$?
+        if [ $VERIFY_CODE -eq 0 ] && echo "$VERIFY_OUTPUT" | grep -q "VERIFIED_OK"; then
+            echo " -> API key verified successfully."
+        else
+            echo " -> WARNING: API key verification failed (with retry + TLS fallback)."
+            echo "$VERIFY_OUTPUT" | sed 's/^/    /'
+            echo "    The daemon will run in collect-only mode until a valid key is set."
+            GEMINI_KEY=""
+        fi
     else
-        echo " -> WARNING: API key verification failed (with retry + TLS fallback)."
-        echo "$VERIFY_OUTPUT" | sed 's/^/    /'
-        echo "    The daemon will run in collect-only mode until a valid key is set."
-        GEMINI_KEY=""
+        echo "No API key provided. Daemon will run in collect-only mode."
     fi
+    API_KEY="$GEMINI_KEY"
 else
-    echo "No API key provided. Daemon will run in collect-only mode."
+    # For non-Google providers, skip verification and use the configured key
+    if [ -n "$API_KEY_VAR" ]; then
+        API_KEY="${!API_KEY_VAR:-}"
+    else
+        API_KEY=""
+    fi
+    if [ -z "$API_KEY" ]; then
+        echo "No API key provided for provider '$OPENWIKI_PROVIDER'. Daemon will run in collect-only mode."
+    fi
 fi
 
 # --- Helpers -------------------------------------------------------------
@@ -179,12 +208,29 @@ write_launcher() {
         {
             printf '#!/bin/sh\n'
             printf '# Generated by install_daemon.sh - do not edit, re-run the installer.\n'
-            printf '# Holds the OpenWiki API key so it stays out of the LaunchAgent plist\n'
-            printf '# and the systemd unit. Mode 700 on purpose.\n'
+            printf '# Holds the OpenWiki provider config and API keys so they stay out of\n'
+            printf '# the LaunchAgent plist and the systemd unit. Mode 700 on purpose.\n'
             printf 'HOME=%s; export HOME\n' "$(sq "$HOME")"
             printf 'PATH=%s; export PATH\n' "$(sq "$path_value")"
-            if [ -n "$GEMINI_KEY" ]; then
-                printf 'GEMINI_API_KEY=%s; export GEMINI_API_KEY\n' "$(sq "$GEMINI_KEY")"
+            if [ -n "$OPENWIKI_PROVIDER" ]; then
+                printf 'OPENWIKI_PROVIDER=%s; export OPENWIKI_PROVIDER\n' "$(sq "$OPENWIKI_PROVIDER")"
+            fi
+            if [ -n "$OPENWIKI_MODEL" ]; then
+                printf 'OPENWIKI_MODEL=%s; export OPENWIKI_MODEL\n' "$(sq "$OPENWIKI_MODEL")"
+            fi
+            if [ -n "$OPENWIKI_BASE_URL" ]; then
+                printf 'OPENWIKI_BASE_URL=%s; export OPENWIKI_BASE_URL\n' "$(sq "$OPENWIKI_BASE_URL")"
+            fi
+            if [ -n "$API_KEY" ]; then
+                case "$OPENWIKI_PROVIDER" in
+                    google)     printf 'GEMINI_API_KEY=%s; export GEMINI_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    groq)       printf 'GROQ_API_KEY=%s; export GROQ_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    grok|xai)   printf 'XAI_API_KEY=%s; export XAI_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    nvidia)     printf 'NVIDIA_API_KEY=%s; export NVIDIA_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    openrouter) printf 'OPENROUTER_API_KEY=%s; export OPENROUTER_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    openai)     printf 'OPENAI_API_KEY=%s; export OPENAI_API_KEY\n' "$(sq "$API_KEY")" ;;
+                    custom)     printf 'OPENWIKI_API_KEY=%s; export OPENWIKI_API_KEY\n' "$(sq "$API_KEY")" ;;
+                esac
             fi
             printf 'exec %s %s --one-shot\n' "$(sq "$python_bin")" "$(sq "$SCRIPT_PATH")"
         } > "$LAUNCHER_PATH"
@@ -214,7 +260,7 @@ if [ "$OS" = "macos" ]; then
 
     MACOS_PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     write_launcher "$DAEMON_PYTHON" "$MACOS_PATH"
-    echo " -> Launcher written to $LAUNCHER_PATH (mode 700; holds the API key, if any)."
+    echo " -> Launcher written to $LAUNCHER_PATH (mode 700; holds the provider config and API key)."
 
     cat <<EOF > "$PLIST_PATH"
 <?xml version="1.0" encoding="UTF-8"?>
@@ -272,7 +318,7 @@ elif [ "$OS" = "linux" ]; then
 
     LINUX_PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     write_launcher "$DAEMON_PYTHON" "$LINUX_PATH"
-    echo " -> Launcher written to $LAUNCHER_PATH (mode 700; holds the API key, if any)."
+    echo " -> Launcher written to $LAUNCHER_PATH (mode 700; holds the provider config and API key)."
 
     cat > "$SYSTEMD_SERVICE" <<EOF
 [Unit]