Update app.py

app.py

@@ -52,27 +52,41 @@ async def mergeStreams(request: Request):
     print("============= config =============")
     print(config)
     payload = payload["payload"]
-    event_name = payload["event"]["event_name"]
-    streamid = payload.get("stream", {}).get("id")
-    # 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"]
+
+    # webhook calls can come from different sources 
+    if payload.get('source') == 'notionTrigger':
+        action = payload.get('action')
+        streamName = payload.get('streamName')
+        branchName = payload.get('branchName')
+        update_source = "notionTrigger"
+
+        should_continue = True
+
+
+    else:
+        update_source = "speckleWebhook"
+        event_name = payload["event"]["event_name"]
+        streamid = payload.get("stream", {}).get("id")
+        # 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")
     
-    if event_name in valid_event_types:
-        if streamid == STREAM_ID:
-            if branchName == branchA:
-                should_continue = True
+        # List of valid event types
+        valid_event_types = ["commit_create", "commit_delete", "commit_update"]
+        
+        if event_name in valid_event_types:
+            if streamid == STREAM_ID:
+                if branchName == branchA:
+                    should_continue = True
+                else:
+                    print(f"Branch name {branchName} not found in config.")
             else:
-                print(f"Branch name {branchName} not found in config.")
+                print(f"Stream name {streamid} not found in config.")
         else:
-            print(f"Stream name {streamid} 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.")
 
     # If the flag is True, continue running the main part of the code
     if should_continue:
@@ -143,4 +157,5 @@ async def mergeStreams(request: Request):
                   geometryGroupPath=["@Data", "@{0}"],
                   match_by_id="id",
                   #openai_key =None,
-                  return_original = False)
+                  return_original = False,
+                  comm_message="auto commit from HF; Triggered by:" + update_source)