Update app.py

app.py

@@ -1,7 +1,7 @@
 import gradio as gr
 import os
 import csv
-from datetime import datetime
+from datetime import datetime, timedelta
 from huggingface_hub import Repository
 
 # Configuration
@@ -9,6 +9,8 @@ DATA_STORAGE_REPO = "CIV3283/Data_Storage"
 DATA_BRANCH_NAME = "data_branch"
 LOCAL_DATA_DIR = "temp_data_storage"
 MIN_IDLE_MINUTES = 10  # Minimum idle time required for space assignment
+ALLOCATION_RECORD_FILE = "allocation_records.csv"  # New file for tracking allocations
+ALLOCATION_LOCK_DURATION = 5  # Lock duration in minutes
 
 # Environment variables
 HF_HUB_TOKEN = os.environ.get("HF_HUB_TOKEN", None)
@@ -117,11 +119,118 @@ def get_last_activity_time(csv_file_path):
         print(f"[get_last_activity_time] Traceback: {traceback.format_exc()}")
         return datetime.min
 
+def read_allocation_records(repo_dir):
+    """Read and parse allocation records, returning only non-expired allocations"""
+    allocation_file = os.path.join(repo_dir, ALLOCATION_RECORD_FILE)
+    current_time = datetime.now()
+    active_allocations = {}
+    
+    try:
+        if not os.path.exists(allocation_file):
+            print(f"[read_allocation_records] Allocation file not found, creating new one")
+            # Create empty allocation file with header
+            with open(allocation_file, 'w', newline='', encoding='utf-8') as f:
+                writer = csv.writer(f)
+                writer.writerow(['space_name', 'student_id', 'allocated_time', 'expires_at'])
+            return active_allocations
+        
+        with open(allocation_file, 'r', encoding='utf-8') as f:
+            csv_reader = csv.DictReader(f)
+            
+            for row in csv_reader:
+                try:
+                    expires_at = datetime.strptime(row['expires_at'], '%Y-%m-%d %H:%M:%S')
+                    allocated_time = datetime.strptime(row['allocated_time'], '%Y-%m-%d %H:%M:%S')
+                    
+                    # Only keep non-expired allocations
+                    if expires_at > current_time:
+                        active_allocations[row['space_name']] = {
+                            'student_id': row['student_id'],
+                            'allocated_time': allocated_time,
+                            'expires_at': expires_at
+                        }
+                        print(f"[read_allocation_records] Active allocation: {row['space_name']} -> {row['student_id']}")
+                    else:
+                        print(f"[read_allocation_records] Expired allocation: {row['space_name']} (expired at {expires_at})")
+                        
+                except ValueError as ve:
+                    print(f"[read_allocation_records] Error parsing row {row}: {ve}")
+                    continue
+                    
+    except Exception as e:
+        print(f"[read_allocation_records] Error reading allocation records: {e}")
+        return {}
+    
+    print(f"[read_allocation_records] Found {len(active_allocations)} active allocations")
+    return active_allocations
+
+def write_allocation_record(space_name, student_id, repo_dir):
+    """Write a new allocation record to the file"""
+    allocation_file = os.path.join(repo_dir, ALLOCATION_RECORD_FILE)
+    current_time = datetime.now()
+    expires_at = current_time + timedelta(minutes=ALLOCATION_LOCK_DURATION)
+    
+    try:
+        # Read existing records
+        existing_records = []
+        current_time_check = datetime.now()
+        
+        if os.path.exists(allocation_file):
+            with open(allocation_file, 'r', encoding='utf-8') as f:
+                csv_reader = csv.DictReader(f)
+                for row in csv_reader:
+                    try:
+                        row_expires_at = datetime.strptime(row['expires_at'], '%Y-%m-%d %H:%M:%S')
+                        # Only keep non-expired records
+                        if row_expires_at > current_time_check:
+                            existing_records.append(row)
+                    except ValueError:
+                        continue
+        
+        # Add new allocation record
+        new_record = {
+            'space_name': space_name,
+            'student_id': student_id,
+            'allocated_time': current_time.strftime('%Y-%m-%d %H:%M:%S'),
+            'expires_at': expires_at.strftime('%Y-%m-%d %H:%M:%S')
+        }
+        existing_records.append(new_record)
+        
+        # Write all records back to file
+        with open(allocation_file, 'w', newline='', encoding='utf-8') as f:
+            fieldnames = ['space_name', 'student_id', 'allocated_time', 'expires_at']
+            writer = csv.DictWriter(f, fieldnames=fieldnames)
+            writer.writeheader()
+            writer.writerows(existing_records)
+        
+        print(f"[write_allocation_record] Recorded allocation: {space_name} -> {student_id} (expires at {expires_at})")
+        return True
+        
+    except Exception as e:
+        print(f"[write_allocation_record] Error writing allocation record: {e}")
+        return False
+
+def commit_allocation_record(repo, space_name, student_id):
+    """Commit the allocation record to Git"""
+    try:
+        repo.git_add(ALLOCATION_RECORD_FILE)
+        commit_message = f"Allocate {space_name} to student {student_id}"
+        repo.git_commit(commit_message)
+        repo.git_push()
+        print(f"[commit_allocation_record] Successfully committed allocation record")
+        return True
+    except Exception as e:
+        print(f"[commit_allocation_record] Error committing allocation record: {e}")
+        return False
+
 def analyze_space_activity(available_spaces, repo_dir):
     """Analyze activity status of all spaces and return sorted list"""
     space_activity = []
     current_time = datetime.now()
     
