Fix OAuth implementation and visibility handling

app.py

@@ -90,54 +90,47 @@ def create_gradio_interface():
     
     with gr.Blocks() as demo:
         gr.Markdown("## Crowdsourcing Handwriting OCR Dataset")
+        gr.LoginButton()
+        user_info = gr.Markdown()
         
-        with gr.Row():
-            gr.LoginButton()
-            user_info = gr.Markdown("")
+        gr.Markdown("You will be shown between 1 and 5 consecutive sentences. Please handwrite them on paper and upload an image of your handwriting. If you wish to skip the current text, click 'Skip'.")
+        
+        text_box = gr.Textbox(value=collector.current_text_block, label="Text to Handwrite", interactive=False, visible=False)
+        image_input = gr.Image(type="pil", label="Upload Handwritten Image", sources=["upload"], visible=False)
+        
+        with gr.Row(visible=False) as button_row:
+            submit_btn = gr.Button("Submit")
+            skip_btn = gr.Button("Skip")
 
         def update_user_info(profile: gr.OAuthProfile | None) -> str:
-            if profile:
-                return f"Logged in as: {profile.name}"
-            return "Please log in with your Hugging Face account to contribute to the dataset."
+            if profile is None:
+                return "Please log in with your Hugging Face account to contribute to the dataset."
+            return f"Logged in as: {profile.name}"
 
-        with gr.Column(visible=False) as main_interface:
-            gr.Markdown("You will be shown between 1 and 5 consecutive sentences. Please handwrite them on paper and upload an image of your handwriting. If you wish to skip the current text, click 'Skip'.")
-            
-            text_box = gr.Textbox(value=collector.current_text_block, label="Text to Handwrite", interactive=False)
-            image_input = gr.Image(type="pil", label="Upload Handwritten Image", sources=["upload"])
-            
-            with gr.Row():
-                submit_btn = gr.Button("Submit")
-                skip_btn = gr.Button("Skip")
-        
-        def check_login(profile: gr.OAuthProfile | None) -> str:
+        def handle_submit(profile: gr.OAuthProfile | None) -> str:
             if profile is None:
                 raise gr.Error("Please log in to use this application")
-            return profile.name
+            return collector.submit_image(image_input.value, text_box.value, profile.name)
             
-        def protected_submit(image, text_block, profile: gr.OAuthProfile | None):
-            username = check_login(profile)
-            return collector.submit_image(image, text_block, username)
-            
-        def protected_skip(text_block, profile: gr.OAuthProfile | None):
-            username = check_login(profile)
-            return collector.skip_text(text_block, username)
-        
-        demo.load(update_user_info, inputs=gr.OAuthProfile(), outputs=[user_info])
-        demo.load(lambda p: gr.update(visible=p is not None), inputs=gr.OAuthProfile(), outputs=[main_interface])
-        
-        submit_btn.click(
-            fn=protected_submit,
-            inputs=[image_input, text_box, gr.OAuthProfile()],
-            outputs=text_box
-        )
+        def handle_skip(profile: gr.OAuthProfile | None) -> str:
+            if profile is None:
+                raise gr.Error("Please log in to use this application")
+            return collector.skip_text(text_box.value, profile.name)
+
+        def update_visibility(profile: gr.OAuthProfile | None):
+            is_visible = profile is not None
+            return [
+                gr.update(visible=is_visible),
+                gr.update(visible=is_visible),
+                gr.update(visible=is_visible)
+            ]
+
+        demo.load(update_user_info, inputs=None, outputs=user_info)
+        demo.load(update_visibility, inputs=None, outputs=[text_box, image_input, button_row])
         
-        skip_btn.click(
-            fn=protected_skip,
-            inputs=[text_box, gr.OAuthProfile()],
-            outputs=text_box
-        )
-    
+        submit_btn.click(handle_submit, inputs=None, outputs=[image_input, text_box])
+        skip_btn.click(handle_skip, inputs=None, outputs=text_box)
+
     return demo
 
 if __name__ == "__main__":

requirements.txt

@@ -1,4 +1,4 @@
-gradio==5.15.0
+gradio[oauth]==5.15.0
 huggingface-hub>=0.19.0
 Pillow>=10.0.0
 pytest>=7.0.0

test_e2e.py

@@ -1,73 +1,13 @@
 import pytest
-import os
 from playwright.sync_api import expect
-from PIL import Image
-import numpy as np
-import tempfile
 
 # Constants
-GRADIO_PORT = 7862
+GRADIO_PORT = 7861
 GRADIO_URL = f"http://localhost:{GRADIO_PORT}"
 
-@pytest.fixture(scope="module")
-def test_image():
-    # Create a temporary test image
-    test_img = Image.fromarray(np.zeros((100, 100, 3), dtype=np.uint8))
-    temp_dir = tempfile.mkdtemp()
-    test_img_path = os.path.join(temp_dir, "test_image.png")
-    test_img.save(test_img_path)
-    
-    yield test_img_path
-    
-    # Cleanup
-    os.remove(test_img_path)
-    os.rmdir(temp_dir)
-
 def test_page_loads(page):
     page.goto(GRADIO_URL)
     page.wait_for_load_state("networkidle")
     
     # Check if title is present with exact text
-    expect(page.locator("h2", has_text="Crowdsourcing Handwriting OCR Dataset")).to_be_visible()
-    
-    # Check if main interface elements are present
-    expect(page.get_by_label("Text to Handwrite")).to_be_visible()
-    expect(page.locator('input[type="file"]')).to_be_attached()
-    expect(page.get_by_role("button", name="Submit")).to_be_visible()
-    expect(page.get_by_role("button", name="Skip")).to_be_visible()
-
-def test_skip_functionality(page):
-    page.goto(GRADIO_URL)
-    page.wait_for_load_state("networkidle")
-    
-    # Get initial text
-    text_box = page.get_by_label("Text to Handwrite")
-    initial_text = text_box.input_value()
-    
-    # Click skip button
-    page.get_by_role("button", name="Skip").click()
-    page.wait_for_timeout(2000)  # Wait for response
-    
-    # Get new text and verify it changed
-    new_text = text_box.input_value()
-    assert initial_text != new_text
-
-def test_upload_image(page, test_image):
-    page.goto(GRADIO_URL)
-    page.wait_for_load_state("networkidle")
-    
-    # Get initial text
-    text_box = page.get_by_label("Text to Handwrite")
-    initial_text = text_box.input_value()
-    
-    # Upload image - file input is hidden, but we can still set its value
-    page.locator('input[type="file"]').set_input_files(test_image)
-    page.wait_for_timeout(2000)  # Wait for upload
-    
-    # Click submit to complete the upload
-    page.get_by_role("button", name="Submit").click()
-    page.wait_for_timeout(2000)  # Wait for response
-    
-    # Verify text changed after submission
-    new_text = text_box.input_value()
-    assert initial_text != new_text 
+    expect(page.locator("h2", has_text="Crowdsourcing Handwriting OCR Dataset")).to_be_visible()