Ready to test tomorrow

Author: daquinteroflex

tidy3d/plugins/smatrix/run.py

@@ -246,5 +246,5 @@ def run(
     """
     batch = create_batch(modeler=modeler, path_dir=path_dir)
     batch_data = batch.run()
-    modeler_data = compose_modeler_data(modeler=modeler, batch_data=batch_data)
+    modeler_data = compose_modeler_data_from_batch_data(modeler=modeler, batch_data=batch_data)
     return modeler_data

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

@@ -192,53 +192,53 @@ def run(
             solver_version=solver_version,
             reduce_simulation=reduce_simulation,
         )
-        print(batch_task.batch_task_name_map)
-        print(batch_task.batch_task_name_map.values())
-        for port, task_id_i in batch_task.batch_task_name_map.items():
-            simulation_i = modeler.sim_dict[port]
-            task_id_i_r = upload(
-                simulation=simulation_i,
-                task_id=task_id_i,
-                task_name=port,
-                folder_name=folder_name,
-                callback_url=callback_url,
-                verbose=verbose,
-                progress_callback=progress_callback_upload,
-                simulation_type=simulation_type,
-                parent_tasks=parent_tasks,
-                solver_version=solver_version,
-                reduce_simulation=reduce_simulation,
-            )
-            print(task_id_i)
-            print(task_id_i_r)
-            start(
-                task_id_i,
-                solver_version=solver_version,
-                worker_group=worker_group,
-                pay_type=pay_type,
-                priority=priority,
-            )
-        from ..core.http_util import http
-
+        # print(batch_task.batch_task_name_map)
+        # print(batch_task.batch_task_name_map.values())
+        # for port, task_id_i in batch_task.batch_task_name_map.items():
+        #     simulation_i = modeler.sim_dict[port]
+        #     task_id_i_r = upload(
+        #         simulation=simulation_i,
+        #         task_id=task_id_i,
+        #         task_name=port,
+        #         folder_name=folder_name,
+        #         callback_url=callback_url,
+        #         verbose=verbose,
+        #         progress_callback=progress_callback_upload,
+        #         simulation_type=simulation_type,
+        #         parent_tasks=parent_tasks,
+        #         solver_version=solver_version,
+        #         reduce_simulation=reduce_simulation,
+        #     )
+        #     print(task_id_i)
+        #     print(task_id_i_r)
+        #     start(
+        #         task_id_i,
+        #         solver_version=solver_version,
+        #         worker_group=worker_group,
+        #         pay_type=pay_type,
+        #         priority=priority,
+        #     )
+        # from ..core.http_util import http
         # print("batch_task.batch_id")
         # print(batch_task.batch_id)
-        # resp = http.post(
-        #     f"tidy3d/projects/{batch_task.batch_id}/batch-check",
-        #     {
-        #         "batchType": "RF_SWEEP",
-        #         "solverVersion": "dario-rf-0.0.0",
-        #         "protocolVersion": "2.10.0rc2"
-        #     },
-        # )
-        # print(resp)
-        # resp = http.post(
-        #     f"tidy3d/projects/{batch_task.batch_id}/batch-submit",
-        #     {
-        #         "batchType": "RF_SWEEP",
-        #         "solverVersion": "dario-rf-0.0.0",
-        #         "protocolVersion": "2.10.0rc2"
-        #     },
-        # )
+        resp = http.post(
+            f"tidy3d/projects/{batch_task.batch_id}/batch-check",
+            {
+                "batchType": "RF_SWEEP",
+                "solverVersion": "dario-rf-0.0.0",
+                "protocolVersion": "2.10.0rc2"
+            },
+        )
+        print(resp)
+        resp = http.post(
+            f"tidy3d/projects/{batch_task.batch_id}/batch-submit",
+            {
+                "batchType": "RF_SWEEP",
+                "solverVersion": "dario-rf-0.0.0",
+                "protocolVersion": "2.10.0rc2"
+            },
+        )
+        print(resp)
         resp = http.get(
             f"tidy3d/tasks/{batch_task.batch_id}/batch-detail?batchType=RF_SWEEP",
             {
@@ -249,13 +249,13 @@ def run(
         )
         print(resp)
         from ..core.http_util import http
-
         resp = http.post(
             f"tidy3d/projects/{batch_task.batch_id}/postprocess",
             {
                 "batchType": "RF_SWEEP",
                 "solverVersion": "dario-rf-0.0.0",
                 "protocolVersion": "2.10.0rc2",
+                "batchTaskNameMap": batch_task.batch_task_name_map
             },
         )
         print(resp)