Let's try using the batch endpoint for RF introperability, bad decision

Author: daquinteroflex

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

@@ -193,30 +193,34 @@ def run(
         batch = create_batch(
             modeler=simulation,
             folder_name=folder_name,
+            solver_version=solver_version
             # parent_tasks=[task_id]
         )
         batch.run()
+        # postprocess(
+        #     batch_id,
+        #     solver_version=solver_version,
+        #     worker_group=worker_group,
+        #     pay_type=pay_type,
+        #     priority=priority,
+        # ) # TODO FIX
+
         from ..core.http_util import http
         resp = http.post(
             f"tidy3d/projects/{batch_id}/postprocess",
             {
-                "batchType": "RF_SWEEP"
+                "batchType": "RF_SWEEP",
+                "solverVersion": "dario-rf-0.0.0"
             },
         )
         print(resp)
-        # start(
-        #     task_id,
-        #     solver_version=solver_version,
-        #     worker_group=worker_group,
-        #     pay_type=pay_type,
-        #     priority=priority,
-        # )
         # monitor(task_id, verbose=verbose)
         # data = load(
         #     task_id=task_id, path=path, verbose=verbose, progress_callback=progress_callback_download
         # )
         # if isinstance(simulation, ModeSolver):
         #     simulation._patch_data(data=data)
+        # print(resp)
         # return data
     else:
         task_id = upload(
@@ -470,6 +474,7 @@ def start(
     worker_group: Optional[str] = None,
     pay_type: Union[PayType, str] = PayType.AUTO,
     priority: Optional[int] = None,
+    resource_id: Optional[str] = None,
 ) -> None:
     """Start running the simulation associated with task.
 
@@ -490,9 +495,12 @@ def start(
     ----
     To monitor progress, can call :meth:`monitor` after starting simulation.
     """
+    if not resource_id:
+        resource_id = task_id
+
     if priority is not None and (priority < 1 or priority > 10):
         raise ValueError("Priority must be between '1' and '10' if specified.")
-    task = SimulationTask.get(task_id)
+    task = SimulationTask.get(resource_id)
     if not task:
         raise ValueError("Task not found.")
     task.submit(
@@ -502,6 +510,48 @@ def start(
         priority=priority,
     )
 
+@wait_for_connection
+def postprocess(
+    task_id: TaskId,
+    solver_version: Optional[str] = None,
+    worker_group: Optional[str] = None,
+    pay_type: Union[PayType, str] = PayType.AUTO,
+    priority: Optional[int] = None,
+    resource_id: Optional[str] = None,
+) -> None:
+    """Start running the simulation associated with task.
+
+    Parameters
+    ----------
+
+    task_id : str
+        Unique identifier of task on server.  Returned by :meth:`upload`.
+    solver_version: str = None
+        target solver version.
+    worker_group: str = None
+        worker group
+    pay_type: Union[PayType, str] = PayType.AUTO
+        Which method to pay the simulation
+    priority: int = None
+        Task priority for vGPU queue (1=lowest, 10=highest).
+    Note
+    ----
+    To monitor progress, can call :meth:`monitor` after starting simulation.
+    """
+    if not resource_id:
+        resource_id = task_id
+
+    if priority is not None and (priority < 1 or priority > 10):
+        raise ValueError("Priority must be between '1' and '10' if specified.")
+    task = SimulationTask.get(resource_id)
+    if not task:
+        raise ValueError("Task not found.")
+    task.postprocess(
+        solver_version=solver_version,
+        worker_group=worker_group,
+        pay_type=pay_type,
+        priority=priority,
+    )
 
 @wait_for_connection
 def get_run_info(task_id: TaskId) -> tuple[Optional[float], Optional[float]]:

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

@@ -530,11 +530,61 @@ def submit(
         else:
             resource_id = self.task_id
 
+        http.post(
+            f"tidy3d/tasks/{resource_id}/submit",
+            {
+                "solverVersion": solver_version,
+                "workerGroup": worker_group,
+                "protocolVersion": protocol_version,
+                "enableCaching": Env.current.enable_caching,
+                "payType": pay_type.value,
+                "priority": priority,
+            },
+        )
 
+    def postprocess(
+        self,
+        solver_version: Optional[str] = None,
+        worker_group: Optional[str] = None,
+        pay_type: Union[PayType, str] = PayType.AUTO,
+        priority: Optional[int] = None,
+    ):
+        """Kick off this task.
+
+        It will be uploaded to server before
+        starting the task. Otherwise, this method assumes that the Simulation has been uploaded by
+        the upload_file function, so the task will be kicked off directly.
+
+        Parameters
+        ----------
+        solver_version: str = None
+            target solver version.
+        worker_group: str = None
+            worker group
+        pay_type: Union[PayType, str] = PayType.AUTO
+            Which method to pay the simulation.
+        priority: int = None
+            Task priority for vGPU queue (1=lowest, 10=highest).
+        """
+        pay_type = PayType(pay_type) if not isinstance(pay_type, PayType) else pay_type
+
+        if solver_version:
+            protocol_version = None
+        else:
+            protocol_version = http_util.get_version()
+
+        if (not self.task_id) and (not self.batch_id):
+            raise WebError("Expected fields 'task_id' or 'batch_id' are unset.")
+
+        if (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         http.post(
-            f"tidy3d/tasks/{resource_id}/submit",
+            f"tidy3d/projects/{resource_id}/postprocess",
             {
+                "batchType": "RF_SWEEP",
                 "solverVersion": solver_version,
                 "workerGroup": worker_group,
                 "protocolVersion": protocol_version,