Update app.py

app.py

@@ -31,10 +31,6 @@ config_file_path = os.path.join(current_directory, "config.json")
 with open(config_file_path, 'r') as f:
         config = json.load(f)
 
-
-
-
-
 # notion login
 speckle_token = os.environ.get("SPECKLE_TOKEN")
 notion_token = os.environ.get("NOTION_TOKEN")
@@ -47,10 +43,7 @@ CLIENT = SpeckleClient(host="https://speckle.xyz/")
 CLIENT.authenticate_with_token(token=speckle_token)
 
 # load config to variables 
-
-
-
-def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, MAINDATA_KEY):
+def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES, DATASET_NAME):
 
     if type(TARGET_BRANCH) == type([]):
         TARGET_BRANCH = SOURCE_BRANCH.replace(TARGET_BRANCH[0], TARGET_BRANCH[1])
@@ -123,15 +116,18 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
                 log["avg_attrRemoved"] +=1
                 log["removedAttr"].append(k)
         
-
+        for obj in datanew.copy():
+            datanew["dataset":DATASET_NAME]
+            
+            
         streamData_new.append(datanew)
 
     log["avg_attrRemoved"] = log["avg_attrRemoved"]/len(stream_data)
     log["removedAttr"] = list(set(log["removedAttr"]))
 
     stream_new = copy.deepcopy(stream)
-
-    stream_new["@Data"][MAINDATA_KEY] = streamData_new
+    stream_new["@Data"]["@{0}"] = streamData_new
+    
     #add additional data to stream
     stream_new["logs"] = json.dumps(log)
     stream_new["attributeMetaData"] = json.dumps(attributeMetaData)
@@ -141,6 +137,7 @@ def mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, K
     # set stream and branch
     # Get transport
     transport = ServerTransport(client=CLIENT, stream_id=STREAM_ID)
+    
     # Send the data object to the speckle stream
     object_id = operations.send(stream_new, [transport])
     time.sleep(2)
@@ -165,9 +162,9 @@ async def update_streams(request: Request):
 
     print("============= payload =============")
     print(payload)
-    print("============= payload =============")
+    print("============= config ==============")
     print(config)
-    print("============= config =============")
+
 
     payload = payload["payload"]
     # Check if the payload structure matches the expected format
@@ -198,7 +195,6 @@ async def update_streams(request: Request):
     # If the flag is True, continue running the main part of the code
     if should_continue:
         config_entry = config[streamName][branchName]
-
         STREAM_NAME = config_entry["STREAM_NAME"]
         STREAM_ID = config_entry["STREAM_ID"]
         SOURCE_BRANCH = config_entry["SOURCE_BRANCH"]
@@ -207,6 +203,7 @@ async def update_streams(request: Request):
         ATTR_METADATA = config_entry["ATTR_METADATA"]
         KPI_METADATA = config_entry["KPI_METADATA"]
         DEFAULT_ATTRIBUTES = config_entry["DEFAULT_ATTRIBUTES"]
-        MAINDATA_KEY = config_entry.get("MAINDATA_KEY", "@{0}")
+        DATASET_NAME = config_entry.get("DATASET_NAME")
+        
         # main
-        mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES,MAINDATA_KEY)
+        mainFunc(STREAM_ID, SOURCE_BRANCH, TARGET_BRANCH, UUID_COL, ATTR_METADATA, KPI_METADATA, DEFAULT_ATTRIBUTES,DATASET_NAME)