Update app.py

app.py

@@ -87,39 +87,6 @@ def haversine(lat1, lon1, lat2, lon2):
     distance = R * c
     return distance
 
-# # Function to handle form submission
-# @st.experimental_dialog("Fill out the form")
-# def form_dialog():    
-#     city = st.selectbox("City", ['San Francisco', 'Oakland', 'Berkeley'])
-#     zipcode = st.selectbox("Zipcode")
-        
-#     sex = st.radio("Sex", ["Male", "Female", "Other"])
-#     lgbtq = st.radio("Do you identify as LGBTQ+ (some shelters serve this community specifically)", ["No", "Yes"])
-#     domestic_violence = st.radio("Have you experienced domestic violence (some shelters serve these individuals specifically", ["No", "Yes"])
-    
-#     urgency = st.radio("How quickly do you need help?", ("Today", "In the next few days", "In a week or more"))
-#     duration = st.radio("How long do you need a place to stay?", ("Overnight", "A month or less", "A couple of months", "A year or more"))
-#     needs = st.text_area("Optional - Needs (tell us what you need and how we can help)")
-
-#     if st.button("Submit"):
-#         data = {
-#             "City": city,
-#             "Zip Code": zipcode,
-#             "Sex": sex,
-#             "LGBTQ": lgbtq,
-#             "Domestic Violence": domestic_violence,
-#             "Urgency": urgency,
-#             "Duration": duration,
-#             "Needs": needs
-#         }
-
-#         with open('data.json', 'w') as f:
-#             json.dump(data, f)
-
-#         st.session_state.form_submitted = True
-#         st.session_state.data = data
-#         st.rerun()
-
 # Initialize session state
 if 'form_submitted' not in st.session_state:
     st.session_state.form_submitted = False
