first draft

app.py

@@ -1,17 +1,23 @@
 import gradio as gr
+import main from main
 
-def main(postal: int, floor: int):
-    test = postal/floor
-    return test
+#Input structure
+##Postal_,age_,town_,storey_,room_ = 680705, 30, 'CHOA CHU KANG', 12, '5 ROOM'
+
+town_list = ['ANG MO KIO', 'BEDOK', 'BISHAN', 'BUKIT BATOK', 'BUKIT MERAH', 'BUKIT PANJANG', 'BUKIT TIMAH', 'CENTRAL AREA', 'CHOA CHU KANG', 'CLEMENTI', 'GEYLANG', 'HOUGANG', 'JURONG EAST', 'JURONG WEST', 'KALLANG/WHAMPOA', 'MARINE PARADE', 'PASIR RIS', 'PUNGGOL', 'QUEENSTOWN', 'SEMBAWANG', 'SENGKANG', 'SERANGOON', 'TAMPINES', 'TOA PAYOH', 'WOODLANDS', 'YISHUN']
+room_list = ['1 ROOM', '2 ROOM', '3 ROOM', '4 ROOM', '5 ROOM', 'EXECUTIVE', 'MULTI-GENERATION']
 
 iface = gr.Interface(
     fn=main, 
     inputs= [
-            gr.inputs.Number(default=680705, label='Postal Code', optional=False),
-            gr.inputs.Number(default=11, label='Floor', optional=False)
+            gr.inputs.Number(default=680705, label='Postal Code'),
+            gr.inputs.Number(default=25, label='Age'),
+            gr.inputs.Dropdown(choices=town_list, type="value", default=None, label='Town'),
+            gr.inputs.Number(default=11, label='Floor'),
+            gr.inputs.Dropdown(choices=room_list, type="value", default=None, label='Room')
         ], 
     outputs= [
-            gr.outputs.Textbox(type="text", label='House price ($)')
+            gr.outputs.Textbox(type="text", label='Predicted House Price ($)')
         ]
     )
 iface.launch()

main.py

@@ -4,88 +4,92 @@ from misc import nearest_mrt
 import time
 import pickle
 import os
+import pandas as pd
 
 ###This is to create MRT names and MRT locations
