gsheet

app.py

@@ -13,47 +13,8 @@ from datetime import datetime
 import gspread
 import json
 from oauth2client.service_account import ServiceAccountCredentials
-#from utils import *
-from utils import geosubset
+from utils import *
 
-scope = ['https://www.googleapis.com/auth/spreadsheets',
-         "https://www.googleapis.com/auth/drive"]
-
-
-
-
-
-keydict = {'type': st.secrets["type"],
- 'project_id': st.secrets["project_id"],
- 'private_key_id': st.secrets["private_key_id"],
- 'private_key': '-----BEGIN PRIVATE KEY-----\n' + st.secrets["private_key1"] + '\n' + st.secrets["private_key2"] + '\n' + st.secrets["private_key3"] + '\nz/Y8688FgEzPXYdHq7ip7DMBnEXYRGaI4B1k+F2PLi9AGrBJ2AnbMrPqftlZLHVC\n' + st.secrets["private_key13"] + '\njS7sPU4rL+NlPqvOdsrmHtuI0l9Obw0qU4rJN/rwatZI2Gli0wETgDdh23Mho2c8\n' + st.secrets["private_key4"] + '\nDSwcWUU0Uzw9OIDNR6LdOwscsxWBB5jnJHSaXOFSmCL6uStJde5TH948UBxIFSh5\n8k4HmWXU2Z3p8nZZy9DH+X52CMMRhenortk5DRkNsdTK8yZnLC3T/Zl/3EYD8DBk\n' + st.secrets["private_key6"] + '\ncelewiKhMGHHjSQqKHF0KWVEq0dr12FXouTbR1XGSbJrCXCxjOckBbuSAcRk7mAt\n' + st.secrets["private_key7"] + '\n6G+amSe9DqfQGVqRo4t+ZXxlKLQkOOKaz95HTGl6nIGzSiemsgOnIBZgeSRNvmsr\n' + st.secrets["private_key8"] + '\nd63heAd+1G8uglvyvk/ikTQnrwKBgQDL5IrUuqG+5HFyLRbX3Nhg/WM23Z7xGb1G\nDAr3sqxAJqz8sN1p5PmIHp4k6UYO46XpSR6ZP+S3IsFDeWmbp+1kEB3wyaYsoVHs\n' + st.secrets["private_key9"] + '\nM7lqFXaXqQKBgG3uesahQbbXcBY5zV2Fkwo2kNuBh9UgGNwexfus9G8F8m+B1WXE\n34d0wvgrJa0VeNqE1XC53lyPP/ZsKROzvW8XDUeebno2VOC95+RMzX7pmx5jdJaf\n' + st.secrets["private_key10"] + '\ndDLO7EHwEBWPDWIoulDT0X7GfRmGKYWrCxVjW5HEW9xhvkw5zuhiiPpE5sWXMqp3\n' + st.secrets["private_key11"] + '\nrws8MdFBKPxuRvP85O1BcdIZEKwt9Zx/nCWAx5eZAoGAeoOy8MD0EiXscQUYEN7E\n' + st.secrets["private_key12"] + '\n8zZ8vE6s+0Gj5P2fd2LrbMtJy6x/s6TwCcgIdfCycUC4GjVqHe3GdJ687AfhxoH1\n' + st.secrets["private_key5"] + '\n-----END PRIVATE KEY-----\n',
- 'client_email': st.secrets["client_email"],
- 'client_id': st.secrets["client_id"],
- 'auth_uri': st.secrets["auth_uri"],
- 'token_uri': st.secrets["token_uri"],
- 'auth_provider_x509_cert_url': st.secrets["auth_provider_x509_cert_url"],
- 'client_x509_cert_url': st.secrets["client_x509_cert_url"]}
-
-
-
-
-credentials = ServiceAccountCredentials.from_json_keyfile_dict(keydict, scope)
-client = gspread.authorize(credentials)
-
-sheet = client.open("PropertyPricePredictor_Sheet").sheet1
-sheet.append_row([1,2,3,4,5,655123])
-
-
-
-fig, ax = plt.subplots()
-geosubset = geosubset.sample(10)
-geosubset['year'] = geosubset['transactDa'].dt.year
-st.write(geosubset['transactDa'].dt.year)
-sns.swarmplot(data=geosubset, y='resale_pri', orient='v', ax=ax, hue='year')
-geosubset.drop(columns=['year'], inplace=True)
-st.pyplot(fig)
-
-st.stop()
 ########## Title for the Web App ##########
 st.title("Property Price Predictor")
 st.markdown('_Creator: GOH Hong Aik [[LinkedIn]](https://www.linkedin.com/in/hongaikgoh/)_')