@@ -136,6 +103,8 @@ st.set_page_config(
 st.title("ShelterSearch")
 
 if not st.session_state.form_submitted:
+    st.write("Fill out this form")
+    
     city = st.selectbox("City", ['San Francisco', 'Oakland', 'Berkeley'])
     zipcode = st.text_input("Zipcode")
         
@@ -170,77 +139,77 @@ else:
         data = json.load(f)
     st.json(data)
 
-    # shelters = pd.read_csv("database.csv")
+    shelters = pd.read_csv("database.csv")
 
-    # # filter city
-    # shelters = shelters[(shelters['City'] == data['City'])]
+    # filter city
+    shelters = shelters[(shelters['City'] == data['City'])]
     
-    # # filter sex
-    # shelters = shelters[(shelters['Sex'] == data['Sex']) | (shelters['Sex'] == 'All')]
+    # filter sex
+    shelters = shelters[(shelters['Sex'] == data['Sex']) | (shelters['Sex'] == 'All')]
 
-    # # filter lgbtq
-    # if data['LGBTQ'] == 'No':
-    #     shelters = shelters[(shelters['LGBTQ'] == "No")]
+    # filter lgbtq
+    if data['LGBTQ'] == 'No':
+        shelters = shelters[(shelters['LGBTQ'] == "No")]
 
-    # # filter domestic violence
-    # if data['Domestic Violence'] == "No":
-    #     shelters = shelters[(shelters['Domestic Violence'] == "No")]
+    # filter domestic violence
+    if data['Domestic Violence'] == "No":
+        shelters = shelters[(shelters['Domestic Violence'] == "No")]
 
-    # # calculate distances between zipcodes
-    # if data['Zip Code'] != "Unsure":
-    #     geocoding_api_key = os.environ['OpenWeather_API_KEY']
+    # calculate distances between zipcodes
+    if data['Zip Code'] != "Unsure":
+        geocoding_api_key = os.environ['OpenWeather_API_KEY']
         
-    #     shelters_coordinates = shelters.apply(lambda row: get_coordinates(row['Zip Code'], geocoding_api_key), axis=1).tolist()
-    #     user_coordinates = get_coordinates(data['Zip Code'], geocoding_api_key)
+        shelters_coordinates = shelters.apply(lambda row: get_coordinates(row['Zip Code'], geocoding_api_key), axis=1).tolist()
+        user_coordinates = get_coordinates(data['Zip Code'], geocoding_api_key)
     
-    #     distances = []
-    #     for coordinates in shelters_coordinates:
-    #          distances.append(haversine(coordinates[0], coordinates[1], user_coordinates[0], user_coordinates[1]))
+        distances = []
+        for coordinates in shelters_coordinates:
+             distances.append(haversine(coordinates[0], coordinates[1], user_coordinates[0], user_coordinates[1]))
     
-    #     max = max(distances) if (max(distances) != 0) else 1
-    #     shelters['zipcode_score'] = [d / max for d in distances]
+        max = max(distances) if (max(distances) != 0) else 1
+        shelters['zipcode_score'] = [d / max for d in distances]
 
-    # # get urgency scores 
-    # urgency_scores = shelters.apply(lambda row: get_urgency_score(data['Urgency'], row['Urgency']), axis=1).tolist()
-    # shelters['urgency_score'] = urgency_scores
+    # get urgency scores 
+    urgency_scores = shelters.apply(lambda row: get_urgency_score(data['Urgency'], row['Urgency']), axis=1).tolist()
+    shelters['urgency_score'] = urgency_scores
 
-    # # get duration scores
-    # duration_scores = shelters.apply(lambda row: get_duration_score(data['Duration'], row['Duration']), axis=1).tolist()
-    # shelters['duration_score'] = duration_scores
+    # get duration scores
+    duration_scores = shelters.apply(lambda row: get_duration_score(data['Duration'], row['Duration']), axis=1).tolist()
+    shelters['duration_score'] = duration_scores
 
     
     
-    # # services
-    # if data['Needs'] != "":        
-    #     services_scores = shelters.apply(lambda row: call_gpt(data['Needs'], row['Services']), axis=1).tolist()
-    #     services_scores = [s / 10 for s in services_scores]
+    # services
+    if data['Needs'] != "":        
+        services_scores = shelters.apply(lambda row: call_gpt(data['Needs'], row['Services']), axis=1).tolist()
+        services_scores = [s / 10 for s in services_scores]
         
-    #     shelters['services_score'] = services_scores
+        shelters['services_score'] = services_scores
 
-    # st.table(shelters)
+    st.table(shelters)
         
-    # shelters = [
-    #     {"title": "Shelter 1", "description": "This is the 1st shelter",},
-    #     {"title": "Shelter 2", "description": "This is the 2nd shelter.",},
-    #     {"title": "Shelter 3", "description": "This is the 3rd shelter.",}
-    # ]
-
-    # # Display the current shelter information
-    # shelter = shelters[st.session_state.shelter_index]
-    # st.write(shelter["description"])
+    shelters = [
+        {"title": "Shelter 1", "description": "This is the 1st shelter",},
+        {"title": "Shelter 2", "description": "This is the 2nd shelter.",},
+        {"title": "Shelter 3", "description": "This is the 3rd shelter.",}
+    ]
+
+    # Display the current shelter information
+    shelter = shelters[st.session_state.shelter_index]
+    st.write(shelter["description"])
     
-    # # Create two columns
-    # col1, col2 = st.columns([1,1])
+    # Create two columns
+    col1, col2 = st.columns([1,1])
     
-    # # Add buttons to each column
-    # with col1:
-    #     if st.button("Previous"):
-    #         if st.session_state.shelter_index > 0:
-    #             st.session_state.shelter_index -= 1
-    #             st.experimental_rerun()
+    # Add buttons to each column
+    with col1:
+        if st.button("Previous"):
+            if st.session_state.shelter_index > 0:
+                st.session_state.shelter_index -= 1
+                st.experimental_rerun()
     
-    # with col2:
-    #     if st.button("Next"):
-    #         if st.session_state.shelter_index < len(shelters) - 1:
-    #             st.session_state.shelter_index += 1
-    #             st.experimental_rerun()
+    with col2:
+        if st.button("Next"):
+            if st.session_state.shelter_index < len(shelters) - 1:
+                st.session_state.shelter_index += 1
+                st.experimental_rerun()