row filter conditions can be seperated for soruce branches

app.py

@@ -43,6 +43,25 @@ notion = Client(auth=notion_token)
 CLIENT = SpeckleClient(host="https://speckle.xyz/")
 CLIENT.authenticate_with_token(token=speckle_token)
 
+
+def filter_activityNodeAnalysis(objDict):
+    flag = True    
+    tot_sqm =0
+        for k, v in objDict.items():
+            if k.startswith("lu+"):
+                tot_sqm += float(v)
+        if tot_sqm <= 0:
+            pass_flag = False 
+
+        # COND B: remove non connected 
+        if "isConnected" in objDict.keys():
+            if objDict["isConnected"] == False:
+                flag == False
+        else:
+            flag == False
+    return flag
+
+
 # load config to variables 
 def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME):
     print("SOURCE_BRANCH",SOURCE_BRANCH)
@@ -89,7 +108,6 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
     
 
     # ======== assamble new stream data ============
-
     streamData_new = []
     log = {"removedDatapoints":0,"removedID":[], "avg_attrRemoved":0, "removedAttr":[]}
     for i, obj in enumerate(stream_data):
@@ -98,6 +116,13 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
         # COND A: no landuses at all.
         pass_flag = True
 
+        if "activity_node_analysis" in SOURCE_BRANCH:
+            pass_flag = filter_activityNodeAnalysis(objDict)
+        elif "isovist_analysis" in SOURCE_BRANCH:
+            # to filter conditions defined yet
+            pass
+            
+        """
         tot_sqm =0
         for k, v in objDict.items():
             if k.startswith("lu+"):
@@ -111,8 +136,9 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
                 pass_flag == False
         else:
             pass_flag == False
-             
 
+        """
+    
         if pass_flag == False :
             log["removedDatapoints"] +=1
             log["removedID"].append(objDict[UUID_COL])
@@ -128,8 +154,6 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
                 log["removedAttr"].append(k)
         
         datanew["dataset"] = DATASET_NAME
-            
-            
         streamData_new.append(datanew)
 
     log["avg_attrRemoved"] = log["avg_attrRemoved"]/len(stream_data)
@@ -168,8 +192,8 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
 @webhook_endpoint
 async def update_streams(request: Request):
     # Initialize flag
+    
     should_continue = False
-
     finalBranchName = None
 
     # Read the request body as JSON
@@ -181,12 +205,13 @@ async def update_streams(request: Request):
     print(config)
     print("============= rest ==============")
 
-    
     payload = payload["payload"]
+    
     # Check if the payload structure matches the expected format
     # Assuming payload["event"]["event_name"] gives you the event type
     event_name = payload["event"]["event_name"]
     streamName = payload.get("stream", {}).get("name")
+    
     # Extract branchName for commit_update events from the "old" commit data
     if event_name == "commit_update":
         branchName = payload.get("event", {}).get("data", {}).get("old", {}).get("branchName")
@@ -201,10 +226,7 @@ async def update_streams(request: Request):
     if event_name in valid_event_types:
         if streamName in config:
             if branchName in config[streamName]:
-                print("found branchName", branchName)
-                finalBranchName = copy.deepcopy(branchName)
                 stream_config = config[streamName][branchName]
-                print(".----> first config subset", stream_config )
                 should_continue = True
             else:
                 print(f"Branch name {branchName} not found in config for stream {streamName}.")
@@ -216,7 +238,7 @@ async def update_streams(request: Request):
     # If the flag is True, continue running the main part of the code
     if should_continue:
         print("is continuing with branch name: ", branchName, "fin branchname", finalBranchName)
-        config_entry = config[streamName][finalBranchName]
+        config_entry = config[streamName][branchName]
         print("--> selected config subset", config_entry)
         STREAM_NAME = config_entry["STREAM_NAME"]
         STREAM_ID = config_entry["STREAM_ID"]