@@ -227,8 +188,8 @@ with st.form("inputs"):
             st_folium(map, width=700, height=450)
 
             fig, ax = plt.subplots()
-            sns.swarmplot(y=geosubset['resale_pri'], orient='v', ax=ax, hue=geosubset['transactDate'].str[:4])
-            plt.scatter(0, prediction_price, color='orange')
+            sns.swarmplot(x=['']*len(geosubset), y=geosubset['resale_pri'], orient='v', ax=ax, hue=geosubset['transactDa'].dt.year, alpha=0.75)
+            plt.scatter(0, prediction_price, color='orange', s=100, marker='x')
             plt.text(0.05, prediction_price, 'Your predicted property price')
             plt.ylabel('Resale Price ($)')
             plt.title('Swarmplot of nearby similar properties')
@@ -332,54 +293,23 @@ with st.form("inputs"):
     
         # Log searches
         
-        # private_key = st.secrets['private_key']
-        # st.write(private_key)
-
-        # private_key = "-----BEGIN PRIVATE KEY-----\nMIIEv" + private_key + "Y8yY=\n-----END PRIVATE KEY-----"
-        # st.write(private_key)
-        # st.write(private_key[:40])
-        # st.write(private_key[-40:])
-
-        # import re
-        # r = re.compile("\s*-----BEGIN (.*)-----\n")
-        # m = r.match(private_key)
-        # if not m:
-        #     raise ValueError("Not a valid PEM pre boundaryAAA")
-        # marker = m.group(1)
-        # st.write(marker)
-
-        # # Verify Post-Encapsulation Boundary
-        # r = re.compile("-----END (.*)-----\s*$")
-        # m = r.search(private_key)
-        # if not m or m.group(1) != marker:
-        #     raise ValueError("Not a valid PEM post boundaryAAA")
-        # st.write(m.group(1))
-
-
-
         keydict = {'type': st.secrets["type"],
-                'project_id': st.secrets["project_id"],
-                'private_key_id': st.secrets["private_key_id"],
-                'private_key': st.secrets["private_key"],
-                'client_email': st.secrets["client_email"],
-                'client_id': st.secrets["client_id"],
-                'auth_uri': st.secrets["auth_uri"],
-                'token_uri': st.secrets["token_uri"],
-                'auth_provider_x509_cert_url': st.secrets["auth_provider_x509_cert_url"],
-                'client_x509_cert_url': st.secrets["client_x509_cert_url"]}
-
-        r = json.dumps(keydict)
-        loaded_r = json.loads(r)
+            'project_id': st.secrets["project_id"],
+            'private_key_id': st.secrets["private_key_id"],
+            'private_key': '-----BEGIN PRIVATE KEY-----\n' + st.secrets["private_key1"] + '\n' + st.secrets["private_key2"] + '\n' + st.secrets["private_key3"] + '\nz/Y8688FgEzPXYdHq7ip7DMBnEXYRGaI4B1k+F2PLi9AGrBJ2AnbMrPqftlZLHVC\n' + st.secrets["private_key13"] + '\njS7sPU4rL+NlPqvOdsrmHtuI0l9Obw0qU4rJN/rwatZI2Gli0wETgDdh23Mho2c8\n' + st.secrets["private_key4"] + '\nDSwcWUU0Uzw9OIDNR6LdOwscsxWBB5jnJHSaXOFSmCL6uStJde5TH948UBxIFSh5\n8k4HmWXU2Z3p8nZZy9DH+X52CMMRhenortk5DRkNsdTK8yZnLC3T/Zl/3EYD8DBk\n' + st.secrets["private_key6"] + '\ncelewiKhMGHHjSQqKHF0KWVEq0dr12FXouTbR1XGSbJrCXCxjOckBbuSAcRk7mAt\n' + st.secrets["private_key7"] + '\n6G+amSe9DqfQGVqRo4t+ZXxlKLQkOOKaz95HTGl6nIGzSiemsgOnIBZgeSRNvmsr\n' + st.secrets["private_key8"] + '\nd63heAd+1G8uglvyvk/ikTQnrwKBgQDL5IrUuqG+5HFyLRbX3Nhg/WM23Z7xGb1G\nDAr3sqxAJqz8sN1p5PmIHp4k6UYO46XpSR6ZP+S3IsFDeWmbp+1kEB3wyaYsoVHs\n' + st.secrets["private_key9"] + '\nM7lqFXaXqQKBgG3uesahQbbXcBY5zV2Fkwo2kNuBh9UgGNwexfus9G8F8m+B1WXE\n34d0wvgrJa0VeNqE1XC53lyPP/ZsKROzvW8XDUeebno2VOC95+RMzX7pmx5jdJaf\n' + st.secrets["private_key10"] + '\ndDLO7EHwEBWPDWIoulDT0X7GfRmGKYWrCxVjW5HEW9xhvkw5zuhiiPpE5sWXMqp3\n' + st.secrets["private_key11"] + '\nrws8MdFBKPxuRvP85O1BcdIZEKwt9Zx/nCWAx5eZAoGAeoOy8MD0EiXscQUYEN7E\n' + st.secrets["private_key12"] + '\n8zZ8vE6s+0Gj5P2fd2LrbMtJy6x/s6TwCcgIdfCycUC4GjVqHe3GdJ687AfhxoH1\n' + st.secrets["private_key5"] + '\n-----END PRIVATE KEY-----\n',
+            'client_email': st.secrets["client_email"],
+            'client_id': st.secrets["client_id"],
+            'auth_uri': st.secrets["auth_uri"],
+            'token_uri': st.secrets["token_uri"],
+            'auth_provider_x509_cert_url': st.secrets["auth_provider_x509_cert_url"],
+            'client_x509_cert_url': st.secrets["client_x509_cert_url"]}
 
         scope = ['https://www.googleapis.com/auth/spreadsheets',
          "https://www.googleapis.com/auth/drive"]
 
-        try:
-            credentials = ServiceAccountCredentials.from_json_keyfile_dict(loaded_r, scope)
-            #credentials = ServiceAccountCredentials.from_json_keyfile_name("updategsheet_keys.json", scope)
-            client = gspread.authorize(credentials)
+    
+        credentials = ServiceAccountCredentials.from_json_keyfile_dict(loaded_r, scope)
+        client = gspread.authorize(credentials)
 
-            sheet = client.open("PropertyPricePredictor_Sheet").sheet1
-            sheet.append_row([datetime.now().strftime('%Y-%m-%d %H:%M:%S'), int(input_postal),input_storey,input_age_asof_transaction,input_floor_area_sqft,input_propertyType])
-        except:
-            pass    
+        sheet = client.open("PropertyPricePredictor_Sheet").sheet1
+        sheet.append_row([datetime.now().strftime('%Y-%m-%d %H:%M:%S'), int(input_postal),input_storey,input_age_asof_transaction,input_floor_area_sqft,input_propertyType])