+    # Read allocation records to filter out recently allocated spaces
+    active_allocations = read_allocation_records(repo_dir)
+    
     print(f"[analyze_space_activity] Analyzing {len(available_spaces)} spaces...")
     
     for space_name in available_spaces:
@@ -138,12 +247,20 @@ def analyze_space_activity(available_spaces, repo_dir):
             status = f"Idle for {idle_minutes:.1f} minutes"
             last_activity_str = last_activity.strftime('%Y-%m-%d %H:%M:%S')
         
+        # Check if space is recently allocated
+        is_recently_allocated = space_name in active_allocations
+        if is_recently_allocated:
+            alloc_info = active_allocations[space_name]
+            minutes_until_free = (alloc_info['expires_at'] - current_time).total_seconds() / 60
+            status += f" (Recently allocated, free in {minutes_until_free:.1f} min)"
+        
         space_activity.append({
             'space_name': space_name,
             'last_activity': last_activity,
             'last_activity_str': last_activity_str,
             'idle_minutes': idle_minutes,
-            'status': status
+            'status': status,
+            'is_recently_allocated': is_recently_allocated
         })
         
         print(f"[analyze_space_activity] {space_name}: {status}")
@@ -164,44 +281,63 @@ def create_status_display(space_activity):
     
     return status_display
 
-def select_space_with_boundary_check(space_activity, student_id):
-    """Select space with strict boundary conditions"""
-    
-    # Create and display current status
-    status_display = create_status_display(space_activity)
-    print(f"[select_space_with_boundary_check] Space analysis:\n{status_display}")
+def select_space_with_boundary_check(space_activity, student_id, repo):
+    """Select space with strict boundary conditions and allocation recording"""
     
-    # Check for available spaces (idle for at least MIN_IDLE_MINUTES)
-    available_spaces = [s for s in space_activity if s['idle_minutes'] >= MIN_IDLE_MINUTES]
+    # Filter out recently allocated spaces
+    available_spaces = [s for s in space_activity 
+                       if s['idle_minutes'] >= MIN_IDLE_MINUTES and not s['is_recently_allocated']]
     
     if not available_spaces:
-        # All spaces are busy (used within the last 30 minutes)
-        most_idle = space_activity[0] if space_activity else None
+        # Check what's preventing allocation
+        idle_spaces = [s for s in space_activity if s['idle_minutes'] >= MIN_IDLE_MINUTES]
+        recently_allocated_spaces = [s for s in space_activity if s['is_recently_allocated']]
         
-        if most_idle:
-            if most_idle['idle_minutes'] == float('inf'):
-                idle_info = "Never used"
-            else:
-                idle_info = f"{most_idle['idle_minutes']:.1f} minutes ago"
+        if idle_spaces and not recently_allocated_spaces:
+            # All spaces are busy (used within the last 30 minutes)
+            most_idle = space_activity[0] if space_activity else None
             
