Update app.py

app.py

@@ -8,17 +8,11 @@ import os
 
 # ---------------------- Accessing data from Notion ---------------------- #
 
-
 from notion_client import Client as client_notion
 from imports_utils import fetch_all_database_pages
 from imports_utils import get_property_value
-#from imports_utils import notion
 from imports_utils import getDataFromNotion
-#from imports_utils import fetchDomainMapper
-#from imports_utils import fetchSubdomainMapper
-
 from imports_utils import notionToken
-
 from config import useNotionData 
 from config import landuseDatabaseId , subdomainAttributesDatabaseId 
 from config import landuseColumnName 
@@ -57,13 +51,11 @@ 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,  dmBranchName, dmCommitId, luBranchName, luCommitId, distanceMatrixActivityNodes
 from imports_utils import speckleToken
-#from imports_utils import fetchDistanceMatrices
 from config import useSpeckleData
 from imports_utils import getDataFromSpeckle
 
@@ -94,8 +86,7 @@ else:
         df_lu = df_lu.apply(pd.to_numeric, errors='coerce')
         df_lu = df_lu.astype(int)
         df_lu = df_lu.T.groupby(level=0).sum().T
-    
-    
+        
 
 
 def test(input_json):
@@ -112,14 +103,18 @@ def test(input_json):
     from imports_utils import getDataFromGrasshopper
     from config import alpha as alphaDefault
     from config import threshold as thresholdDefault
+
+    from imports_utils import findUniqueDomains
+    from imports_utils import findUniqueSubdomains    
+    from imports_utils import landusesToSubdomains
+    from imports_utils import FindWorkplacesNumber
+    from imports_utils import computeAccessibility
+    from imports_utils import computeAccessibility_pointOfInterest    
+    from imports_utils import remap  
+    from imports_utils import accessibilityToLivability
     
     useGrasshopperData = inputs['input']["useGrasshopperData"]    # fetch grasshoper data or not
-    
-    
-    if useGrasshopperData == "True": # grasshopper input
-        
-   # fetch grasshoper data or not
-
+    if useGrasshopperData == "True": 
         dfMatrix_gh, dfLanduses_gh, attributeMapperDict_gh, landuseMapperDict_gh, alpha, threshold = getDataFromGrasshopper(
         inputJson = inputs,
         inputNameMatrix = "matrix",
@@ -136,27 +131,7 @@ def test(input_json):
         if useNotionData != True:
             attributeMapperDict = attributeMapperDict_gh
             landuseMapperDict = landuseMapperDict_gh
-
-            
-        """
-        matrix = inputs['input']["matrix"]
-        landuses = inputs['input']["landuse_areas"] 
-        
-        dfLanduses = pd.DataFrame(landuses).T
-        dfLanduses = dfLanduses.apply(pd.to_numeric, errors='coerce')
-        dfLanduses = dfLanduses.replace([np.inf, -np.inf], 0).fillna(0)  # cleaning function?
-        dfLanduses = dfLanduses.round(0).astype(int)
-
-        dfMatrix = pd.DataFrame(matrix).T
-        dfMatrix = dfMatrix.apply(pd.to_numeric, errors='coerce')
-        dfMatrix = dfMatrix.replace([np.inf, -np.inf], 10000).fillna(0)
-        dfMatrix = dfMatrix.round(0).astype(int)
-
-        attributeMapperDict_gh = inputs['input']["attributeMapperDict"]
-        landuseMapperDict_gh = inputs['input']["landuseMapperDict"]        # if fetch notion data or not, def
-
-        """
-        
+                    
     else:
 
         dfMatrix_gh, dfLanduses_gh, attributeMapperDict_gh, landuseMapperDict_gh, alpha, threshold = getDataFromGrasshopper(
@@ -169,53 +144,24 @@ def test(input_json):
         inputNameThreshold = "threshold"    
         )
              
-        dfLanduses = df_lu.copy()     # fetch speckl data or not
+        dfLanduses = df_lu.copy()     
         dfMatrix = df_dm.copy()
-        
-  
+         
     
     landuseMapperDict = lu_mapperDict 
     livabilityMapperDict = subdomain_mapperDict
     
-    """
-    valid_indexes = [idx for idx in mask_connected if idx in dfLanduses.index]
-    # Identify and report missing indexes
-    missing_indexes = set(mask_connected) - set(valid_indexes)
-    if missing_indexes:
-        print(f"Error: The following indexes were not found in the DataFrame: {missing_indexes}, length: {len(missing_indexes)}")
-    
-    # Apply the filtered mask
-    dfLanduses_filtered = dfLanduses.loc[valid_indexes]
-    """
-
-    from imports_utils import findUniqueDomains
-    from imports_utils import findUniqueSubdomains
-    
-    from imports_utils import landusesToSubdomains
-    from imports_utils import FindWorkplacesNumber
-    from imports_utils import computeAccessibility
-    from imports_utils import computeAccessibility_pointOfInterest    
-    from imports_utils import remap  
-    from imports_utils import accessibilityToLivability
-
-    
     domainsUnique = findUniqueDomains(livabilityMapperDict)
     subdomainsUnique = findUniqueSubdomains(landuseMapperDict)
        
     LivabilitySubdomainsWeights = landusesToSubdomains(dfMatrix,dfLanduses,landuseMapperDict,subdomainsUnique)
-    
     WorkplacesNumber = FindWorkplacesNumber(dfMatrix,livabilityMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
     
     # prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
     LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
-   
     subdomainsAccessibility = computeAccessibility(dfMatrix,LivabilitySubdomainsInputs,alpha,threshold)   
-    #artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
-    #gmtAccessibility = computeAccessibility_pointOfInterest(df_gmt_matrix,'GMT+HSR',alpha,threshold)
-    
-    #AccessibilityInputs = pd.concat([subdomainsAccessibility, artAccessibility,gmtAccessibility], axis=1)
-        
     livability = accessibilityToLivability(dfMatrix,subdomainsAccessibility,livabilityMapperDict,domainsUnique)
+
     
     livability_dictionary = livability.to_dict('index')
     LivabilitySubdomainsInputs_dictionary = LivabilitySubdomainsInputs.to_dict('index')