Update start.sh

start.sh

@@ -2,86 +2,54 @@
 set -e
 
 echo "=========================================="
-echo "🚀 Starting PostgreSQL + pgAdmin Space"
+echo "🚀 Starting PostgreSQL + pgweb Space"
 echo "=========================================="
 
-# Environment variables (set via HF Space secrets)
 export HF_TOKEN="${HF_TOKEN:-}"
-export XET_DATASET="${XET_DATASET:-your-username/postgres-backup}"
+export XET_DATASET="${XET_DATASET:-}"
 export PGPASSWORD="${POSTGRES_PASSWORD:-postgres123}"
 
-# Create pgAdmin runner script
-cat > /app/run_pgadmin.py << 'PGADMIN_RUNNER'
-import os
-os.environ['PGADMIN_DEFAULT_EMAIL'] = 'admin@admin.com'
-os.environ['PGADMIN_DEFAULT_PASSWORD'] = 'admin123'
-os.environ['PGADMIN_CONFIG_SERVER_MODE'] = 'False'
-os.environ['PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED'] = 'False'
-
-import sys
-sys.path.insert(0, '/app')
-from pgadmin_config import *
-
-from pgadmin4 import app
-from pgadmin4.pgAdmin4 import create_app
-
-application = create_app()
-
-if __name__ == '__main__':
-    application.run(
-        host='0.0.0.0',
-        port=7860,
-        debug=False,
-        use_reloader=False,
-        threaded=True
-    )
-PGADMIN_RUNNER
-
 # ============================================
-# RESTORE FROM XET STORAGE (if available)
+# RESTORE FROM XET STORAGE
 # ============================================
-echo "📦 Checking for existing backup in Xet dataset..."
-
-python3 << 'RESTORE_SCRIPT'
+if [ -n "$HF_TOKEN" ] && [ -n "$XET_DATASET" ]; then
+    echo "📦 Checking for backup in Xet dataset..."
+    python3 << 'RESTORE_SCRIPT'
 import os
 import sys
 from pathlib import Path
 
 try:
-    from huggingface_hub import hf_hub_download, list_repo_files, HfApi
+    from huggingface_hub import hf_hub_download, list_repo_files
     
     hf_token = os.environ.get('HF_TOKEN')
-    dataset_id = os.environ.get('XET_DATASET', 'your-username/postgres-backup')
+    dataset_id = os.environ.get('XET_DATASET')
     
-    if not hf_token:
-        print("⚠️  No HF_TOKEN set, skipping restore")
+    if not hf_token or not dataset_id:
         sys.exit(0)
     
-    api = HfApi(token=hf_token)
-    
     try:
         files = list_repo_files(dataset_id, repo_type="dataset", token=hf_token)
         if 'backup/pg_backup.sql' in files:
-            print(f"✅ Found backup in {dataset_id}, will restore after PostgreSQL starts")
-            # Download backup file
-            backup_path = hf_hub_download(
+            print(f"✅ Found backup in {dataset_id}")
+            Path('/data/backup').mkdir(parents=True, exist_ok=True)
+            hf_hub_download(
                 repo_id=dataset_id,
                 filename="backup/pg_backup.sql",
                 repo_type="dataset",
                 token=hf_token,
                 local_dir="/data"
             )
-            print(f"📥 Downloaded backup to {backup_path}")
+            print("📥 Backup downloaded")
         else:
             print("ℹ️  No backup found, starting fresh")
     except Exception as e:
-        print(f"ℹ️  Could not access dataset: {e}")
+        print(f"ℹ️  Dataset access note: {e}")
         
-except ImportError as e:
-    print(f"⚠️  Import error: {e}")
 except Exception as e:
-    print(f"⚠️  Restore check failed: {e}")
+    print(f"⚠️  Restore check: {e}")
 RESTORE_SCRIPT
+fi
 
 # ============================================
 # INITIALIZE POSTGRESQL
@@ -91,51 +59,45 @@ echo "🗄️  Setting up PostgreSQL..."
 if [ ! -f "/data/postgres/PG_VERSION" ]; then
     echo "📝 Initializing new PostgreSQL database..."
     
-    # Initialize as postgres user
     sudo -u postgres /usr/lib/postgresql/15/bin/initdb -D /data/postgres -E UTF8 --locale=C
     
-    # Configure PostgreSQL
-    echo "host all all 127.0.0.1/32 md5" >> /data/postgres/pg_hba.conf
-    echo "local all all trust" >> /data/postgres/pg_hba.conf
+    # Configure authentication
+    echo "local all all trust" > /data/postgres/pg_hba.conf
+    echo "host all all 127.0.0.1/32 trust" >> /data/postgres/pg_hba.conf
+    echo "host all all ::1/128 trust" >> /data/postgres/pg_hba.conf
     
-    # Start temporarily to create user and database
+    # Start temporarily
     sudo -u postgres /usr/lib/postgresql/15/bin/pg_ctl -D /data/postgres -l /tmp/pg_init.log start
-    
     sleep 3
     
-    # Create user and database
-    sudo -u postgres psql -c "ALTER USER postgres PASSWORD '${PGPASSWORD}';"
-    sudo -u postgres psql -c "CREATE DATABASE appdb OWNER postgres;"
+    # Create database
+    sudo -u postgres createdb appdb
+    echo "✅ Database 'appdb' created"
     
-    # Restore from backup if exists
+    # Restore backup if exists
     if [ -f "/data/backup/pg_backup.sql" ]; then
         echo "🔄 Restoring from backup..."
-        sudo -u postgres psql -d appdb -f /data/backup/pg_backup.sql || echo "⚠️  Restore had some issues, continuing..."
+        sudo -u postgres psql -d appdb -f /data/backup/pg_backup.sql 2>/dev/null || true
         echo "✅ Restore completed"
     fi
     
     # Stop temporary instance
     sudo -u postgres /usr/lib/postgresql/15/bin/pg_ctl -D /data/postgres stop
+    sleep 2
     
     echo "✅ PostgreSQL initialized"
 else
-    echo "✅ PostgreSQL data directory exists"
+    echo "✅ PostgreSQL data exists"
 fi
 
-# Ensure correct ownership
 chown -R postgres:postgres /data/postgres
 chmod 700 /data/postgres
 
 echo "=========================================="
-echo "🎉 Starting services via Supervisor"
-echo "=========================================="
-echo ""
-echo "📊 pgAdmin will be available at: https://your-space.hf.space"
-echo "👤 Login: admin@admin.com / admin123"
-echo "🗄️  PostgreSQL: localhost:5432"
-echo "📦 Xet Dataset: ${XET_DATASET}"
+echo "🎉 Starting services..."
 echo ""
+echo "📊 Web UI: https://your-space.hf.space"
+echo "🗄️  Database: appdb"
 echo "=========================================="
 
-# Start supervisor (manages PostgreSQL, pgAdmin, and sync)
 exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf