mirror of
https://github.com/thecyberlearn/quantum-ai.git
synced 2026-08-18 09:53:00 +00:00
Fix Railway database persistence and admin user issues
**Database Management Improvements:** - Fix populate_agents to not overwrite existing admin users - Add --create-admin flag for explicit admin creation - Check if admin email exists before creating new admin - Better logging of superuser status **New Management Commands:** - backup_users: Backup/restore user data and wallet transactions - create_user: Create users with initial wallet balance - Both commands help recover from data loss issues **Railway Configuration:** - Add database info display on deployment - Better handling of existing user data - Prevents admin password resets on every deploy **Fixes:** - Admin password no longer resets to 'admin123' on every deployment - User data should persist between Railway deployments - Better debugging tools for database issues 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
parent
54d37f90b8
commit
362e877ee1
191
agent_base/management/commands/backup_users.py
Normal file
191
agent_base/management/commands/backup_users.py
Normal file
@ -0,0 +1,191 @@
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.contrib.auth import get_user_model
|
||||
from wallet.models import WalletTransaction
|
||||
import json
|
||||
from decimal import Decimal
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Backup and restore user data for Railway deployments'
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument(
|
||||
'--action',
|
||||
choices=['backup', 'restore', 'info'],
|
||||
default='info',
|
||||
help='Action to perform: backup, restore, or info',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--file',
|
||||
default='users_backup.json',
|
||||
help='Backup file path',
|
||||
)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
action = options['action']
|
||||
backup_file = options['file']
|
||||
|
||||
if action == 'info':
|
||||
self.show_database_info()
|
||||
elif action == 'backup':
|
||||
self.backup_users(backup_file)
|
||||
elif action == 'restore':
|
||||
self.restore_users(backup_file)
|
||||
|
||||
def show_database_info(self):
|
||||
"""Show current database state"""
|
||||
self.stdout.write("=== DATABASE INFO ===")
|
||||
|
||||
# Database backend
|
||||
from django.conf import settings
|
||||
db_config = settings.DATABASES['default']
|
||||
self.stdout.write(f"Database Engine: {db_config['ENGINE']}")
|
||||
if 'NAME' in db_config:
|
||||
self.stdout.write(f"Database Name: {db_config['NAME']}")
|
||||
|
||||
# User counts
|
||||
total_users = User.objects.count()
|
||||
superusers = User.objects.filter(is_superuser=True).count()
|
||||
regular_users = total_users - superusers
|
||||
|
||||
self.stdout.write(f"Total Users: {total_users}")
|
||||
self.stdout.write(f"Superusers: {superusers}")
|
||||
self.stdout.write(f"Regular Users: {regular_users}")
|
||||
|
||||
# List superusers
|
||||
if superusers > 0:
|
||||
self.stdout.write("\\nSuperusers:")
|
||||
for user in User.objects.filter(is_superuser=True):
|
||||
self.stdout.write(f" - {user.email} (username: {user.username})")
|
||||
|
||||
# Wallet info
|
||||
total_transactions = WalletTransaction.objects.count()
|
||||
self.stdout.write(f"\\nWallet Transactions: {total_transactions}")
|
||||
|
||||
# Users with positive balance
|
||||
users_with_balance = User.objects.filter(wallet_balance__gt=0).count()
|
||||
self.stdout.write(f"Users with balance: {users_with_balance}")
|
||||
|
||||
def backup_users(self, backup_file):
|
||||
"""Backup all users and their wallet data"""
|
||||
self.stdout.write(f"Backing up users to {backup_file}...")
|
||||
|
||||
backup_data = {
|
||||
'users': [],
|
||||
'transactions': []
|
||||
}
|
||||
|
||||
# Backup users
|
||||
for user in User.objects.all():
|
||||
user_data = {
|
||||
'username': user.username,
|
||||
'email': user.email,
|
||||
'first_name': user.first_name,
|
||||
'last_name': user.last_name,
|
||||
'is_superuser': user.is_superuser,
|
||||
'is_staff': user.is_staff,
|
||||
'is_active': user.is_active,
|
||||
'wallet_balance': str(user.wallet_balance),
|
||||
'date_joined': user.date_joined.isoformat(),
|
||||
}
|
||||
backup_data['users'].append(user_data)
|
||||
|
||||
# Backup transactions
|
||||
for transaction in WalletTransaction.objects.all():
|
||||
transaction_data = {
|
||||
'user_email': transaction.user.email,
|
||||
'amount': str(transaction.amount),
|
||||
'type': transaction.type,
|
||||
'description': transaction.description,
|
||||
'agent_slug': transaction.agent_slug,
|
||||
'stripe_session_id': transaction.stripe_session_id,
|
||||
'created_at': transaction.created_at.isoformat(),
|
||||
}
|
||||
backup_data['transactions'].append(transaction_data)
|
||||
|
||||
# Write to file
|
||||
with open(backup_file, 'w') as f:
|
||||
json.dump(backup_data, f, indent=2)
|
||||
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
f"Backed up {len(backup_data['users'])} users and "
|
||||
f"{len(backup_data['transactions'])} transactions to {backup_file}"
|
||||
)
|
||||
)
|
||||
|
||||
def restore_users(self, backup_file):
|
||||
"""Restore users from backup file"""
|
||||
try:
|
||||
with open(backup_file, 'r') as f:
|
||||
backup_data = json.load(f)
|
||||
except FileNotFoundError:
|
||||
self.stdout.write(
|
||||
self.style.ERROR(f"Backup file {backup_file} not found")
|
||||
)
|
||||
return
|
||||
|
||||
self.stdout.write(f"Restoring users from {backup_file}...")
|
||||
|
||||
users_created = 0
|
||||
users_updated = 0
|
||||
transactions_created = 0
|
||||
|
||||
# Restore users
|
||||
for user_data in backup_data.get('users', []):
|
||||
user, created = User.objects.get_or_create(
|
||||
email=user_data['email'],
|
||||
defaults={
|
||||
'username': user_data['username'],
|
||||
'first_name': user_data['first_name'],
|
||||
'last_name': user_data['last_name'],
|
||||
'is_superuser': user_data['is_superuser'],
|
||||
'is_staff': user_data['is_staff'],
|
||||
'is_active': user_data['is_active'],
|
||||
'wallet_balance': Decimal(user_data['wallet_balance']),
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
users_created += 1
|
||||
self.stdout.write(f"Created user: {user.email}")
|
||||
else:
|
||||
# Update wallet balance for existing users
|
||||
user.wallet_balance = Decimal(user_data['wallet_balance'])
|
||||
user.save()
|
||||
users_updated += 1
|
||||
self.stdout.write(f"Updated user: {user.email}")
|
||||
|
||||
# Restore transactions
|
||||
for transaction_data in backup_data.get('transactions', []):
|
||||
try:
|
||||
user = User.objects.get(email=transaction_data['user_email'])
|
||||
transaction, created = WalletTransaction.objects.get_or_create(
|
||||
user=user,
|
||||
amount=Decimal(transaction_data['amount']),
|
||||
type=transaction_data['type'],
|
||||
description=transaction_data['description'],
|
||||
created_at=transaction_data['created_at'],
|
||||
defaults={
|
||||
'agent_slug': transaction_data.get('agent_slug', ''),
|
||||
'stripe_session_id': transaction_data.get('stripe_session_id', ''),
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
transactions_created += 1
|
||||
except User.DoesNotExist:
|
||||
self.stdout.write(
|
||||
self.style.WARNING(
|
||||
f"User {transaction_data['user_email']} not found for transaction"
|
||||
)
|
||||
)
|
||||
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
f"Restore complete: {users_created} users created, "
|
||||
f"{users_updated} users updated, {transactions_created} transactions created"
|
||||
)
|
||||
)
|
||||
91
agent_base/management/commands/create_user.py
Normal file
91
agent_base/management/commands/create_user.py
Normal file
@ -0,0 +1,91 @@
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.contrib.auth import get_user_model
|
||||
from decimal import Decimal
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Create a user with wallet balance'
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument('email', help='User email address')
|
||||
parser.add_argument('password', help='User password')
|
||||
parser.add_argument(
|
||||
'--username',
|
||||
help='Username (defaults to email prefix)',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--first-name',
|
||||
default='',
|
||||
help='First name',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--last-name',
|
||||
default='',
|
||||
help='Last name',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--balance',
|
||||
type=float,
|
||||
default=0.0,
|
||||
help='Initial wallet balance',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--superuser',
|
||||
action='store_true',
|
||||
help='Create as superuser',
|
||||
)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
email = options['email']
|
||||
password = options['password']
|
||||
username = options.get('username') or email.split('@')[0]
|
||||
first_name = options['first_name']
|
||||
last_name = options['last_name']
|
||||
balance = Decimal(str(options['balance']))
|
||||
is_superuser = options['superuser']
|
||||
|
||||
# Check if user already exists
|
||||
if User.objects.filter(email=email).exists():
|
||||
self.stdout.write(
|
||||
self.style.ERROR(f"User with email {email} already exists")
|
||||
)
|
||||
return
|
||||
|
||||
# Create user
|
||||
if is_superuser:
|
||||
user = User.objects.create_superuser(
|
||||
username=username,
|
||||
email=email,
|
||||
password=password,
|
||||
first_name=first_name,
|
||||
last_name=last_name,
|
||||
)
|
||||
user_type = "superuser"
|
||||
else:
|
||||
user = User.objects.create_user(
|
||||
username=username,
|
||||
email=email,
|
||||
password=password,
|
||||
first_name=first_name,
|
||||
last_name=last_name,
|
||||
)
|
||||
user_type = "user"
|
||||
|
||||
# Set wallet balance if provided
|
||||
if balance > 0:
|
||||
user.add_balance(balance, "Initial balance from admin")
|
||||
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
f"Created {user_type}: {email} with balance {balance} AED"
|
||||
)
|
||||
)
|
||||
|
||||
# Show login instructions
|
||||
self.stdout.write("\\nLogin credentials:")
|
||||
self.stdout.write(f"Email: {email}")
|
||||
self.stdout.write(f"Password: {password}")
|
||||
if is_superuser:
|
||||
self.stdout.write("Admin URL: /admin/")
|
||||
@ -8,21 +8,36 @@ User = get_user_model()
|
||||
class Command(BaseCommand):
|
||||
help = 'Populate the database with default agents and create admin user'
|
||||
|
||||
def handle(self, *args, **options):
|
||||
self.stdout.write("Creating admin user...")
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument(
|
||||
'--create-admin',
|
||||
action='store_true',
|
||||
help='Force create admin user even if superusers exist',
|
||||
)
|
||||
|
||||
# Create superuser if it doesn't exist
|
||||
if not User.objects.filter(is_superuser=True).exists():
|
||||
def handle(self, *args, **options):
|
||||
self.stdout.write("Checking admin user...")
|
||||
|
||||
# Only create admin if explicitly requested or no superusers exist
|
||||
should_create_admin = options.get('create_admin', False) or not User.objects.filter(is_superuser=True).exists()
|
||||
|
||||
if should_create_admin:
|
||||
# Check if admin email already exists
|
||||
admin_email = 'admin@netcop.ai'
|
||||
if User.objects.filter(email=admin_email).exists():
|
||||
self.stdout.write(f"Admin user with email {admin_email} already exists - skipping creation")
|
||||
else:
|
||||
User.objects.create_superuser(
|
||||
username='admin',
|
||||
email='admin@netcop.ai',
|
||||
email=admin_email,
|
||||
password='admin123',
|
||||
first_name='Admin',
|
||||
last_name='User'
|
||||
)
|
||||
self.stdout.write("Created superuser: admin@netcop.ai / admin123")
|
||||
else:
|
||||
self.stdout.write("Superuser already exists")
|
||||
superuser_count = User.objects.filter(is_superuser=True).count()
|
||||
self.stdout.write(f"Superuser(s) already exist ({superuser_count} found) - skipping admin creation")
|
||||
|
||||
self.stdout.write("Creating default agents...")
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"builder": "NIXPACKS"
|
||||
},
|
||||
"deploy": {
|
||||
"startCommand": "python manage.py migrate && python manage.py populate_agents && python manage.py collectstatic --noinput && gunicorn netcop_hub.wsgi:application",
|
||||
"startCommand": "python manage.py backup_users --action info && python manage.py migrate && python manage.py populate_agents && python manage.py collectstatic --noinput && gunicorn netcop_hub.wsgi:application",
|
||||
"restartPolicyType": "ON_FAILURE",
|
||||
"restartPolicyMaxRetries": 10
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user