revert

src/model_trainer.py

@@ -4,7 +4,7 @@ from datasets import Dataset
 from sentence_transformers import SentenceTransformerTrainer, SentenceTransformerTrainingArguments
 from sentence_transformers.losses import MultipleNegativesRankingLoss
 from transformers import TrainerCallback, TrainingArguments
-from typing import List, Callable, Optional, Union
+from typing import List, Callable, Optional
 from pathlib import Path
 from .config import AppConfig
 
@@ -57,22 +57,7 @@ def get_top_hits(
 
     return "\n".join(result)
 
-def get_available_namespaces(token: str) -> List[str]:
-    """
-    Returns a list of namespaces (user and organizations) the user can write to.
-    First item is always the authenticated user's username.
-    """
-    try:
-        api = HfApi(token=token)
-        info = api.whoami()
-        username = info['name']
-        orgs = [org['name'] for org in info.get('orgs', [])]
-        return [username] + orgs
-    except Exception as e:
-        print(f"Error fetching namespaces: {e}")
-        return []
-
-def upload_model_to_hub(folder_path: Path, repo_name: str, token: str, entity: Optional[str] = None) -> str:
+def upload_model_to_hub(folder_path: Path, repo_name: str, token: str) -> str:
     """
     Uploads a local model folder to the Hugging Face Hub.
     Creates the repository if it doesn't exist.
@@ -80,16 +65,12 @@ def upload_model_to_hub(folder_path: Path, repo_name: str, token: str, entity: O
     try:
         api = HfApi(token=token)
         
-        # Determine the entity (namespace) to use
-        if entity:
-            namespace = entity
-        else:
-            # Fallback to the authenticated user's username
-            user_info = api.whoami()
-            namespace = user_info['name']
+        # Get the authenticated user's username
+        user_info = api.whoami()
+        username = user_info['name']
         
         # Construct the full repo ID
-        repo_id = f"{namespace}/{repo_name}"
+        repo_id = f"{username}/{repo_name}"
         print(f"Preparing to upload to: {repo_id}")
 
         # Create the repo (safe if it already exists)
@@ -107,9 +88,8 @@ def upload_model_to_hub(folder_path: Path, repo_name: str, token: str, entity: O
             token=token
         )
         tags = info.card_data.tags
-        if "embeddinggemma-tuning-lab" not in tags:
-            tags.append("embeddinggemma-tuning-lab")
-            metadata_update(repo_id, {"tags": tags}, overwrite=True, token=token)
+        tags.append("embeddinggemma-tuning-lab")
+        metadata_update(repo_id, {"tags": tags}, overwrite=True, token=token)
         
         return f"✅ Success! Model published at: {url}"
     except Exception as e:
@@ -189,4 +169,4 @@ def train_with_dataset(
     # Save the final fine-tuned model
     trainer.save_model()
 
-    print(f"Model saved locally to: {output_dir}")
+    print(f"Model saved locally to: {output_dir}")

src/ui.py

@@ -4,7 +4,6 @@ from datetime import datetime
 
 from .config import AppConfig
 from .session_manager import HackerNewsFineTuner
-from .model_trainer import get_available_namespaces
 
 # --- Constants for Labels ---
 LABEL_FAV = "👍"
@@ -46,27 +45,13 @@ def on_app_load(app, profile: Optional[gr.OAuthProfile] = None):
     # Return 7 items: App state, Data updates (3), Hub updates (2), Username state (1)
     return app, stories, labels, text_update, repo_update, push_update, username
 
-def update_repo_preview(entity_name, repo_name):
-    """Updates the markdown preview to show 'entity/repo_name'."""
-    if not entity_name:
-        return "⚠️ Please select a namespace (User or Org)."
+def update_repo_preview(username, repo_name):
+    """Updates the markdown preview to show 'username/repo_name'."""
+    if not username:
+        return "⚠️ Sign in to see the target repository path."
     
     clean_repo = repo_name.strip() if repo_name else "..."
-    return f"Target Repository: **`{entity_name}/{clean_repo}`**"
-
-def fetch_orgs_wrapper(oauth_token: Optional[gr.OAuthToken]):
-    if not oauth_token:
-        return gr.update(choices=[], value=None), "⚠️ Login required to fetch organizations."
-    
-    try:
-        namespaces = get_available_namespaces(oauth_token.token)
-        if not namespaces:
-            return gr.update(choices=[], value=None), "❌ Failed to fetch namespaces."
-        
-        # Default to the first one (username)
-        return gr.update(choices=namespaces, value=namespaces[0]), "✅ Organizations loaded."
-    except Exception as e:
-        return gr.update(choices=[], value=None), f"❌ Error: {str(e)}"
+    return f"Target Repository: **`{username}/{clean_repo}`**"
 
 def import_wrapper(app, file):
     return app.import_additional_dataset(file)
@@ -77,12 +62,11 @@ def export_wrapper(app):
 def download_model_wrapper(app):
     return app.download_model()
 
-def push_to_hub_wrapper(app, entity_name, repo_name, oauth_token: Optional[gr.OAuthToken]):
+def push_to_hub_wrapper(app, repo_name, oauth_token: Optional[gr.OAuthToken]):
     if oauth_token is None:
         return "⚠️ You must be logged in to push to the Hub. Please sign in above."
     token_str = oauth_token.token
-    # Pass the selected entity
-    return app.upload_model(repo_name, token_str, entity=entity_name)
+    return app.upload_model(repo_name, token_str)
 
 def training_wrapper(app, stories: List[str], labels: Dict[int, str]):
     """
@@ -142,7 +126,7 @@ def build_interface() -> gr.Blocks:
             with gr.Accordion("0️⃣ Step 0: Sign In (Optional)", open=True):
                 gr.Markdown("Sign in to Hugging Face if you plan to push your fine-tuned model to the Hub later (Step 3).")
                 with gr.Row():
-                    login_btn = gr.LoginButton(value="Sign in with Hugging Face")
+                    gr.LoginButton(value="Sign in with Hugging Face")
                     with gr.Column(scale=3):
                         gr.Markdown("")
             
@@ -216,19 +200,11 @@ def build_interface() -> gr.Blocks:
                 gr.Markdown("Push your fine-tuned model to your personal Hugging Face account.")
                 
                 with gr.Row():
-                    # Entity (User/Org) Selection
-                    with gr.Column(scale=1):
-                         with gr.Row():
-                            entity_dropdown = gr.Dropdown(label="Owner / Organization", choices=[], interactive=True, scale=4)
-                            refresh_orgs_btn = gr.Button("🔄", scale=1, size="sm")
-
-                    # Repo Name
-                    with gr.Column(scale=2):
-                        repo_name_input = gr.Textbox(label="Target Repository Name", value="my-embeddinggemma-news-vibe", placeholder="e.g., my-embeddinggemma-news-vibe", interactive=False)
-                
-                push_to_hub_btn = gr.Button("Save to Hugging Face Hub", variant="secondary", interactive=False)
+                    repo_name_input = gr.Textbox(label="Target Repository Name", value="my-embeddinggemma-news-vibe", placeholder="e.g., my-embeddinggemma-news-vibe", interactive=False)
+                    push_to_hub_btn = gr.Button("Save to Hugging Face Hub", variant="secondary", interactive=False)
                 
                 repo_id_preview = gr.Markdown("Target Repository: (Waiting for input...)")
+                
                 push_status = gr.Markdown("")
 
             # --- Step 4: Downloads ---
@@ -267,24 +243,14 @@ def build_interface() -> gr.Blocks:
                 inputs=[session_state], 
                 outputs=[session_state, stories_state, labels_state, output, repo_name_input, push_to_hub_btn, username_state]
             ).then(
-                fn=lambda: [gr.update(interactive=True)]*2, outputs=[clear_reload_btn, run_training_btn]
-            )
-
-            # 2. Login Trigger -> Auto Fetch Orgs
-            # ----------------
-            # We can try to fetch orgs automatically if the token is available
-            
-            refresh_orgs_btn.click(
-                fn=fetch_orgs_wrapper,
-                inputs=[login_btn], # Gr.LoginButton acts as the OAuthToken input in this context? No, usually gr.OAuthToken is implicit or separate
-                outputs=[entity_dropdown, push_status]
+                fn=update_repo_preview,
+                inputs=[username_state, repo_name_input],
+                outputs=[repo_id_preview]
             ).then(
-                 fn=update_repo_preview,
-                 inputs=[entity_dropdown, repo_name_input],
-                 outputs=[repo_id_preview]
+                fn=lambda: [gr.update(interactive=True)]*2, outputs=[clear_reload_btn, run_training_btn]
             )
             
