Update watch_config.sh

watch_config.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 # ─────────────────────────────────────────────
-#  LiteLLM config watcher
-#  Env vars required:
-#    G_NAME  – GitHub repo in "username/reponame" format
-#    G_TOKEN – GitHub personal access token
+# LiteLLM config watcher (fixed version)
 # ─────────────────────────────────────────────
 
 set -euo pipefail
@@ -11,15 +8,15 @@ set -euo pipefail
 # ── Config ────────────────────────────────────
 CONFIG_PATH="/app/config.yaml"
 BRANCH="${BRANCH:-main}"
-CHECK_INTERVAL="${CHECK_INTERVAL:-1200}" # seconds between polls (default: 20 min)
-FILE_PATH="${FILE_PATH:-config.yaml}"    # path to file inside the repo
-# ─────────────────────────────────────────────
+CHECK_INTERVAL="${CHECK_INTERVAL:-1200}"   # default 20 minutes
+FILE_PATH="${FILE_PATH:-config.yaml}"
 
-# ── Validate required env vars ────────────────
+# ── Validate env vars ─────────────────────────
 if [[ -z "${G_NAME:-}" ]]; then
-  echo "[ERROR] G_NAME is not set (expected: username/reponame)" >&2
+  echo "[ERROR] G_NAME is not set (expected: username/repo)" >&2
   exit 1
 fi
+
 if [[ -z "${G_TOKEN:-}" ]]; then
   echo "[ERROR] G_TOKEN is not set" >&2
   exit 1
@@ -28,73 +25,109 @@ fi
 API_BASE="https://api.github.com/repos/${G_NAME}/contents/${FILE_PATH}?ref=${BRANCH}"
 
 # ── Helpers ───────────────────────────────────
-log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"; }
+log() {
+  echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"
+}
 
 fetch_meta() {
-  python3 -c "
-import urllib.request
+python3 <<EOF
+import urllib.request, json
+
 req = urllib.request.Request(
-  '${API_BASE}',
-  headers={
-    'Authorization': 'token ${G_TOKEN}',
-    'Accept': 'application/vnd.github.v3+json'
-  }
+    "${API_BASE}",
+    headers={
+        "Authorization": "token ${G_TOKEN}",
+        "Accept": "application/vnd.github.v3+json"
+    }
 )
+
 with urllib.request.urlopen(req) as r:
-  print(r.read().decode())
-"
+    print(r.read().decode())
+EOF
+}
+
+get_sha() {
+python3 <<EOF
+import json,sys
+data=json.loads(sys.stdin.read())
+print(data["sha"])
+EOF
+}
+
+get_download_url() {
+python3 <<EOF
+import json,sys
+data=json.loads(sys.stdin.read())
+print(data["download_url"])
+EOF
 }
 
 download_config() {
-  local download_url="$1"
-  python3 -c "
+  local url="$1"
+
+python3 <<EOF
 import urllib.request
+
 req = urllib.request.Request(
-  '${download_url}',
-  headers={'Authorization': 'token ${G_TOKEN}'}
+    "${url}",
+    headers={"Authorization": "token ${G_TOKEN}"}
 )
-with urllib.request.urlopen(req) as r, open('${CONFIG_PATH}', 'wb') as f:
-  f.write(r.read())
-"
+
+with urllib.request.urlopen(req) as r, open("${CONFIG_PATH}", "wb") as f:
+    f.write(r.read())
+EOF
 }
 
 restart_litellm() {
   log "Restarting LiteLLM..."
-  # Sends SIGTERM to the litellm process; the container's PID 1 / supervisor
-  # should restart it. Adjust the signal or process name to match your setup.
   pkill -SIGTERM -x litellm 2>/dev/null || pkill -SIGTERM -f "litellm" 2>/dev/null || true
 }
 
-# ── Bootstrap: pull config on first run ───────
+# ── Bootstrap ─────────────────────────────────
 log "Starting config watcher for ${G_NAME}/${FILE_PATH} (branch: ${BRANCH})"
 
 INITIAL_META=$(fetch_meta)
-CURRENT_SHA=$(echo "${INITIAL_META}" | grep '"sha"' | head -1 | sed 's/.*"sha": "\([^"]*\)".*/\1/')
-DOWNLOAD_URL=$(echo "${INITIAL_META}" | grep '"download_url"' | head -1 | sed 's/.*"download_url": "\([^"]*\)".*/\1/')
 
-log "Pulling initial config (sha: ${CURRENT_SHA})..."
-download_config "${DOWNLOAD_URL}"
+CURRENT_SHA=$(echo "$INITIAL_META" | get_sha)
+DOWNLOAD_URL=$(echo "$INITIAL_META" | get_download_url)
+
+log "Pulling initial config (sha: ${CURRENT_SHA:0:7})..."
+
+download_config "$DOWNLOAD_URL"
+
 log "Config written to ${CONFIG_PATH}"
 
 # ── Poll loop ─────────────────────────────────
 while true; do
-  sleep "${CHECK_INTERVAL}"
 
-  META=$(fetch_meta 2>/dev/null) || { log "[WARN] GitHub API request failed, skipping check."; continue; }
+  # randomize slightly to avoid API sync spikes
+  sleep $((CHECK_INTERVAL + RANDOM % 60))
+
+  META=$(fetch_meta 2>/dev/null) || {
+    log "[WARN] GitHub API request failed, skipping check"
+    continue
+  }
+
+  REMOTE_SHA=$(echo "$META" | get_sha)
 
-  REMOTE_SHA=$(echo "${META}" | grep '"sha"' | head -1 | sed 's/.*"sha": "\([^"]*\)".*/\1/')
+  if [[ "$REMOTE_SHA" != "$CURRENT_SHA" ]]; then
 
-  if [[ "${REMOTE_SHA}" != "${CURRENT_SHA}" ]]; then
     log "Config change detected (old: ${CURRENT_SHA:0:7}, new: ${REMOTE_SHA:0:7})"
 
-    NEW_DOWNLOAD_URL=$(echo "${META}" | grep '"download_url"' | head -1 | sed 's/.*"download_url": "\([^"]*\)".*/\1/')
-    download_config "${NEW_DOWNLOAD_URL}"
+    NEW_DOWNLOAD_URL=$(echo "$META" | get_download_url)
+
+    download_config "$NEW_DOWNLOAD_URL"
+
     log "Config updated at ${CONFIG_PATH}"
 
-    CURRENT_SHA="${REMOTE_SHA}"
+    CURRENT_SHA="$REMOTE_SHA"
+
     restart_litellm
-    log "Restart signal sent."
+
+    log "Restart signal sent"
+
   else
     log "No change detected (sha: ${CURRENT_SHA:0:7})"
   fi
+
 done