+            if most_idle:
+                if most_idle['idle_minutes'] == float('inf'):
+                    idle_info = "Never used"
+                else:
+                    idle_info = f"{most_idle['idle_minutes']:.1f} minutes ago"
+                
+                error_msg = (
+                    f"🚫 **All learning assistants are currently busy**\n\n"
+                    f"All spaces have been used within the last {MIN_IDLE_MINUTES} minutes.\n\n"
+                    f"**Current Status:**\n"
+                    f"• Most idle space: {most_idle['space_name']}\n"
+                    f"• Last used: {idle_info}\n\n"
+                    f"**Please try again in a few minutes.**"
+                )
+            else:
+                error_msg = "🚫 No learning assistant spaces are available at the moment."
+        else:
+            # Spaces are recently allocated
             error_msg = (
-                f"🚫 **All learning assistants are currently busy**\n\n"
-                f"All spaces have been used within the last {MIN_IDLE_MINUTES} minutes.\n\n"
-                f"**Current Status:**\n"
-                f"• Most idle space: {most_idle['space_name']}\n"
-                f"• Last used: {idle_info}\n\n"
-                f"**Please try again in a few minutes.**"
+                f"🚫 **All learning assistants are currently busy or recently allocated**\n\n"
+                f"Some spaces are being assigned to other students right now.\n\n"
+                f"**Please try again in 1-2 minutes.**"
             )
-        else:
-            error_msg = "🚫 No learning assistant spaces are available at the moment."
         
-        print(f"[select_space_with_boundary_check] All spaces busy: {error_msg}")
+        print(f"[select_space_with_boundary_check] No available spaces: {error_msg}")
         raise gr.Error(error_msg, duration=10)
     
     # Select the most idle space
     selected_space = available_spaces[0]
     print(f"[select_space_with_boundary_check] Selected space: {selected_space['space_name']}")
     
+    # Record the allocation BEFORE building the response
+    write_success = write_allocation_record(selected_space['space_name'], student_id, repo.local_dir)
+    if write_success:
+        commit_allocation_record(repo, selected_space['space_name'], student_id)
+    else:
+        print(f"[select_space_with_boundary_check] Warning: Failed to record allocation")
+    
+    # Create status display
+    status_display = create_status_display(space_activity)
+    
     # Build redirect URL
     redirect_url = f"https://huggingface.co/spaces/CIV3283/{selected_space['space_name']}/?check={student_id}"
     
@@ -215,6 +351,7 @@ def redirect_to_space(redirect_url, selected_space, status_display):
     else:
         idle_info = f"{selected_space['idle_minutes']:.1f} minutes"
     
