leave as is

Author: daquinteroflex

tidy3d/plugins/smatrix/run.py

@@ -19,6 +19,7 @@ def create_batch(
     modeler: ComponentModelerType,
     path_dir: str = DEFAULT_DATA_DIR,
     parent_batch_id: str = None,
+    group_id: str = None,
     file_name: str = "batch.hdf5",
     **kwargs,
 ) -> Batch:
@@ -42,7 +43,14 @@ def create_batch(
     else:
         parent_task_dict = None
 
-    batch = Batch(simulations=modeler.sim_dict, parent_tasks=parent_task_dict, **kwargs)
+    if group_id is not None:
+        group_id_dict = dict()
+        for key in modeler.sim_dict.keys():
+            group_id_dict[key] = tuple(group_id,)
+    else:
+        group_id_dict = None
+
+    batch = Batch(simulations=modeler.sim_dict, parent_tasks=parent_task_dict, group_ids=group_id_dict, **kwargs)
     batch.to_file(filepath)
     return batch
 

tidy3d/plugins/smatrix/web/api/container.py

@@ -200,6 +200,10 @@ class Job(WebContainer):
         description="Specify the payment method.",
     )
 
+    group_id: Optional[TaskId] = pd.Field(
+        None, title="Parent Tasks", description="Tuple of parent task ids, used internally only."
+    )
+
     _upload_fields = (
         "simulation",
         "task_name",
@@ -580,6 +584,12 @@ class Batch(WebContainer):
         "fields that were not used to create the task will cause errors.",
     )
 
+    group_ids: dict[str, tuple[TaskId, ...]] = pd.Field(
+        None,
+        title="Parent Tasks",
+        description="Collection of parent task ids for each job in batch, used internally only.",
+    )
+
     _job_type = Job
 
     def run(self, path_dir: str = DEFAULT_DATA_DIR) -> BatchData:

tidy3d/plugins/smatrix/web/api/webapi.py

@@ -529,20 +529,6 @@ def upload_modeler(
 
         # log the url for the task in the web UI
         log.debug(f"{Env.current.website_endpoint}/folders/{task.folder_id}/tasks/{task.group_id}")
-        return task.batch_id
-    else:
-        task.upload_simulation(
-            stub=stub,
-            verbose=verbose,
-            progress_callback=progress_callback,
-            remote_sim_file=remote_sim_file,
-        )
-        estimate_cost(task_id=task.task_id, solver_version=solver_version, verbose=verbose)
-
-        task.validate_post_upload(parent_tasks=parent_tasks)
-
-        # log the url for the task in the web UI
-        log.debug(f"{Env.current.website_endpoint}/folders/{task.folder_id}/tasks/{task.task_id}")
         return task
 
 def get_reduced_simulation(simulation, reduce_simulation):