-# def main(Postal_,age_,town_,storey_,room_):
-
-
-
-###Input structure into model is##
-filename = 'finalized_model.sav'
-
-if os.path.exists("./finalized_model.sav"):
-    model = pickle.load(open(filename, 'rb'))
-    print('loaded model')
-else:
-    print('failed loading model')
-
-#extract feature names#
-feature_names = model.feature_names
-input = [0]*len(feature_names)
-print(feature_names)
-
-#Set up mrt_list
-mrt_name = []
-mrt_loc = []
-with open('data/mrt_list.json', 'r') as file:
-    for line in file:
-        item = json.loads(line)
-        mrt_name.append(item['MRT'])
-        loc = tuple([float(i) for i in item['location']])
-        mrt_loc.append(loc)
-
-#Query for latitude and longitude
-
-
-##POSTAL
-# Postal_input = Postal_
-Postal_input = 680705
-input[feature_names.index('Postal')] = int(Postal_input)
-
-##DISTANCE TO MRT
-search_term = Postal_input #sample
-query_string='https://developers.onemap.sg/commonapi/search?searchVal={}&returnGeom=Y&getAddrDetails=Y&pageNum=1'.format(search_term)
-resp = requests.get(query_string)
-data = json.loads(resp.content)
-chosen_result = data['results'][0]
-
-#Calculate the distance to nearest MRT
-distance_km, nearest_mr = nearest_mrt(chosen_result['LATITUDE'], chosen_result['LONGITUDE'], mrt_name, mrt_loc)
-input[feature_names.index('distance_mrt')] = distance_km
-print(input)
-
-##STOREY
-#Height is input, but then converted to the scale we used for iterating model
-# height_input = storey_
-height_input = 51
-Height = (height_input+2)//3
-input[feature_names.index('storey_height')] = Height
-print(input)
-
-##TOWN
-# town_input = town_
-town_input = 'CHOA CHU KANG'
-input[feature_names.index("town_"+town_input)] = 1
-print(input)
-
-##ROOM
-# room_input = room_
-room_input = '4 ROOM'
-input[feature_names.index("flat_num_"+room_input)] = 1
-print(input)
-
-##AGE/ TRANSACTION YEAR [Current default to 2022]
-# age_input = age_
-age_input = 30
-input[feature_names.index('age_transation')] = age_input
-input[feature_names.index('transaction_yr')] = 2022  #Default to 2022 first
-print(input)
-
-#town is input
-#distance to MRT is calculated
-#age_transaction is age at transaction, which is input
-#Postal is input
-
-
-
-#reverse price adjustment is done with RPI
+
+
+def main(Postal_,age_,town_,storey_,room_):
+##Input structure into model is##
+    filename = 'finalized_model.sav'
+
+    if os.path.exists("./finalized_model.sav"):
+        model = pickle.load(open(filename, 'rb'))
+        print('loaded model')
+    else:
+        print('failed loading model')
+
+    #extract feature names#
+    feature_names = model.feature_names
+    input = [0]*len(feature_names)
+    # print(feature_names)
+
+    #Set up mrt_list
+    mrt_name = []
+    mrt_loc = []
+    with open('data/mrt_list.json', 'r') as file:
+        for line in file:
+            item = json.loads(line)
+            mrt_name.append(item['MRT'])
+            loc = tuple([float(i) for i in item['location']])
+            mrt_loc.append(loc)
+
+    #Query for latitude and longitude
+
+    ##POSTAL
+    Postal_input = Postal_
+    # Postal_input = 680705
+    input[feature_names.index('Postal')] = int(Postal_input)
+
+    ##DISTANCE TO MRT
+    search_term = Postal_input #sample
+    query_string='https://developers.onemap.sg/commonapi/search?searchVal={}&returnGeom=Y&getAddrDetails=Y&pageNum=1'.format(search_term)
+    resp = requests.get(query_string)
+    data = json.loads(resp.content)
+    chosen_result = data['results'][0]
+
+    #Calculate the distance to nearest MRT
+    distance_km, nearest_mr = nearest_mrt(chosen_result['LATITUDE'], chosen_result['LONGITUDE'], mrt_name, mrt_loc)
+    input[feature_names.index('distance_mrt')] = distance_km
+
+    ##STOREY
+    #Height is input, but then converted to the scale we used for iterating model
+    height_input = storey_
+    # height_input = 51
+    Height = (height_input+2)//3
+    input[feature_names.index('storey_height')] = Height
+
+    ##TOWN
+    town_input = town_
+    # town_input = 'CHOA CHU KANG'
+    input[feature_names.index("town_"+town_input)] = 1
+
+    ##ROOM
+    room_input = room_
+    # room_input = '4 ROOM'
+    input[feature_names.index("flat_num_"+room_input)] = 1
+
+    ##AGE/ TRANSACTION YEAR [Current default to 2022]
+    age_input = age_
+    # age_input = 30
+    input[feature_names.index('age_transation')] = age_input
+    input[feature_names.index('transaction_yr')] = 2022  #Default to 2022 first
+
+    #Create final_dataframe as input to model
+
+    Actual = dict(zip(feature_names,input))
+    Actual_df = pd.DataFrame(Actual, index=[0])
+
+    resale_adj_price = model.predict(Actual_df)[0]
+
+    #New resale index is set arbitrarily as 170
+    resale_index = 170
+    price = resale_adj_price*resale_index/133.9
+    print(Actual_df)
+
+    return price
+
+if __name__ == "__main__":
+    Postal_,age_,town_,storey_,room_ = 680705, 30, 'CHOA CHU KANG', 12, '5 ROOM'
+    price = main(Postal_,age_,town_,storey_,room_)
+    print(price)

sample.py

@@ -0,0 +1,29 @@
+import json
+import requests
+from misc import nearest_mrt
+import time
+import pickle
+import os
+import pandas as pd
+
+
+filename = 'finalized_model.sav'
+
+if os.path.exists("./finalized_model.sav"):
+    model = pickle.load(open(filename, 'rb'))
+    print('loaded model')
+else:
+    print('failed loading model')
+
+#extract feature names#
+feature_names = model.feature_names
+
+
+
+site_names = feature_names[5:31]
+town = []
+for town1 in site_names:
+    town1 = town1[5:]
+    town.append(town1)
+
+print(town)