-            # 3. Reset / Refresh / Clear Selections
+            # 2. Reset / Refresh / Clear Selections
             # ----------------
             clear_reload_btn.click(
                 fn=lambda: set_interactivity(False), outputs=action_buttons
@@ -313,7 +279,7 @@ def build_interface() -> gr.Blocks:
                 outputs=[reset_counter, labels_state]
             )
             
-            # 4. Import Data
+            # 3. Import Data
             # ----------------
             import_file.change(
                 fn=import_wrapper, 
@@ -321,7 +287,7 @@ def build_interface() -> gr.Blocks:
                 outputs=[download_status]
             )
             
-            # 5. Run Training
+            # 4. Run Training
             # ----------------
             run_training_btn.click(
                 fn=lambda: set_interactivity(False), outputs=action_buttons
@@ -338,7 +304,7 @@ def build_interface() -> gr.Blocks:
                 outputs=[repo_name_input, push_to_hub_btn]
             )
             
-            # 6. Downloads
+            # 5. Downloads
             # ----------------
             download_dataset_btn.click(
                 fn=export_wrapper,
@@ -379,17 +345,11 @@ def build_interface() -> gr.Blocks:
                 outputs=[repo_name_input, push_to_hub_btn]
             )
             
-            # 7. Push to Hub
+            # 6. Push to Hub
             # ----------------
-            # Update preview on Name change or Entity change
             repo_name_input.change(
                 fn=update_repo_preview,
-                inputs=[entity_dropdown, repo_name_input],
-                outputs=[repo_id_preview]
-            )
-            entity_dropdown.change(
-                fn=update_repo_preview,
-                inputs=[entity_dropdown, repo_name_input],
+                inputs=[username_state, repo_name_input],
                 outputs=[repo_id_preview]
             )
 
@@ -399,7 +359,7 @@ def build_interface() -> gr.Blocks:
                 fn=lambda: gr.update(interactive=False), outputs=push_to_hub_btn
             ).then(
                 fn=push_to_hub_wrapper,
-                inputs=[session_state, entity_dropdown, repo_name_input], # Pass entity dropdown
+                inputs=[session_state, repo_name_input],
                 outputs=[push_status]
             ).then(
                 fn=lambda: set_interactivity(True), outputs=action_buttons
@@ -453,4 +413,4 @@ def build_interface() -> gr.Blocks:
                     outputs=[vibe_score, vibe_status, style_thml, session_info_display]
                 )
 
-    return demo
+    return demo