Update app.py

app.py

@@ -7,13 +7,7 @@ from huggingface_hub import list_models
 
 load_dotenv()
 API_URL = os.getenv("API_URL")
-class CreateProfile:
-    def __init__(self, _id=None):
-        self._id = _id
-        self.name = ""
-        self.username = ""
-        
-newprofile = CreateProfile()
+choices = os.getenv("choices")
 
 def check_active_users():
     response = requests.get(f"{API_URL}/status")
@@ -23,7 +17,7 @@ def check_active_users():
             return False, "There's currently a high volume of requests. The server is busy processing these requests. Please try again later."
     return True, ""
 
-def process_ui_image(image, user_task, progress=gr.Progress()):
+def process_ui_image(image, user_task, background, purpose, progress=gr.Progress()):
     progress(0)
     
     # Check the number of active users
@@ -31,9 +25,9 @@ def process_ui_image(image, user_task, progress=gr.Progress()):
     if not can_proceed:
         return message
     
-    # Upload image and user task to the API
+    # Upload image, user task, and field to the API
     files = {'image': open(image, 'rb')}
-    data = {'user_task': user_task, "name": newprofile.name, "username": newprofile.username}
+    data = {'user_task': user_task, 'background': background, 'purpose': purpose}
     response = requests.post(f"{API_URL}/process", files=files, data=data)
     
     if response.status_code != 200:
@@ -41,7 +35,6 @@ def process_ui_image(image, user_task, progress=gr.Progress()):
     
     # Get the request ID from the response
     request_id = response.json().get("request_id")
- 
     
     if not request_id:
         return "Error: Failed to get request ID from the server."
@@ -65,7 +58,7 @@ def process_ui_image(image, user_task, progress=gr.Progress()):
         time.sleep(1)
     
     # Download the final PDF
-    final_pdf_response = requests.get(f"{API_URL}/get_file")
+    final_pdf_response = requests.get(f"{API_URL}/get_file/{request_id}")
     
     if final_pdf_response.status_code == 200:
         with open("UXEva_report.pdf", "wb") as f:
@@ -74,12 +67,11 @@ def process_ui_image(image, user_task, progress=gr.Progress()):
     else:
         return "Error: Failed to download the PDF."
 
-def update_submit_button(image, user_task):
-    if not image or not user_task:
+def update_submit_button(image, user_task, background, purpose):
+    if not image or not user_task or not background or not purpose:
         return gr.update(interactive=False), gr.update(visible=True)
     return gr.update(interactive=True), gr.update(visible=False)
 
-
 with gr.Blocks(css="""
     .image-preview img {max-height: 400px; max-width: 400px;}
     .disabled {cursor: not-allowed; color: red;}
@@ -89,33 +81,27 @@ with gr.Blocks(css="""
         <span style="color: green;">UXEva</span>: UI/UX Evaluation Tool Powered by LLM Agent
     </h1>
     """)
-    gr.LoginButton()
     
-    with gr.Column(visible=False) as main_ui:
-        image_input = gr.Image(type="filepath", label="Upload UI Image", elem_classes="image-preview")
-        user_task_input = gr.Textbox(label="Enter User Task")
+    with gr.Column(visible=True) as main_ui:
+        image_input = gr.Image(type="filepath", label="Upload Image of the UI you want to evaluate", elem_classes="image-preview")
+        user_task_input = gr.Textbox(label="Enter the task that user will perform with your UI")
+        purposeQ = gr.Dropdown(choices=["Personal Project", "Research", "Professional work", "Student"], label="How are you using this tool?")
+        backgroundQ = gr.Dropdown(choices=choices + ["Other"], label="Enter your Background.")
         pdf_output = gr.File(label="Download PDF Report")
         submit_btn = gr.Button("Submit", interactive=False)
-        warning = gr.Markdown("<span class='disabled'>Upload image and enter user task</span>", visible=False)
+        warning = gr.Markdown("<span class='disabled'>Please upload image, enter user task, background, and answer question</span>", visible=False)
     
-    image_input.change(update_submit_button, inputs=[image_input, user_task_input], outputs=[submit_btn, warning])
-    user_task_input.change(update_submit_button, inputs=[image_input, user_task_input], outputs=[submit_btn, warning])
+    image_input.change(update_submit_button, inputs=[image_input, user_task_input, backgroundQ, purposeQ], outputs=[submit_btn, warning])
+    user_task_input.change(update_submit_button, inputs=[image_input, user_task_input, backgroundQ, purposeQ], outputs=[submit_btn, warning])
+    backgroundQ.change(update_submit_button, inputs=[image_input, user_task_input, backgroundQ, purposeQ], outputs=[submit_btn, warning])
+    purposeQ.change(update_submit_button, inputs=[image_input, user_task_input, backgroundQ, purposeQ], outputs=[submit_btn, warning])
     
     submit_btn.click(
         process_ui_image, 
-        inputs=[image_input, user_task_input], 
+        inputs=[image_input, user_task_input, backgroundQ, purposeQ], 
         outputs=[pdf_output]
     )
-    def get_profile(profile: gr.OAuthProfile):
-        global newprofile
-        if profile is None:
-            print("unknow user.")
-        else:
-            newprofile.name = profile.name
-            newprofile.username = profile.username
-            return {main_ui: gr.Column(visible=True)}
-            
-    demo.load(get_profile, inputs=None, outputs=[main_ui])
+    
     gr.Markdown("""
     <h2>Terms of use</h2>
     <p>The UI Analysis Report provided herein has been generated by an LLM-powered agent designed to assist individuals, researchers, startups, and companies in conducting UI evaluations and enhancing the efficiency of UX researchers.</p>
@@ -124,4 +110,4 @@ with gr.Blocks(css="""
     """)
 
 demo.queue(default_concurrency_limit=1, max_size=7)
-demo.launch()
+demo.launch()