Update app.py

app.py

@@ -31,6 +31,14 @@ def init_data_storage_connection():
         print(f"[init_data_storage_connection] Pulling latest data from {DATA_STORAGE_REPO}...")
         repo.git_pull(rebase=True)
         
+        # Configure Git user identity immediately after initialization
+        try:
+            repo.git.config("user.email", "load-distributor@civ3283.system")
+            repo.git.config("user.name", "CIV3283 Load Distributor")
+            print(f"[init_data_storage_connection] Configured Git identity")
+        except Exception as config_error:
+            print(f"[init_data_storage_connection] Warning: Could not configure Git identity: {config_error}")
+        
         print(f"[init_data_storage_connection] Successfully connected to data storage")
         print(f"[init_data_storage_connection] Local directory: {LOCAL_DATA_DIR}")
         print(f"[init_data_storage_connection] Branch: {DATA_BRANCH_NAME}")
@@ -211,17 +219,53 @@ def write_allocation_record(space_name, student_id, repo_dir):
         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
+    """Commit the allocation record to Git with retry mechanism"""
+    max_retries = 3
+    
+    for attempt in range(max_retries):
+        try:
+            # Ensure Git identity is configured (redundant check)
+            try:
+                repo.git.config("user.email", "load-distributor@civ3283.system")
+                repo.git.config("user.name", "CIV3283 Load Distributor")
+            except:
+                pass  # Ignore config errors if already set
+            
+            # Pull latest changes before committing
+            repo.git_pull(rebase=True)
+            
+            # Stage and commit the allocation file
+            repo.git_add(ALLOCATION_RECORD_FILE)
+            
+            # Check if there are changes to commit
+            try:
+                status_output = repo.git.status("--porcelain")
+                if not status_output.strip():
+                    print(f"[commit_allocation_record] No changes to commit")
+                    return True  # Consider this successful
+            except:
+                pass  # Continue with commit attempt
+            
+            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 (attempt {attempt + 1})")
+            return True
+            
+        except Exception as e:
+            print(f"[commit_allocation_record] Attempt {attempt + 1} failed: {e}")
+            
+            if attempt < max_retries - 1:
+                print(f"[commit_allocation_record] Retrying...")
+                import time
+                time.sleep(1)  # Wait 1 second before retry
+            else:
+                print(f"[commit_allocation_record] All attempts failed. Allocation recorded locally but not synced to remote.")
+                # Even if Git sync fails, the local allocation record still prevents immediate conflicts
+                return False
+    
+    return False
 
 def analyze_space_activity(available_spaces, repo_dir):
     """Analyze activity status of all spaces and return sorted list"""
@@ -331,9 +375,12 @@ def select_space_with_boundary_check(space_activity, student_id, repo):
     # 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)
+        commit_success = commit_allocation_record(repo, selected_space['space_name'], student_id)
+        if not commit_success:
+            print(f"[select_space_with_boundary_check] Warning: Allocation recorded locally but not synced to remote")
     else:
         print(f"[select_space_with_boundary_check] Warning: Failed to record allocation")
+        # Continue anyway - worst case is potential double allocation, but user gets service
     
     # Create status display
     status_display = create_status_display(space_activity)