update

app.py

@@ -10,40 +10,43 @@ from typing import Optional, Tuple
 hf_api = HfApi(token=os.getenv("HF_TOKEN"))
 DATASET_REPO = "HuggingFaceTB/smolvlm2-iphone-waitlist"
 MAX_RETRIES = 3
-def commit_signup(username: str, current_data: pd.DataFrame) -> Optional[str]:
-    """Attempt to commit new signup atomically"""
+
+def commit_signup(username: str) -> Optional[str]:
+    """Attempt to commit new signup atomically, always reading latest data before commit"""
     try:
-        # Verify current data has required columns
-        if 'userid' not in current_data.columns or 'joined_at' not in current_data.columns:
+        # Always get the latest data right before committing
+        try:
+            current_data = pd.read_csv(
+                f"https://huggingface.co/datasets/{DATASET_REPO}/raw/main/waitlist.csv"
+            )
+            if 'userid' not in current_data.columns or 'joined_at' not in current_data.columns:
+                current_data = pd.DataFrame(columns=['userid', 'joined_at'])
+        except:
             current_data = pd.DataFrame(columns=['userid', 'joined_at'])
-        
+
+        # If user already exists in the latest data, don't add them again
+        if username in current_data['userid'].values:
+            return None
+
         # Add new user with timestamp
         new_row = pd.DataFrame([{
             'userid': username,
             'joined_at': datetime.utcnow().isoformat()
         }])
         
-        # Ensure we're not duplicating any existing users
-        updated_data = pd.concat([
-            current_data[~current_data['userid'].isin([username])],  # Keep all except current user
-            new_row
-        ], ignore_index=True)
-        
-        # Sort by joined_at to maintain chronological order
-        updated_data = updated_data.sort_values('joined_at').reset_index(drop=True)
+        # Combine with latest data
+        updated_data = pd.concat([current_data, new_row], ignore_index=True)
         
         # Save to temp file
         with tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False) as tmp:
             updated_data.to_csv(tmp.name, index=False)
             
-            # Create commit operation
             operation = CommitOperationAdd(
                 path_in_repo="waitlist.csv",
                 path_or_fileobj=tmp.name
             )
             
             try:
-                # Try to create commit
                 create_commit(
                     repo_id=DATASET_REPO,
                     repo_type="dataset",
@@ -51,10 +54,10 @@ def commit_signup(username: str, current_data: pd.DataFrame) -> Optional[str]:
                     commit_message=f"Add user {username} to waitlist"
                 )
                 os.unlink(tmp.name)
-                return None  # Success
+                return None
             except Exception as e:
                 os.unlink(tmp.name)
-                return str(e)  # Return error message
+                return str(e)
     except Exception as e:
         return str(e)
 
@@ -67,56 +70,35 @@ def join_waitlist(
     if profile is None or oauth_token is None:
         return gr.update(value="Please log in with your Hugging Face account first!")
 
+    username = profile.username
+    
     for attempt in range(MAX_RETRIES):
         try:
-            # Get current waitlist state
-            try:
-                current_data = pd.read_csv(
+            # Try to commit the update (which will get latest data internally)
+            error = commit_signup(username)
+            
+            if error is None:  # Success or already registered
+                # Verify user is in the list
+                verification_data = pd.read_csv(
                     f"https://huggingface.co/datasets/{DATASET_REPO}/raw/main/waitlist.csv"
                 )
-                # Ensure data frame has required columns
-                if 'userid' not in current_data.columns or 'joined_at' not in current_data.columns:
-                    current_data = pd.DataFrame(columns=['userid', 'joined_at'])
-            except:
-                current_data = pd.DataFrame(columns=['userid', 'joined_at'])
-
-            # Check if user already registered
-            if not current_data.empty and profile.username in current_data['userid'].values:
-                return gr.update(
-                    value="## 😎 You're already on the waitlist! We'll keep you updated.",
-                    visible=True
-                )
-
-            # Try to commit the update
-            error = commit_signup(profile.username, current_data)
-            
-            if error is None:  # Success
-                # Verify the commit worked by reading back the data
-                try:
-                    verification_data = pd.read_csv(
-                        f"https://huggingface.co/datasets/{DATASET_REPO}/raw/main/waitlist.csv"
+                if username in verification_data['userid'].values:
+                    return gr.update(
+                        value="## 🎉 Thanks for joining the waitlist! We'll keep you updated on SmolVLM2 iPhone app.",
+                        visible=True
                     )
-                    if profile.username not in verification_data['userid'].values:
-                        if attempt < MAX_RETRIES - 1:
-                            continue  # Retry if verification failed
-                        else:
-                            raise Exception("Failed to verify signup")
-                except Exception as e:
-                    if attempt < MAX_RETRIES - 1:
-                        continue
-                    raise e
-
-                return gr.update(
-                    value="## 🎉 Thanks for joining the waitlist! We'll keep you updated on SmolVLM2 iPhone app.",
-                    visible=True
-                )
+                
+                # If verification failed and we have retries left, try again
+                if attempt < MAX_RETRIES - 1:
+                    continue
             
             # If we got a conflict error, retry
-            if "Conflict" in str(error) and attempt < MAX_RETRIES - 1:
+            if error and "Conflict" in str(error) and attempt < MAX_RETRIES - 1:
                 continue
                 
             # Other error or last attempt
-            gr.Error(f"An error occurred: {str(error)}")
+            if error:
+                gr.Error(f"An error occurred: {str(error)}")
             return gr.update(
                 value="## 🫠 Sorry, something went wrong. Please try again later.",
                 visible=True
@@ -129,6 +111,7 @@ def join_waitlist(
                     value="## 🫠 Sorry, something went wrong. Please try again later.",
                     visible=True
                 )
+                
 def update_ui(profile: gr.OAuthProfile | None) -> Tuple[str, bool, bool]:
     """Update UI elements based on login status"""
     if profile is None: