Update app.py

app.py

@@ -65,7 +65,7 @@ def filter_activityNodeAnalysis(objDict):
 
 
 # load config to variables 
-def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME):
+def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME, UPDATE_SRC):
     print("SOURCE_BRANCH",SOURCE_BRANCH)
     print("TARGET_BRANCH",TARGET_BRANCH)
     if type(TARGET_BRANCH) == type([]):
@@ -97,7 +97,7 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
     # get speckle data 
     # get stream
     print("getting source branch, from branch: ",SOURCE_BRANCH)
-    stream = getSpeckleStream(STREAM_ID,
+    stream, inputCommitID = getSpeckleStream(STREAM_ID,
                             SOURCE_BRANCH,
                             CLIENT,
                             commit_id = "")
@@ -128,22 +128,6 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
             # to filter conditions defined yet
             pass
             
-        """
-        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:
-                pass_flag == False
-        else:
-            pass_flag == False
-
-        """
     
         if pass_flag == False :
             log["removedDatapoints"] +=1
@@ -198,7 +182,7 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
     commit_id = CLIENT.commit.create(
         STREAM_ID,
         object_id= object_id,
-        message="auto commit, removed datapoints: " + str( log["removedDatapoints"]) + "; avg. removed attributes: "+ str(int(log["avg_attrRemoved"])),
+        message="auto commit from HF; Triggerd by:" + UPDATE_SRC + ", removed datapoints: " + str( log["removedDatapoints"]) + "; avg. removed attributes: "+ str(int(log["avg_attrRemoved"]) + "#+SourceCommit: " + inputCommitID ),
         branch_name=TARGET_BRANCH,
     )
 
@@ -223,39 +207,49 @@ async def update_streams(request: Request):
 
     payload = payload["payload"]
 
+    if payload.get('source') == 'notionTrigger':
+        action = payload.get('action')
+        streamName = payload.get('streamName')
+        branchName = payload.get('branchName')
+        update_source = "notionTrigger"
+
+
     
+
     
     
-    # 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")
-       
     else:
-        branchName = payload.get("event", {}).get("data", {}).get("commit", {}).get("branchName")
-    
-    
-    # List of valid event types
-    valid_event_types = ["commit_create", "commit_delete", "commit_update"]
-    
-    if event_name in valid_event_types:
-        if streamName in config:
-            if branchName in config[streamName]:
-                stream_config = config[streamName][branchName]
-                should_continue = True
+        # Check if the payload structure matches the expected format
+        # Assuming payload["event"]["event_name"] gives you the event type
+        update_source = "SpeckleWebhook"
+        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")
+           
+        else:
+            branchName = payload.get("event", {}).get("data", {}).get("commit", {}).get("branchName")
+        
+        
+        # List of valid event types
+        valid_event_types = ["commit_create", "commit_delete", "commit_update"]
+        
+        if event_name in valid_event_types:
+            if streamName in config:
+                if branchName in config[streamName]:
+                    stream_config = config[streamName][branchName]
+                    should_continue = True
+                else:
+                    print(f"Branch name {branchName} not found in config for stream {streamName}.")
             else:
-                print(f"Branch name {branchName} not found in config for stream {streamName}.")
+                print(f"Stream name {streamName} not found in config.")
         else:
-            print(f"Stream name {streamName} not found in config.")
-    else:
-        print(f"Event type {event_name} is not one of the specified types.")
+            print(f"Event type {event_name} is not one of the specified types.")
 
     print("payload branchname", branchName)
-
+    
     # If the flag is True, continue running the main part of the code
     if should_continue:
         config_entry = config[streamName][branchName]
@@ -270,5 +264,5 @@ async def update_streams(request: Request):
         DATASET_NAME = config_entry.get("DATASET_NAME")
         
         # main
-        mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME)
+        mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME, update_source)