Update app.py

app.py

@@ -16,9 +16,9 @@ from notion_client import Client as client_notion
 
 notionToken = os.getenv('notionToken')
 if notionToken is None:
-    raise Exception("Secret token not found. Please check the environment variables.")
+    raise Exception("Notion token not found. Please check the environment variables.")
 else:
-    print("Secret token found successfully!")
+    print("Notion token found successfully!")
 
 from config import landuseDatabaseId , subdomainAttributesDatabaseId 
 from imports_utils import fetch_all_database_pages
@@ -28,6 +28,7 @@ from imports_utils import notion
 landuse_attributes  = fetch_all_database_pages(notion, landuseDatabaseId)
 livability_attributes  = fetch_all_database_pages(notion, subdomainAttributesDatabaseId)
 
+
 # fetch the dictionary with landuse - domain pairs 
 landuseMapperDict ={}
 subdomains_unique = []
@@ -40,7 +41,6 @@ for page in landuse_attributes:
     if value_subdomain != "":
         subdomains_unique.append(value_subdomain)
 
-#subdomains_unique = list(set(subdomains_unique))
 
 
 # fetch the dictionary with subdomain attribute data
@@ -55,7 +55,7 @@ for page in livability_attributes:
     domain = get_property_value(page, "DOMAIN")
     if  thresholds:   
         attributeMapperDict[subdomain] = {
-        'sqmPerEmpl': [sqm_per_employee if sqm_per_employee != "" else 0],
+        'sqmPerEmpl': sqm_per_employee if sqm_per_employee != "" else 0,
         'thresholds': thresholds,
         'max_points': max_points,
         'domain': [domain if domain != "" else 0]
@@ -63,29 +63,12 @@ for page in livability_attributes:
     if domain != "":
         domains_unique.append(domain)
 
-#domains_unique = list(set(domains_unique))
 
 
 
 # ---------------------- Accessing data from Speckle ---------------------- #
 
 
-"""
-from specklepy.api.client import Client as SpeckleClient
-from specklepy.api.credentials import get_default_account
-
-# Example usage
-
-client = Client(host="your_speckle_server_host")
-account = get_default_account()
-client.authenticate(token=account.token)
-
-
-CLIENT = SpeckleClient(host="https://speckle.xyz/")
-CLIENT.authenticate_with_token(token=userdata.get('speckleToken'))
-"""
-
-#import other libaries
 from specklepy.api.client import SpeckleClient
 from specklepy.api.credentials import get_default_account, get_local_accounts
 from specklepy.transports.server import ServerTransport
@@ -93,53 +76,27 @@ from specklepy.api import operations
 from specklepy.objects.geometry import Polyline, Point
 from specklepy.objects import Base
 
-
-
-
 import imports_utils
-
 import speckle_utils
 import data_utils
 
 from config import landuseDatabaseId , streamId,  branch_name_dm, commit_id_dm
-#from imports_utils import streamMatrices
 from imports_utils import speckleToken
 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,branch_name_dm,CLIENT, commit_id_dm)
 matrices = fetchDistanceMatrices (streamDistanceMatrices)
 df_dm = matrices[distanceMatrixActivityNodes]
 df_dm_transport = matrices[distanceMatrixTransportStops]
 
-
 dm_dictionary = df_dm.to_dict('index')
-
-"""
-import logging
-
-# Set up basic configuration for logging
-logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
-
-# Log detailed debug information at critical steps or just before a line where you suspect the error might occur
-logging.debug('About to start a potentially problematic operation...')
-try:
-    # Potentially problematic code
-
-
-except Exception as e:
-    logging.error(f"An error occurred: {e}")
-    raise
-"""
+df_dm_transport_dictionary = df_dm_transport.to_dict('index')
 
 
 
@@ -158,6 +115,7 @@ def test(input_json):
     matrix = inputs['input']["matrix"]
     landuses = inputs['input']["landuse_areas"]
     transport_matrix = inputs['input']["transportMatrix"]  
+    
     #attributeMapperDict = inputs['input']["attributeMapperDict"]
     #landuseMapperDict = inputs['input']["landuseMapperDict"]
     
@@ -178,12 +136,10 @@ def test(input_json):
     tranportModes = ["DRT", "GMT", "HSR"]
     
     def split_dict_by_subkey(original_dict, substrings):
-        # Initialize dictionaries for each substring
         result_dicts = {substring: {} for substring in substrings}
         
         for key, nested_dict in original_dict.items():
             for subkey, value in nested_dict.items():
-                # Check each substring if it's in the subkey
                 for substring in substrings:
                     if substring in subkey:
                         if key not in result_dicts[substring]:
@@ -198,10 +154,8 @@ def test(input_json):
     art_dict = result_dicts["DRT"]
     gmt_dict = result_dicts["GMT"]
 
-
     df_art_matrix = pd.DataFrame(art_dict).T
     df_art_matrix = df_art_matrix.round(0).astype(int)  
-
     df_gmt_matrix = pd.DataFrame(gmt_dict).T
     df_gmt_matrix = df_art_matrix.round(0).astype(int)     
     
@@ -277,7 +231,7 @@ def test(input_json):
     
         for subdomain in UniqueSubdomainsList:
           for key, value_list in SubdomainAttributeDict.items():
-            sqm_per_empl = float(SubdomainAttributeDict[subdomain]['sqmPerEmpl'][0])
+            sqm_per_empl = float(SubdomainAttributeDict[subdomain]['sqmPerEmpl')]#[0])
             if key in destinationWeights.columns and key == subdomain:
               if sqm_per_empl > 0:
                 df_LivabilitySubdomainsWorkplaces['jobs'] += (round(destinationWeights[key] / sqm_per_empl,2)).fillna(0)
@@ -393,7 +347,8 @@ def test(input_json):
         "subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
         "luDomainMapper": landuseMapperDict,
         "attributeMapper": attributeMapperDict,
-        "fetchDm": dm_dictionary
+        "fetchDm": df_dm_dictionary,
+        "transportDm":df_dm_transport_dictionary
     }