Update app.py

app.py

@@ -10,13 +10,6 @@ import os
 
 
 from notion_client import Client as client_notion
-
-notionToken = os.getenv('notionToken')
-if notionToken is None:
-    raise Exception("Notion token not found. Please check the environment variables.")
-else:
-    print("Notion token found successfully!")
-
 from config import landuseDatabaseId , subdomainAttributesDatabaseId 
 from imports_utils import fetch_all_database_pages
 from imports_utils import get_property_value
@@ -30,10 +23,16 @@ from config import domainColumnName
 from imports_utils import fetchDomainMapper
 from imports_utils import fetchSubdomainMapper
 
-landuse_attributes  = fetch_all_database_pages(notion, landuseDatabaseId)
-livability_attributes  = fetch_all_database_pages(notion, subdomainAttributesDatabaseId)
-landuseMapperDict = fetchDomainMapper (landuse_attributes)
-attributeMapperDict = fetchSubdomainMapper (livability_attributes)
+from imports_utils import notionToken
+
+if notionToken is None:
+    raise Exception("Notion token not found. Please check the environment variables.")
+else:
+    print("Notion token found successfully!")
+    landuse_attributes  = fetch_all_database_pages(notion, landuseDatabaseId)
+    livability_attributes  = fetch_all_database_pages(notion, subdomainAttributesDatabaseId)
+    landuseMapperDict = fetchDomainMapper (landuse_attributes)
+    attributeMapperDict = fetchSubdomainMapper (livability_attributes)
 
 
 
@@ -58,41 +57,46 @@ from imports_utils import fetchDistanceMatrices
 from config import distanceMatrixActivityNodes
 from config import distanceMatrixTransportStops
 
-CLIENT = SpeckleClient(host="https://speckle.xyz/")
-account = get_default_account()
-CLIENT.authenticate_with_token(token=speckleToken)
-
-streamDistanceMatrices = speckle_utils.getSpeckleStream(streamId,dmBranchName,CLIENT, dmCommitId)
-matrices = fetchDistanceMatrices (streamDistanceMatrices)
-
-streamLanduses = speckle_utils.getSpeckleStream(streamId,luBranchName,CLIENT, luCommitId)
-streamData = streamLanduses["@Data"]["@{0}"]
-df_speckle_lu = speckle_utils.get_dataframe(streamData, return_original_df=False)
-df_lu = df_speckle_lu.copy()
-df_lu = df_lu.astype(str)
-# set index column
-df_lu =  df_lu.set_index("ids", drop=False)
-
-df_dm = matrices[distanceMatrixActivityNodes]
-df_dm_transport = matrices[distanceMatrixTransportStops]
-dm_dictionary = df_dm.to_dict('index')
-df_dm_transport_dictionary = df_dm_transport.to_dict('index')
-
-
-# filter activity nodes attributes
-mask_connected = df_dm.index.tolist()
-lu_columns = []
-for name in df_lu.columns:
-  if name.startswith("lu+"):
-    lu_columns.append(name)
-
-df_lu_filtered = df_lu[lu_columns].loc[mask_connected]
-df_lu_filtered.columns = [col.replace('lu+', '') for col in df_lu_filtered.columns]
-df_lu_filtered.columns = [col.replace('ASSETS+', '') for col in df_lu_filtered.columns]
-df_lu_filtered = df_lu_filtered.astype(int)
-df_lu_filtered = df_lu_filtered.T.groupby(level=0).sum().T
-
-df_lu_filtered_dict = df_lu_filtered.to_dict('index')
+
+if speckleToken is None:
+    raise Exception("Speckle token not found")
+else:
+    print("Speckle token found successfully!")
+    
+    CLIENT = SpeckleClient(host="https://speckle.xyz/")
+    account = get_default_account()
+    CLIENT.authenticate_with_token(token=speckleToken)
+    
+    streamDistanceMatrices = speckle_utils.getSpeckleStream(streamId,dmBranchName,CLIENT, dmCommitId)
+    matrices = fetchDistanceMatrices (streamDistanceMatrices)
+    streamLanduses = speckle_utils.getSpeckleStream(streamId,luBranchName,CLIENT, luCommitId)
+    streamData = streamLanduses["@Data"]["@{0}"]
+    
+    df_speckle_lu = speckle_utils.get_dataframe(streamData, return_original_df=False)
+    df_lu = df_speckle_lu.copy()
+    df_lu = df_lu.astype(str)
+    df_lu =  df_lu.set_index("ids", drop=False)
+    
+    df_dm = matrices[distanceMatrixActivityNodes]
+    df_dm_transport = matrices[distanceMatrixTransportStops]
+    dm_dictionary = df_dm.to_dict('index')
+    df_dm_transport_dictionary = df_dm_transport.to_dict('index')
+    
+    # filter activity nodes attributes
+    mask_connected = df_dm.index.tolist()
+    lu_columns = []
+    for name in df_lu.columns:
+      if name.startswith("lu+"):
+        lu_columns.append(name)
+    
+    df_lu_filtered = df_lu[lu_columns].loc[mask_connected]
+    df_lu_filtered.columns = [col.replace('lu+', '') for col in df_lu_filtered.columns]
+    df_lu_filtered.columns = [col.replace('ASSETS+', '') for col in df_lu_filtered.columns]
+    df_lu_filtered = df_lu_filtered.astype(int)
+    df_lu_filtered = df_lu_filtered.T.groupby(level=0).sum().T
+    
+    df_lu_filtered_dict = df_lu_filtered.to_dict('index')
+