Add update-pm-files.ps1 script for EC2 Instance Connect file updates and enhance exposure_spread.py with salary eligibility checks for player replacements

global_func/exposure_spread.py

@@ -148,6 +148,31 @@ def check_position_eligibility(sport, column_name, player_positions):
         # Default fallback - assume exact position match
         return column_name in player_positions
 
+def get_effective_salary(player_name, column_name, projections_df, type_var):
+    """Calculate the effective salary for a player in a specific column"""
+    base_salary = projections_df[projections_df['player_names'] == player_name]['salary'].iloc[0]
+    if type_var != 'Classic' and column_name == 'CPT':
+        return base_salary * 1.5
+    return base_salary
+
+def find_player_column(player_name, row_data, working_columns):
+    """Find which column contains the specified player"""
+    for col in working_columns:
+        if row_data[col] == player_name:
+            return col
+    return None
+
+def calculate_salary_difference(current_player, new_player, column_name, projections_df, type_var):
+    """Calculate the salary difference when replacing current_player with new_player in a specific column"""
+    current_salary = get_effective_salary(current_player, column_name, projections_df, type_var)
+    new_salary = get_effective_salary(new_player, column_name, projections_df, type_var)
+    return new_salary - current_salary
+
+def check_salary_eligibility(current_lineup_salary, current_player, new_player, column_name, projections_df, type_var, salary_max):
+    """Check if replacing current_player with new_player in the specified column stays within salary cap"""
+    salary_diff = calculate_salary_difference(current_player, new_player, column_name, projections_df, type_var)
+    return current_lineup_salary + salary_diff <= salary_max
+
 def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary_below, comp_salary_above, ignore_stacks, remove_teams, specific_replacements, specific_columns, projections_df, sport_var, type_var, salary_max, stacking_sports):
     comparable_players = projections_df[projections_df['player_names'] == exposure_player]
     
@@ -295,7 +320,10 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                                     if check_position_eligibility(sport_var, col, replacement_player_positions):
                                         suitable_replacements.append(candidate)
                                 else:
-                                    suitable_replacements.append(candidate)
+                                    # For non-Classic types, check salary eligibility using helper function
+                                    current_lineup_salary = working_frame.iloc[row]['Salary']
+                                    if check_salary_eligibility(current_lineup_salary, exposure_player, candidate, col, projections_df, type_var, salary_max):
+                                        suitable_replacements.append(candidate)
                             
                             if suitable_replacements:
                                 insert_player = random.choice(suitable_replacements)
@@ -317,9 +345,12 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
                                     replacement_made = True
                                     break
                             else:
-                                working_frame.at[row, col] = insert_player
-                                replacement_made = True
-                                break
+                                # For non-Classic types, check salary eligibility using helper function
+                                current_lineup_salary = working_frame.iloc[row]['Salary']
+                                if check_salary_eligibility(current_lineup_salary, exposure_player, insert_player, col, projections_df, type_var, salary_max):
+                                    working_frame.at[row, col] = insert_player
+                                    replacement_made = True
+                                    break
                 
                 # Only increment counter if we actually made a replacement
                 if replacement_made:
@@ -378,22 +409,22 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
     
                     for col in working_columns:
                         if row_data[col] in comparable_player_list:
-                            if working_frame.iloc[row]['salary'] - projections_df[projections_df['player_names'] == row_data[col]]['salary'].iloc[0] + projections_df[projections_df['player_names'] == exposure_player]['salary'].iloc[0] <= salary_max:
+                            current_lineup_salary = working_frame.iloc[row]['Salary']
+                            current_player = row_data[col]
+                            
+                            # Check salary eligibility using helper function
+                            if check_salary_eligibility(current_lineup_salary, current_player, exposure_player, col, projections_df, type_var, salary_max):
                                 if type_var == 'Classic':
-                                    replacement_player_positions = projections_df[projections_df['player_names'] == row_data[col]]['position'].iloc[0].split('/')
+                                    # For Classic types, also check position eligibility
                                     exposure_player_positions = projections_df[projections_df['player_names'] == exposure_player]['position'].iloc[0].split('/')
-                                    
-                                    # Check if the replacement player is eligible for this column
-                                
                                     if check_position_eligibility(sport_var, col, exposure_player_positions):
                                         working_frame.at[row, col] = exposure_player
                                         change_counter += 1
                                         break
                                 else:
+                                    # For non-Classic types, salary check is sufficient (position eligibility handled elsewhere)
                                     working_frame.at[row, col] = exposure_player
                                     change_counter += 1
                                     break
-                            else:
-                                continue
     return working_frame
     

update-pm-files.ps1

