Fix: persistent volume provjera + sekvencijalni startup + env kredencijali

Dockerfile

@@ -27,4 +27,9 @@ RUN chmod +x /app/setup_endpoints.sh /app/backup_restore.sh
 
 EXPOSE 8080
 
-CMD bash -lc "bash /app/backup_restore.sh & sleep 10 && bash /app/setup_endpoints.sh & bash start.sh"
+# POPRAVLJENI STARTUP REDOSLIJED:
+# 1. Restore se zavrsi PRIJE nego WebUI krene (semicolon = sekvencijalan)
+# 2. Backup loop pokrenuti u pozadini (&)
+# 3. setup_endpoints.sh ceka 10s i konfigurira endpointe u pozadini (&)
+# 4. start.sh ostaje glavni proces (foreground)
+CMD bash -lc "bash /app/backup_restore.sh restore; bash /app/backup_restore.sh loop & sleep 10 && bash /app/setup_endpoints.sh & bash start.sh"

backup_restore.sh

@@ -19,17 +19,29 @@ if [ -z "$HF_REPO" ] || [ -z "$HF_TOKEN" ]; then
   exit 0
 fi
 
+# Provjera: da li /data vec ima sadrzaj (persistent volume nije prazan)
+data_is_populated() {
+  FILE_COUNT=$(find "$DATA_DIR" -mindepth 1 -maxdepth 2 2>/dev/null | wc -l)
+  [ "$FILE_COUNT" -ge 2 ]
+}
+
 backup_archive() {
   local archive_path="$1"
   mkdir -p "$(dirname "$archive_path")"
   tar -czf "$archive_path" -C "$DATA_DIR" .
 }
 
-restore_archive() {
-  echo "Pokusavam restore Open WebUI data iz ${HF_REPO}..."
-
+do_restore() {
   mkdir -p "$DATA_DIR"
 
+  # NOVA LOGIKA: Preskoci restore ako persistent volume vec ima podatke
+  if data_is_populated; then
+    echo "Persistent volume vec ima podatke ($(find "$DATA_DIR" -mindepth 1 -maxdepth 2 | wc -l) fajlova) — preskacem restore iz HF."
+    return
+  fi
+
+  echo "Pokusavam restore Open WebUI data iz ${HF_REPO}..."
+
   HTTP_STATUS=$(curl -s -o /tmp/openwebui_restore.tar.gz -w "%{http_code}" \
     -L \
     -H "Authorization: Bearer ${HF_TOKEN}" \
@@ -79,10 +91,29 @@ backup_archive_to_hf() {
   fi
 }
 
-restore_archive
+# Podrska za mode argument: restore | loop | all (default)
+MODE="${1:-all}"
 
-echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi je aktivan."
-while true; do
-  sleep "$BACKUP_INTERVAL_SECONDS"
-  backup_archive_to_hf
-done
+case "$MODE" in
+  restore)
+    # Samo uradi restore, pa izadji (za sekvencijalni startup)
+    do_restore
+    ;;
+  loop)
+    # Samo backup loop (bez restore)
+    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi je aktivan."
+    while true; do
+      sleep "$BACKUP_INTERVAL_SECONDS"
+      backup_archive_to_hf
+    done
+    ;;
+  all|*)
+    # Legacy mode: restore pa loop
+    do_restore
+    echo "Periodicki backup svakih ${BACKUP_INTERVAL_SECONDS} sekundi je aktivan."
+    while true; do
+      sleep "$BACKUP_INTERVAL_SECONDS"
+      backup_archive_to_hf
+    done
+    ;;
+esac

setup_endpoints.sh

@@ -2,6 +2,16 @@
 
 BASE_URL="http://localhost:8080"
 
+# Koristimo env varijable umjesto hardkodiranih kredencijala
+ADMIN_EMAIL="${WEBUI_ADMIN_EMAIL:-}"
+ADMIN_PASSWORD="${WEBUI_ADMIN_PASSWORD:-}"
+ADMIN_NAME="${WEBUI_ADMIN_NAME:-admin}"
+
+if [ -z "$ADMIN_EMAIL" ] || [ -z "$ADMIN_PASSWORD" ]; then
+  echo "❌ WEBUI_ADMIN_EMAIL ili WEBUI_ADMIN_PASSWORD nisu postavljeni u Space Secrets."
+  exit 0
+fi
+
 echo "Čekam da WebUI bude spreman..."
 for i in {1..30}; do
   STATUS=$(curl -s -o /dev/null -w "%{http_code}" "$BASE_URL/health")
@@ -17,7 +27,7 @@ done
 echo "Logujem se kao admin..."
 LOGIN_RESPONSE=$(curl -s -X POST "$BASE_URL/api/v1/auths/signin" \
   -H "Content-Type: application/json" \
-  -d '{"email": "nermindurma1981@gmail.com", "password": "nerko1508"}')
+  -d "{\"email\": \"${ADMIN_EMAIL}\", \"password\": \"${ADMIN_PASSWORD}\"}")
 
 TOKEN=$(echo $LOGIN_RESPONSE | python3 -c "import sys, json; print(json.load(sys.stdin).get('token', ''))")
 
@@ -25,7 +35,7 @@ if [ -z "$TOKEN" ]; then
   echo "❌ Login neuspješan, pokušavam registraciju..."
   REGISTER_RESPONSE=$(curl -s -X POST "$BASE_URL/api/v1/auths/signup" \
     -H "Content-Type: application/json" \
-    -d '{"name": "nermin", "email": "nermindurma1981@gmail.com", "password": "nerko1508"}')
+    -d "{\"name\": \"${ADMIN_NAME}\", \"email\": \"${ADMIN_EMAIL}\", \"password\": \"${ADMIN_PASSWORD}\"}")
   TOKEN=$(echo $REGISTER_RESPONSE | python3 -c "import sys, json; print(json.load(sys.stdin).get('token', ''))")
 fi
 
@@ -77,7 +87,7 @@ curl -s -X POST "$BASE_URL/openai/config/update" \
       \"$CEREBRAS_API_KEY\",
       \"$FIREWORKS_API_KEY\",
       \"$XAI_API_KEY\",
-      \"$HUGGINGFACE_API_KEY\",
+      \"$HF_INFERENCE_TOKEN\",
       \"$COHERE_API_KEY\",
       \"${POLLINATIONS_API_KEY:-noapikey}\"
     ],