more fixes

backend/scripts/backup.py

@@ -6,9 +6,14 @@ import datetime
 import sqlite3
 from pathlib import Path
 from huggingface_hub import HfApi, hf_hub_download, CommitOperationAdd
-from open_webui.env import DATA_DIR
 
-# Application database path
+# Set up path to include the application module
+SCRIPT_DIR = Path(__file__).parent.resolve()
+BACKEND_DIR = SCRIPT_DIR.parent
+sys.path.append(str(BACKEND_DIR))
+
+# Database paths
+DATA_DIR = os.environ.get("DATA_DIR", "/app/backend/data")
 DB_FILE_PATH = os.path.join(DATA_DIR, "webui.db")
 
 # Backup paths

backend/scripts/restore.py

@@ -6,9 +6,14 @@ import datetime
 import sqlite3
 from pathlib import Path
 from huggingface_hub import HfApi, hf_hub_download
-from open_webui.env import DATA_DIR  # Import actual DATA_DIR from application
 
-# Application database path
+# Set up path to include the application module
+SCRIPT_DIR = Path(__file__).parent.resolve()
+BACKEND_DIR = SCRIPT_DIR.parent
+sys.path.append(str(BACKEND_DIR))
+
+# Database paths
+DATA_DIR = os.environ.get("DATA_DIR", "/app/backend/data")
 DB_FILE_PATH = os.path.join(DATA_DIR, "webui.db")
 
 # Restore paths

backend/start.sh

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
+# Ensure we're in the right directory and set up paths
 SCRIPT_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 cd "$SCRIPT_DIR" || exit 1
 
-# Configure paths and environment
 export DATA_DIR="/app/backend/data"
 export BACKUP_DIR="/tmp/open_webui/db_backup"
+export PYTHONPATH="/app/backend:${PYTHONPATH}"
 
-# Validate environment variables
+# Validate required environment variables
 for var in "BACKUP_PASSPHRASE" "HF_TOKEN" "SPACE_ID"; do
     if [ -z "${!var}" ]; then
         echo "Error: $var is not set. Required for database backup/restore."
@@ -72,11 +73,10 @@ WEBUI_SECRET_KEY="$WEBUI_SECRET_KEY" uvicorn open_webui.main:app \
     --host "$HOST" --port "$PORT" --forwarded-allow-ips '*' &
 WEBUI_PID=$!
 
-# Configure backup schedule
-BACKUP_INITIAL_WAIT="${BACKUP_INITIAL_WAIT:-500}"
-BACKUP_INTERVAL="${BACKUP_INTERVAL:-21600}"
+# Configure and start backup scheduler
+BACKUP_INITIAL_WAIT="${BACKUP_INITIAL_WAIT:-100}"
+BACKUP_INTERVAL="${BACKUP_INTERVAL:-300}"
 
-# Start backup scheduler
 (
     echo "Starting backup scheduler (Initial wait: ${BACKUP_INITIAL_WAIT}s, Interval: ${BACKUP_INTERVAL}s)"
     sleep "$BACKUP_INITIAL_WAIT"
@@ -94,4 +94,5 @@ BACKUP_INTERVAL="${BACKUP_INTERVAL:-21600}"
     done
 ) &
 
+# Wait for the main process
 wait $WEBUI_PID