Ok issue on resource creation

Author: daquinteroflex

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

@@ -24,6 +24,7 @@
     SIM_FILE_HDF5,
     SIM_FILE_HDF5_GZ,
     SIMULATION_DATA_HDF5_GZ,
+    MODELER_FILE_HDF5_GZ,
     TaskId,
 )
 from tidy3d.plugins.smatrix.web.core.environment import Env
@@ -41,7 +42,7 @@
 SIM_FILE_JSON = "simulation.json"
 
 # not all solvers are supported yet in GUI
-GUI_SUPPORTED_TASK_TYPES = ["FDTD", "MODE_SOLVER", "HEAT"]
+GUI_SUPPORTED_TASK_TYPES = ["FDTD", "MODE_SOLVER", "HEAT", "RF"]
 
 # if a solver is in beta stage, cost is subject to change
 BETA_TASK_TYPES = ["HEAT", "EME", "HEAT_CHARGE", "VOLUME_MESH"]
@@ -302,30 +303,45 @@ def upload(
     task = SimulationTask.create(
         task_type, task_name, folder_name, callback_url, simulation_type, parent_tasks, file_type="Gz", port_name_list=port_name_list
     )
+    print(task)
     if verbose:
         console = get_logging_console()
-        console.log(
-            f"Created task '{task_name}' with task_id '{task.task_id}' and task_type '{task_type}'."
-        )
+        if isinstance(simulation, ComponentModelerType):
+            console.log(
+                f"Created modeler task '{task_name}' with batch_id '{task.batch_id}' and task_type '{task_type}'."
+            )
+        else:
+            console.log(
+                f"Created task '{task_name}' with task_id '{task.task_id}' and task_type '{task_type}'."
+            )
         if task_type in BETA_TASK_TYPES:
             solver_name = SOLVER_NAME[task_type]
             console.log(
                 f"Tidy3D's {solver_name} solver is currently in the beta stage. "
                 f"Cost of {solver_name} simulations is subject to change in the future."
             )
         if task_type in GUI_SUPPORTED_TASK_TYPES:
-            url = _get_url(task.task_id)
-            folder_url = _get_folder_url(task.folder_id)
-            console.log(f"View task using web UI at [link={url}]'{url}'[/link].")
-            console.log(f"Task folder: [link={folder_url}]'{task.folder_name}'[/link].")
+            if isinstance(simulation, ComponentModelerType):
+                url = _get_url(task.batch_id)
+                folder_url = _get_folder_url(task.batch_id)
+                console.log(f"View task using web UI at [link={url}]'{url}'[/link].")
+                console.log(f"Task folder: [link={folder_url}]'{task.folder_name}'[/link].")
+            else:
+                url = _get_url(task.task_id)
+                folder_url = _get_folder_url(task.folder_id)
+                console.log(f"View task using web UI at [link={url}]'{url}'[/link].")
+                console.log(f"Task folder: [link={folder_url}]'{task.folder_name}'[/link].")
 
     remote_sim_file = SIM_FILE_HDF5_GZ
     if task_type == "MODE_SOLVER":
         remote_sim_file = MODE_FILE_HDF5_GZ
+    elif task_type == "RF":
+        remote_sim_file = MODELER_FILE_HDF5_GZ
 
     task.upload_simulation(
         stub=stub,
         verbose=verbose,
+        task_type=task_type,
         progress_callback=progress_callback,
         remote_sim_file=remote_sim_file,
     )

tidy3d/plugins/smatrix/web/core/constants.py

@@ -29,5 +29,6 @@
 SIM_FILE_HDF5 = "simulation.hdf5"
 SIM_FILE_HDF5_GZ = "simulation.hdf5.gz"
 MODE_FILE_HDF5_GZ = "mode_solver.hdf5.gz"
+MODELER_FILE_HDF5_GZ = "modeler.hdf5.gz"
 MODE_DATA_HDF5_GZ = "output/mode_solver_data.hdf5.gz"
 SIM_ERROR_FILE = "output/tidy3d_error.json"

tidy3d/plugins/smatrix/web/core/task_core.py

@@ -179,6 +179,20 @@ class SimulationTask(ResourceLifecycle, Submittable, extra=Extra.allow):
         "``{'id', 'status', 'name', 'workUnit', 'solverVersion'}``.",
     )
 
+    batch_id: Optional[str] = Field(
+        ...,
+        title="batch_id",
+        description="Batch ID number, set when the task is uploaded, leave as None.",
+        alias="batchId",
+    )
+
+    batch_task_name_map: dict[str, str] = Field(
+        ...,
+        title="batch_task_name_map",
+        description="Batch ID number, set when the task is uploaded, leave as None.",
+        alias="batchTaskNameIdsMap",
+    )
+
     # simulation_type: str = pd.Field(
     #     None,
     #     title="Simulation Type",
@@ -262,7 +276,10 @@ def create(
                     "fileType": file_type,
                 },
             )
-            return SimulationTask(**resp, taskType=task_type, folder_name=folder_name)
+            print(resp)
+            task = SimulationTask(**resp, taskType=task_type, folder_name=folder_name)
+            print(task)
+            return task
         else:
             # handle backwards compatibility, "tidy3d" is the default simulation_type
             if simulation_type is None:
@@ -386,6 +403,7 @@ def upload_simulation(
         stub: TaskStub,
         verbose: bool = True,
         progress_callback: Optional[Callable[[float], None]] = None,
+        task_type: Optional[str] = None,
         remote_sim_file: str = SIM_FILE_HDF5_GZ,
     ) -> None:
         """Upload :class:`.Simulation` object to Server.
@@ -399,8 +417,8 @@ def upload_simulation(
         progress_callback : Callable[[float], None] = None
             Optional callback function called while uploading the data.
         """
-        if not self.task_id:
-            raise WebError("Expected field 'task_id' is unset.")
+        if (not self.task_id) and (not self.batch_id):
+            raise WebError("Expected fields 'task_id' or 'batch_id' are unset.")
         if not stub:
             raise WebError("Expected field 'simulation' is unset.")
         # Also upload hdf5.gz containing all data.
@@ -410,13 +428,22 @@ def upload_simulation(
             # upload simulation
             # compress .hdf5 to .hdf5.gz
             stub.to_hdf5_gz(file_name)
-            upload_file(
-                self.task_id,
-                file_name,
-                remote_sim_file,
-                verbose=verbose,
-                progress_callback=progress_callback,
-            )
+            if task_type == "RF":
+                upload_file(
+                    self.batch_id,
+                    file_name,
+                    remote_sim_file,
+                    verbose=verbose,
+                    progress_callback=progress_callback,
+                )
+            else:
+                upload_file(
+                    self.task_id,
+                    file_name,
+                    remote_sim_file,
+                    verbose=verbose,
+                    progress_callback=progress_callback,
+                )
         finally:
             os.unlink(file_name)