@@ -0,0 +1,112 @@
+# Simple script to update files on all instances using EC2 Instance Connect
+# 
+# Usage Examples:
+#   .\update-exposure-spread.ps1                                    # Updates exposure_spread.py (default)
+#   .\update-exposure-spread.ps1 -FileName "predict_dupes.py"       # Updates predict_dupes.py
+#   .\update-exposure-spread.ps1 -FileName "app.py" -TargetPath "/home/ec2-user/AWS_Portfolio_Manager/"  # Updates app.py in root directory
+#
+param(
+    [Parameter(Mandatory=$false)]
+    [string]$FileName = "exposure_spread.py",
+    
+    [Parameter(Mandatory=$false)]
+    [string]$TargetPath = "/home/ec2-user/AWS_Portfolio_Manager/global_func/"
+)
+
+# Handle special case: app.py maps to application.py on the remote instances
+$remoteFileName = $FileName
+if ($FileName -eq "app.py") {
+    $remoteFileName = "application.py"
+    Write-Host "Note: app.py will be uploaded as application.py on remote instances" -ForegroundColor Yellow
+}
+
+# Determine local file path - check global_func first, then root directory
+$localFilePath = ""
+if (Test-Path ".\global_func\$FileName") {
+    $localFilePath = ".\global_func\$FileName"
+} elseif (Test-Path ".\$FileName") {
+    $localFilePath = ".\$FileName"
+    # If uploading from root and no target path specified, default to root on remote
+    if ($TargetPath -eq "/home/ec2-user/AWS_Portfolio_Manager/global_func/") {
+        $TargetPath = "/home/ec2-user/AWS_Portfolio_Manager/"
+    }
+} else {
+    Write-Host "Error: File '$FileName' not found!" -ForegroundColor Red
+    Write-Host "Checked locations:" -ForegroundColor Yellow
+    Write-Host "  .\global_func\$FileName" -ForegroundColor Cyan
+    Write-Host "  .\$FileName" -ForegroundColor Cyan
+    Write-Host "`nAvailable files in global_func:" -ForegroundColor Yellow
+    Get-ChildItem ".\global_func\*.py" -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "  $($_.Name)" -ForegroundColor Cyan }
+    Write-Host "`nAvailable files in root:" -ForegroundColor Yellow
+    Get-ChildItem ".\*.py" -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "  $($_.Name)" -ForegroundColor Cyan }
+    exit 1
+}
+
+Write-Host "Updating file: $FileName -> $remoteFileName" -ForegroundColor Green
+Write-Host "Local path: $localFilePath" -ForegroundColor Cyan
+Write-Host "Target path: $TargetPath$remoteFileName" -ForegroundColor Cyan
+
+# Get instance IPs and IDs
+. .\get-ips.ps1
+$instanceIds = aws autoscaling describe-auto-scaling-groups --auto-scaling-group-names portfolio-manager-asg --query 'AutoScalingGroups[0].Instances[?HealthStatus==`Healthy`].InstanceId' --output text
+
+if ($global:instances.Count -eq 0) {
+    Write-Host "No instances found" -ForegroundColor Red
+    exit 1
+}
+
+Write-Host "Found $($global:instances.Count) instances: $($global:instances -join ', ')" -ForegroundColor Green
+
+# Generate a temporary SSH key for this session
+Write-Host "Generating temporary SSH key..." -ForegroundColor Cyan
+ssh-keygen -t rsa -f temp_update_key -N '""' -q
+
+$instanceIdArray = $instanceIds -split "`t"
+
+# Update each instance one at a time to maintain uptime
+for ($i = 0; $i -lt $global:instances.Count; $i++) {
+    $ip = $global:instances[$i]
+    $instanceId = $instanceIdArray[$i]
+    
+    Write-Host "Updating instance $instanceId ($ip)..." -ForegroundColor Yellow
+    
+    # Send SSH public key via EC2 Instance Connect
+    Write-Host "Sending SSH key to $instanceId..."
+    aws ec2-instance-connect send-ssh-public-key --instance-id $instanceId --instance-os-user ec2-user --ssh-public-key file://temp_update_key.pub
+    
+    if ($LASTEXITCODE -eq 0) {
+        # Copy the file using SCP
+        Write-Host "Copying $FileName -> $remoteFileName to $ip..."
+        scp -i temp_update_key -o StrictHostKeyChecking=no "$localFilePath" ec2-user@${ip}:$TargetPath$remoteFileName
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-Host "$remoteFileName copied successfully to $ip" -ForegroundColor Green
+            
+            # Only restart Streamlit if we're updating a Python file
+            if ($remoteFileName -like "*.py") {
+                Write-Host "Restarting Streamlit service on $ip..."
+                ssh -i temp_update_key -o StrictHostKeyChecking=no ec2-user@$ip "pkill -f 'streamlit run' && cd /home/ec2-user/AWS_Portfolio_Manager && nohup ./venv/bin/streamlit run application.py --server.port 5000 --server.address 0.0.0.0 > /dev/null 2>&1 &"
+                
+                if ($LASTEXITCODE -eq 0) {
+                    Write-Host "Service restarted successfully on $ip" -ForegroundColor Green
+                } else {
+                    Write-Host "Failed to restart service on $ip" -ForegroundColor Red
+                }
+            } else {
+                Write-Host "Non-Python file - skipping service restart" -ForegroundColor Yellow
+            }
+        } else {
+            Write-Host "Failed to copy $remoteFileName to $ip" -ForegroundColor Red
+        }
+    } else {
+        Write-Host "Failed to send SSH key to $instanceId" -ForegroundColor Red
+    }
+    
+    Write-Host "Waiting 15 seconds before next instance..." -ForegroundColor Cyan
+    Start-Sleep -Seconds 15
+}
+
+# Clean up temporary key files
+Remove-Item temp_update_key, temp_update_key.pub -ErrorAction SilentlyContinue
+
+Write-Host "All instances updated with rolling restart!" -ForegroundColor Green