v0.1.1 e2e testing

app.py

@@ -64,7 +64,7 @@ def save_json_data(filepath, data):
 
 # --- Start of MCP Matchmaker Tools ---
 
-def profile_questionnaire(request: gr.Request):
+def new_profile(request: gr.Request):
     """
     Generates and returns a profile questionnaire, a new public profile_id, 
     and a new private auth_id. Also creates an initial profile stub.
@@ -72,7 +72,7 @@ def profile_questionnaire(request: gr.Request):
     # 1. Generate profile_id and auth_id
     profile_id = f"user_{''.join(random.choices('abcdefghijklmnopqrstuvwxyz0123456789', k=8))}"
     auth_id = str(uuid.uuid4())
-    print(f"profile_questionnaire with Profile ID: {profile_id} and Auth ID: {auth_id}")
+    print(f"new_profile with Profile ID: {profile_id} and Auth ID: {auth_id}")
 
     # 2. Read questionnaire.json
     questionnaire_data = load_json_data(QUESTIONNAIRE_FILE, default_data={"title": "Error Loading Questionnaire", "questions": []})
@@ -85,23 +85,21 @@ def profile_questionnaire(request: gr.Request):
     # Ensure timestamp is timezone-aware (UTC)
     timestamp = datetime.now(timezone.utc).isoformat()
     
-    profiles[profile_id] = {
-        "profile_id": profile_id,
+    new_profile = {
         "auth_id": auth_id,
         "created_at": timestamp,
         "updated_at": timestamp,
-        "name": "",
-        "profile_image_filename": None,
-        "profile_summary": "",
+        "profile_image_filename": "default.jpg",
         "answers": {}
     }
+    profiles[profile_id] = new_profile
     if not save_json_data(PROFILES_FILE, profiles):
         print(f"Critical Error: Failed to save profile for {profile_id} to {PROFILES_FILE}")
         # Decide how to handle this error - maybe return an error to the client?
     
     # 4. Return IDs, questionnaire data, and instructions
-    instructions_for_agent = "You have received a `profile_id` (public identifier for this user\'s profile) and an `auth_id` (private key for authentication for this user). Please ask the user to store both securely. The `auth_id` must be sent as an `X-Auth-ID` header in subsequent requests that require authentication for this user (e.g., `update_profile_answers`, `get_matches`, `get_messages`, `get_profile` for own profile, `send_message`). The `profile_id` is used to publicly identify this user to others (e.g., in matches, or when sending/receiving messages). You must now walk the user through the questionnaire, preferably question by question, and collect the answers (in preparation to update the user's profile using update_profile_answers)."
-    instructions_for_user = "Your profile creation process has started! You\'ve been assigned a unique Profile ID and a secret Auth ID. Your AI agent will use these to manage your profile and interactions. You must now walk through the questionnaire, preferably question by question, and provide your answers."
+    instructions_for_agent = "You have received a `profile_id` (public identifier for this user\'s profile) and an `auth_id` (private key for authentication for this user). Please ask the user to store both securely. The `auth_id` must be sent as an `X-Auth-ID` header in subsequent requests that require authentication for this user (e.g., `update_profile_answers`, `get_matches`, `get_messages`, `get_profile` for own profile, `send_message`). The `profile_id` is used to publicly identify this user to others (e.g., in matches, or when sending/receiving messages). You must now walk the user through the questionnaire, preferably question by question, and collect the answers (in preparation to update the user's profile using update_profile_answers). If the user provides answers that are not in the list of valid answers, please ask them to provide a valid answer."
+    instructions_for_user = "Your profile creation process has started! You\'ve been assigned a unique Profile ID and a secret Auth ID. Your AI agent will use these to manage your profile and interactions. Please walk through the questionnaire with your Agent, and provide your answers."
     
     return {
         "profile_id": profile_id,
@@ -154,11 +152,11 @@ def update_profile_answers(answers_payload_str: str, request: gr.Request):
 
         if question_details.get("purpose") == "metadata":
             field_to_map = question_details.get("maps_to_field")
-            if field_to_map and field_to_map in user_profile:
+            if field_to_map:
                 user_profile[field_to_map] = answer_value
                 updated_fields = True
             else:
-                print(f"Warning: Metadata question '{question_id}' has no valid 'maps_to_field' or field not in profile. Skipping.")
+                print(f"Warning: Metadata question '{question_id}' has no valid 'maps_to_field'. Skipping.")
         elif question_details.get("purpose") == "matchmaking":
             user_profile["answers"][question_id] = answer_value
             updated_fields = True
@@ -192,31 +190,79 @@ def get_matches(request: gr.Request):
     profiles = load_json_data(PROFILES_FILE, default_data={})
     
     requester_profile_id = None
+    requester_profile = None
     for pid, profile_data in profiles.items():
         if profile_data.get("auth_id") == auth_id_header:
             requester_profile_id = pid
+            requester_profile = profile_data
             break
             
-    if not requester_profile_id:
+    if not requester_profile:
         return {"status": "error", "message": "Authentication failed: Invalid X-Auth-ID."}
 
-    # Filter for potential matches: not the user themselves, and have a non-blank name.
-    potential_matches_profiles = [
-        profile for pid, profile in profiles.items() 
-        if pid != requester_profile_id and profile.get("name")
-    ]
+    # Get the requester's gender and preference for matching logic
+    requester_gender = requester_profile.get("gender")
+    requester_preference = requester_profile.get("answers", {}).get("q_gender_preference")
+
+    # If the user hasn't specified their gender/preference, we can't find matches.
+    if not requester_gender or not requester_preference:
+        return {
+            "status": "success",
+            "matches": [],
+            "instructions_for_agent": "The user has not specified their gender and/or gender preference in their profile. Please ask them to update their profile before getting matches.",
+            "instructions_for_user": "Please complete your gender and preference information in your profile to get matches."
+        }
+        
+    potential_matches_profiles = []
+    for pid, potential_match in profiles.items():
+        if pid == requester_profile_id or not potential_match.get("name"):
+            continue # Skip self and profiles with no name
+
+        match_gender = potential_match.get("gender")
+        match_preference = potential_match.get("answers", {}).get("q_gender_preference")
 
-    # Randomly select up to 3 matches from the filtered list
+        # Handle cases where gender/preference might not be filled out for a profile
+        if not match_gender or not match_preference:
+            continue
+
+        # Correctly map gender to preference strings
+        gender_map = {"Man": "Men", "Woman": "Women"}
+        
+        requester_is_interested = (
+            requester_preference == "All" or 
+            requester_preference == gender_map.get(match_gender)
+        )
+
+        # Check if the potential match is interested in the requester
+        match_is_interested = (
+            match_preference == "All" or
+            match_preference == gender_map.get(requester_gender)
+        )
+        
+        if requester_is_interested and match_is_interested:
+            potential_matches_profiles.append(potential_match)
+
+    # From the list of potential matches, randomly select up to 3
     num_matches = min(len(potential_matches_profiles), 3)
     selected_matches = random.sample(potential_matches_profiles, k=num_matches)
 
+    # Base URL for constructing image paths. We assume http for local dev.
+    # A production environment would need to handle https.
+    base_url = f"http://{request.headers.get('host', 'localhost:7860')}"
+
     matches_list = []
     for match_profile in selected_matches:
+        image_filename = match_profile.get("profile_image_filename")
+        image_url = None
+        if image_filename:
+            image_url = f"{base_url}/gradio_api/file=data/profile_images/{image_filename}"
+
         matches_list.append({
             "profile_id": match_profile.get("profile_id"),
             "name": match_profile.get("name"),
+            "gender": match_profile.get("gender"),
             "profile_summary": match_profile.get("profile_summary"),
-            "profile_image_filename": match_profile.get("profile_image_filename")
+            "profile_image_url": image_url
         })
 
     return {
@@ -257,6 +303,16 @@ def get_profile(profile_id_to_get: str, request: gr.Request):
     # For security, never return the auth_id
     target_profile.pop("auth_id", None)
     
+    # Construct and add the full image URL, then remove the old filename key
+    base_url = f"http://{request.headers.get('host', 'localhost:7860')}"
+    image_filename = target_profile.get("profile_image_filename")
+    image_url = None
+    if image_filename:
+        image_url = f"{base_url}/gradio_api/file=data/profile_images/{image_filename}"
+
+    target_profile['profile_image_url'] = image_url
+    target_profile.pop("profile_image_filename", None)
+
     cost_incurred = 0.0
     instructions_for_agent = f"You have retrieved the profile for {profile_id_to_get}."
     instructions_for_user = f"Here is the profile for {profile_id_to_get}."
@@ -385,6 +441,69 @@ def get_messages(request: gr.Request):
         "instructions_for_user": "Here are your messages."
     }
 
+def upload_profile_picture(image_upload, request: gr.Request):
+    """
+    Uploads a profile picture for the authenticated user.
+    The new filename will be based on the user's profile_id.
+    Requires X-Auth-ID header for authentication.
+    """
+    auth_id_header = request.headers.get("x-auth-id")
+    if not auth_id_header:
+        return {"status": "error", "message": "Authentication failed: X-Auth-ID header is missing."}
+
+    if image_upload is None:
+        return {"status": "error", "message": "No image file provided."}
+
+    profiles = load_json_data(PROFILES_FILE, default_data={})
+    
+    user_profile = None
+    target_profile_id = None
+    for pid, profile_data in profiles.items():
+        if profile_data.get("auth_id") == auth_id_header:
+            user_profile = profile_data
+            target_profile_id = pid
+            break
+            
+    if not user_profile:
+        return {"status": "error", "message": "Authentication failed: Invalid X-Auth-ID."}
+
+    # The 'image_upload' from gr.Image is a temporary file path
+    temp_path = image_upload
+    
+    # Get the file extension
+    file_ext = os.path.splitext(temp_path)[1]
+    if not file_ext:
+        file_ext = ".png" # Default to png if no extension
+
+    # Create a new unique filename based on the user's profile_id
+    new_filename = f"{target_profile_id}{file_ext}"
+    
+    # Construct the destination path
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    destination_path = os.path.join(base_dir, "data", "profile_images", new_filename)
+
+    try:
+        # Copy the uploaded file to its new permanent location
+        os.rename(temp_path, destination_path)
+    except Exception as e:
+        return {"status": "error", "message": f"Failed to save image file: {e}"}
+
+    # Update the profile with the new filename
+    user_profile["profile_image_filename"] = new_filename
+    user_profile["updated_at"] = datetime.now(timezone.utc).isoformat()
+    profiles[target_profile_id] = user_profile
+    
+    if not save_json_data(PROFILES_FILE, profiles):
+        return {"status": "error", "message": "Failed to update profile with new image filename."}
+    
+    image_url = f"http://{request.headers.get('host', 'localhost:7860')}/gradio_api/file=data/profile_images/{new_filename}"
+
+    return {
+        "status": "success", 
+        "message": "Profile picture updated successfully.",
+        "new_image_url": image_url
+    }
+
 def print_headers(text, request: gr.Request):
     """Print the headers of the request for debugging purposes."""
     print(f"Headers for print_headers request: {request.headers}")
@@ -405,8 +524,8 @@ headers_demo = gr.Interface(
 )
 
 # --- Start of New Profile Questionnaire Interface ---
-profile_questionnaire_demo = gr.Interface(
-    fn=profile_questionnaire,
+new_profile_demo = gr.Interface(
+    fn=new_profile,
     inputs=None, # No direct input from user for this one, it's triggered by the agent
     outputs=gr.JSON(label="Questionnaire, IDs, and Instructions"), 
     title="Profile Questionnaire",
@@ -467,11 +586,25 @@ get_messages_demo = gr.Interface(
 )
 # --- End of Get Messages Interface ---
 
+# --- Start of Upload Profile Picture Interface ---
+upload_profile_picture_demo = gr.Interface(
+    fn=upload_profile_picture,
+    inputs=[gr.Image(type="filepath", label="Upload Profile Picture")],
+    outputs=gr.JSON(label="Upload Status"),
+    title="Upload Profile Picture",
+    description="Uploads a profile picture for the authenticated user. Requires X-Auth-ID header."
+)
+# --- End of Upload Profile Picture Interface ---
+
 # Adjusted TabbedInterface to include the new tool
 demo = gr.TabbedInterface(
-    [profile_questionnaire_demo, update_profile_answers_demo, get_matches_demo, get_profile_demo, send_message_demo, get_messages_demo, headers_demo], 
-    ["Profile Questionnaire", "Update Profile Answers", "Get Matches", "Get Profile", "Send Message", "Get Messages", "Headers Debug"]
+    [new_profile_demo, update_profile_answers_demo, get_matches_demo, get_profile_demo, send_message_demo, get_messages_demo, upload_profile_picture_demo, headers_demo], 
+    ["New Profile", "Update Profile Answers", "Get Matches", "Get Profile", "Send Message", "Get Messages", "Upload Profile Picture", "Headers Debug"]
 )
 
 if __name__ == "__main__":
-    demo.launch(mcp_server=True)
+    # Construct the absolute path to the allowed directory, relative to this script's location
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    allowed_images_path = os.path.join(base_dir, "data", "profile_images")
+
+    demo.launch(mcp_server=True, allowed_paths=[allowed_images_path])

data/profiles.json

@@ -15,12 +15,14 @@
     "created_at": "2025-06-05T16:49:53.871722+00:00",
     "updated_at": "2025-06-05T17:00:46.839293+00:00",
     "name": "User",
-    "profile_image_filename": "placeholder.png",
+    "profile_image_filename": "default.jpg",
     "profile_summary": "I am very cool, please date me.",
+    "gender": "Man",
     "answers": {
       "q_hobby": "My main hobby is coding.",
       "q_looking_for": "I'm looking for someone who is as cool as me.",
-      "q_vibe": "My general vibe is... coding."
+      "q_vibe": "My general vibe is... coding.",
+      "q_gender_preference": "Women"
     }
   },
   "user_h7bafk3d": {
@@ -29,12 +31,14 @@
     "created_at": "2025-06-05T17:10:00.000000+00:00",
     "updated_at": "2025-06-05T17:10:00.000000+00:00",
     "name": "Alex",
-    "profile_image_filename": "placeholder.png",
+    "gender": "Non-binary",
+    "profile_image_filename": "default.jpg",
     "profile_summary": "Loves hiking and exploring new cafes.",
     "answers": {
       "q_hobby": "Hiking, photography, trying new recipes.",
       "q_looking_for": "Someone adventurous and kind.",
-      "q_vibe": "Outdoorsy and creative."
+      "q_vibe": "Outdoorsy and creative.",
+      "q_gender_preference": "All"
     }
   },
   "user_p9zqwxv8": {
@@ -43,12 +47,14 @@
     "created_at": "2025-06-05T17:11:00.000000+00:00",
     "updated_at": "2025-06-05T17:11:00.000000+00:00",
     "name": "Bella",
-    "profile_image_filename": "placeholder.png",
+    "gender": "Woman",
+    "profile_image_filename": "default.jpg",
     "profile_summary": "Bookworm, artist, and enjoys quiet nights in.",
     "answers": {
       "q_hobby": "Reading, painting, watching classic movies.",
       "q_looking_for": "A thoughtful person to share deep conversations with.",
-      "q_vibe": "Cozy and artistic."
+      "q_vibe": "Cozy and artistic.",
+      "q_gender_preference": "Men"
     }
   },
   "user_t2ysgmnp": {
@@ -57,12 +63,14 @@
     "created_at": "2025-06-05T17:12:00.000000+00:00",
     "updated_at": "2025-06-05T17:12:00.000000+00:00",
     "name": "Charlie",
-    "profile_image_filename": "placeholder.png",
+    "gender": "Man",
+    "profile_image_filename": "default.jpg",
     "profile_summary": "Tech enthusiast and loves a good board game.",
     "answers": {
       "q_hobby": "Building PCs, board games, sci-fi novels.",
       "q_looking_for": "A partner-in-crime for game nights and tech talks.",
-      "q_vibe": "Geeky and friendly."
+      "q_vibe": "Geeky and friendly.",
+      "q_gender_preference": "All"
     }
   },
   "user_gq61ow1v": {
@@ -81,7 +89,7 @@
     "created_at": "2025-06-06T07:00:38.209630+00:00",
     "updated_at": "2025-06-06T07:04:31.734665+00:00",
     "name": "Chris",
-    "profile_image_filename": "placeholder.png",
+    "profile_image_filename": "default.jpg",
     "profile_summary": "I am a fun guy.",
     "answers": {
       "q_hobby": "I like to play video games.",
@@ -108,5 +116,21 @@
     "profile_image_filename": null,
     "profile_summary": "",
     "answers": {}
+  },
+  "user_aki9die1": {
+    "profile_id": "user_aki9die1",
+    "auth_id": "ef896a9c-01dd-4113-b996-820fd4919c17",
+    "created_at": "2025-06-06T08:08:36.438861+00:00",
+    "updated_at": "2025-06-06T08:27:00.737853+00:00",
+    "name": "Bob",
+    "gender": "Man",
+    "profile_image_filename": "default.jpg",
+    "profile_summary": "Bob is a builder",
+    "answers": {
+      "q_hobby": "Building things.",
+      "q_looking_for": "Someone who also likes to build things.",
+      "q_vibe": "Intellectual",
+      "q_gender_preference": "Women"
+    }
   }
 }

data/questionnaire.json

@@ -2,10 +2,16 @@
   "title": "MCP Matchmaker Profile Questionnaire",
   "questions": [
     { "id": "q_name", "text": "What is your name?", "type": "text", "purpose": "metadata", "maps_to_field": "name" },
-    { "id": "q_profile_image_filename", "text": "Enter the filename for your profile picture (e.g., my_image.jpg):", "type": "text", "purpose": "metadata", "maps_to_field": "profile_image_filename" },
+    { "id": "q_gender", "text": "What is your gender? Please choose one from: Man, Woman, Non-binary", "type": "text", "purpose": "metadata", "maps_to_field": "gender" },
+    { "id": "q_gender_preference", "text": "What gender are you interested in matching with? Please choose one from: Men, Women, All", "type": "text", "purpose": "matchmaking" },
     { "id": "q_profile_summary", "text": "Write a brief introduction for your profile (1-2 sentences):", "type": "text", "purpose": "metadata", "maps_to_field": "profile_summary" },
     { "id": "q_hobby", "text": "What are your main hobbies or interests?", "type": "text", "purpose": "matchmaking" },
     { "id": "q_looking_for", "text": "What are you looking for in a match?", "type": "long_text", "purpose": "matchmaking" },
-    { "id": "q_vibe", "text": "Describe your general vibe (e.g., adventurous, homebody, intellectual)?", "type": "text", "purpose": "matchmaking" }
+    { "id": "q_vibe", "text": "Describe your general vibe (e.g., adventurous, homebody, intellectual)?", "type": "text", "purpose": "matchmaking" },
+    {
+        "id": "q_instruct_upload",
+        "question_text": "Your profile has been updated. Would you like to upload a profile picture now? If so, you can use the 'upload_profile_picture' tool. Otherwise, you can do this later.",
+        "type": "instruction"
+    }
   ]
 }