major simpllification of "send_matrix_and_create_commit"

tripGenerationFunc.py

@@ -834,82 +834,31 @@ def computeTrips(
 #==================================================================================================
 # speckle send 
 
-def send_row_bundle(rows, indices, transport):
-    bundle_object = Base()
-    bundle_object.rows = rows
-    bundle_object.indices = indices
-    bundle_id = operations.send(base=bundle_object, transports=[transport])
-    return bundle_id
-
-def send_matrix(matrix_df, transport, rows_per_chunk):
-    matrix_object = Base(metaData="Some metadata")
-    batch_index = 0  # Maintain a separate counter for batch indexing
-
-    # Bundle rows together
-    rows = []
-    indices = []
-    for index, row in matrix_df.iterrows():
-        rows.append([round(r,4) for r in row.tolist()])
-        indices.append(str(index))
-        if len(rows) == rows_per_chunk:
-            bundle_id = send_row_bundle(rows, indices, transport)
-            # Set the reference to the bundle in the matrix object using setattr
-            setattr(matrix_object, f"@batch_{batch_index}", {"referencedId": bundle_id})
-            rows, indices = [], []  # Reset for the next bundle
-            batch_index += 1  # Increment the batch index
-            print( str(rows_per_chunk) +" rows has been sent")
-
-    # Don't forget to send the last bundle if it's not empty
-    if rows:
-        bundle_id = send_row_bundle(rows, indices, transport)
-        setattr(matrix_object, f"@batch_{batch_index}", {"referencedId": bundle_id})
-
-    # Send the matrix object to Speckle
-    matrix_object_id = operations.send(base=matrix_object, transports=[transport])
-    return matrix_object_id
-
-
-
-
-
-# Main function to send all matrices and create a commit
 def send_matrices_and_create_commit(matrices, client, stream_id, branch_name, commit_message, rows_per_chunk, containerMetadata):
     transport = ServerTransport(client=client, stream_id=stream_id)
     matrix_ids = {}
-
-    # Send each matrix row by row and store its object ID
-    for k, df in matrices.items():
-        matrix_ids[k] = send_matrix(df, transport, rows_per_chunk)
-        print("object: " + k + " has been sent")
-
-    # Create a container object that will hold references to all the matrix objects
+ 
     container_object = Base()
-
+    # add to container object
     for k, v in containerMetadata.items():
       container_object[k] = v
-
-    # Assuming you have a way to reference matrix objects by their IDs in Speckle
-    for k, obj_id in matrix_ids.items():
-      print("obj_id", obj_id)
-      container_object[k] = obj_id
-
-    
-    # Dynamically add references to the container object
-    for matrix_name, matrix_id in matrix_ids.items():
-        # This assigns a reference to the matrix object by its ID
-        # You might need to adjust this based on how your Speckle server expects to receive references
-        setattr(container_object, matrix_name, {"referencedId": matrix_id})
-        
-
-
-    # Send the container object
-    container_id = operations.send(base=container_object, transports=[transport])
-
-
-    # Now use the container_id when creating the commit
-    commit_id = client.commit.create(
-        stream_id=stream_id,
-        object_id=container_id,  # Use the container's ID here
-        branch_name=branch_name,
-        message=commit_message,
-      )
+ 
+    #initialize the keys()
+    for k, df in matrices.items():
+      container_object[k] = Base()
+ 
+    for k, df in matrices.items():
+      matrix_object = Base(metaData="Some metadata")
+      # Prepare rows and indices as a single list for each, to be automatically chunked
+      rows = [[round(r,4) for r in row.tolist()] for _, row in df.iterrows()]
+      indices = [str(index) for index in df.index]
+     
+      container_object[k][f"@({rows_per_chunk})"] = rows
+      container_object[k]["indices"] = indices
+ 
+    container_objectid = operations.send(base=container_object, transports=[transport])
+ 
+    #container_id = operations.send(base=container_object, transports=[transport])
+    commit_id = client.commit.create(stream_id=stream_id, object_id=container_objectid, branch_name=branch_name, message=commit_message)
+ 
+    return commit_id