+    # Modified HTML structure - Access section first, then analysis
     redirect_html = f"""
     <div style="max-width: 900px; margin: 0 auto; padding: 20px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;">
         <div style="text-align: center; margin-bottom: 30px; padding: 25px; background: linear-gradient(135deg, #28a745, #20c997); color: white; border-radius: 12px; box-shadow: 0 4px 6px rgba(0,0,0,0.1);">
@@ -225,20 +362,10 @@ def redirect_to_space(redirect_url, selected_space, status_display):
             </p>
         </div>
         
-        <div style="background: #f8f9fa; padding: 25px; border-radius: 12px; margin-bottom: 25px; border-left: 4px solid #28a745;">
-            <h3 style="margin-top: 0; color: #333;">📊 Space Selection Analysis</h3>
-            <div style="background: white; padding: 20px; border-radius: 8px; font-size: 14px; line-height: 1.8; border: 1px solid #e9ecef;">
-{status_display}
-            </div>
-            <p style="margin-bottom: 0; color: #666; font-size: 14px; margin-top: 15px;">
-                <strong>Selection Algorithm:</strong> Spaces idle for ≥{MIN_IDLE_MINUTES} minutes are eligible. The most idle space is automatically selected for optimal load distribution.
-            </p>
-        </div>
-        
         <div style="text-align: center; margin-bottom: 30px; padding: 25px; background: linear-gradient(135deg, #2196f3, #1976d2); color: white; border-radius: 12px; box-shadow: 0 4px 6px rgba(33,150,243,0.3);">
             <h2 style="margin-top: 0; color: white;">🚀 Access Your Learning Assistant</h2>
             <p style="color: rgba(255,255,255,0.9); font-size: 16px; margin-bottom: 25px;">
-                Click the button below or copy the URL to access your assigned learning assistant.
+                Click the button below to access your assigned learning assistant.
             </p>
             
             <a href="{redirect_url}" 
@@ -249,33 +376,22 @@ def redirect_to_space(redirect_url, selected_space, status_display):
                       transition: all 0.3s ease; margin-bottom: 20px;"
                onmouseover="this.style.background='rgba(255,255,255,0.25)'; this.style.transform='translateY(-2px)'"
                onmouseout="this.style.background='rgba(255,255,255,0.15)'; this.style.transform='translateY(0px)'">
-                Right-click → "Open in new tab"
+                ➤ Open Learning Assistant
             </a>
             
-            <div style="background: rgba(0,0,0,0.1); padding: 15px; border-radius: 8px; margin-top: 15px;">
-                <p style="margin: 5px 0; color: rgba(255,255,255,0.9); font-size: 14px; font-weight: bold;">
-                    📋 Copy this URL:
-                </p>
-                <div style="background: rgba(255,255,255,0.9); color: #333; padding: 12px; border-radius: 5px; 
-                           font-family: 'Courier New', monospace; font-size: 12px; word-break: break-all; 
-                           border: 1px solid rgba(255,255,255,0.5); margin-top: 8px;"
-                     onclick="navigator.clipboard.writeText('{redirect_url}').then(() => {{ 
-                         this.style.background='#d4edda'; 
-                         this.innerHTML = '✅ URL Copied! Paste in new browser tab';
-                         setTimeout(() => {{ 
-                             this.style.background='rgba(255,255,255,0.9)'; 
-                             this.innerHTML = '{redirect_url}'; 
-                         }}, 2000);
-                     }}).catch(() => {{ 
-                         this.innerHTML = 'Click failed - please manually select and copy'; 
-                     }})"
-                     style="cursor: pointer; user-select: all;">
-                    {redirect_url}
-                </div>
-                <p style="margin: 8px 0 0 0; color: rgba(255,255,255,0.8); font-size: 12px;">
-                    💡 Click the URL above to copy it automatically
-                </p>
+            <p style="margin: 15px 0 0 0; color: rgba(255,255,255,0.8); font-size: 14px;">
+                💡 Right-click the button above and select "Open in new tab"
+            </p>
+        </div>
+        
+        <div style="background: #f8f9fa; padding: 25px; border-radius: 12px; margin-bottom: 25px; border-left: 4px solid #28a745;">
+            <h3 style="margin-top: 0; color: #333;">📊 Space Selection Analysis</h3>
+            <div style="background: white; padding: 20px; border-radius: 8px; font-size: 14px; line-height: 1.8; border: 1px solid #e9ecef;">
+{status_display}
             </div>
+            <p style="margin-bottom: 0; color: #666; font-size: 14px; margin-top: 15px;">
+                <strong>Selection Algorithm:</strong> Spaces idle for ≥{MIN_IDLE_MINUTES} minutes and not recently allocated are eligible. The most idle space is automatically selected for optimal load distribution.
+            </p>
         </div>
         
         <div style="text-align: center; padding: 20px; background: #f1f3f4; border-radius: 8px; margin-top: 20px;">
@@ -289,7 +405,7 @@ def redirect_to_space(redirect_url, selected_space, status_display):
     return gr.HTML(redirect_html)
 
 def load_balance_user(student_id):
-    """Main load balancing function"""
+    """Main load balancing function with allocation recording"""
     print(f"[load_balance_user] Starting load balancing for student ID: {student_id}")
     
     # Initialize connection to data storage
@@ -303,11 +419,11 @@ def load_balance_user(student_id):
     if not available_spaces:
         raise gr.Error("🚫 No student learning assistant spaces found in the system. Please contact your instructor.", duration=8)
     
-    # Analyze space activity
+    # Analyze space activity (including allocation records)
     space_activity = analyze_space_activity(available_spaces, LOCAL_DATA_DIR)
     
-    # Select space with boundary checking
-    return select_space_with_boundary_check(space_activity, student_id)
+    # Select space with boundary checking and allocation recording
+    return select_space_with_boundary_check(space_activity, student_id, repo)
 
 def get_url_params(request: gr.Request):
     """Extract URL parameters from request"""
@@ -315,7 +431,7 @@ def get_url_params(request: gr.Request):
         query_params = dict(request.query_params)
         check_id = query_params.get('check', None)
         if check_id:
-            return f"Load Distributor", check_id
+            return f"Load Distributor - Student {check_id}", check_id
         else:
             return "Load Distributor", None
     return "Load Distributor", None