Advancing

Author: daquinteroflex

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

@@ -197,12 +197,13 @@ def run(
         )
         batch.run()
         from ..core.http_util import http
-        http.post(
+        resp = http.post(
             f"tidy3d/projects/{batch_id}/postprocess",
             {
                 "batchType": "RF_SWEEP"
             },
         )
+        print(resp)
         # start(
         #     task_id,
         #     solver_version=solver_version,
@@ -211,9 +212,9 @@ def run(
         #     priority=priority,
         # )
         # monitor(task_id, verbose=verbose)
-        data = load(
-            task_id=task_id, path=path, verbose=verbose, progress_callback=progress_callback_download
-        )
+        # data = load(
+        #     task_id=task_id, path=path, verbose=verbose, progress_callback=progress_callback_download
+        # )
         # if isinstance(simulation, ModeSolver):
         #     simulation._patch_data(data=data)
         # return data
@@ -366,7 +367,6 @@ def upload(
         task.upload_simulation(
             stub=stub,
             verbose=verbose,
-            task_type=task_type,
             progress_callback=progress_callback,
             remote_sim_file=remote_sim_file,
         )
@@ -382,7 +382,6 @@ def upload(
         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/task_core.py

@@ -266,7 +266,7 @@ def create(
             :class:`SimulationTask` object containing info about status, size,
             credits of task and others.
         """
-        # if (task_type == TaskType.COMPONENT_MODELER.name) or (task_type == TaskType.TERMINAL_COMPONENT_MODELER.name):
+        # if (self.task_type == TaskType.COMPONENT_MODELER.name) or (task_type == TaskType.TERMINAL_COMPONENT_MODELER.name):
         if task_type == "RF":
             if simulation_type is None:
                 simulation_type = "tidy3d"
@@ -308,7 +308,7 @@ def create(
             return SimulationTask(**resp, taskType=task_type, folder_name=folder_name)
 
     @classmethod
-    def get(cls, task_id: str, verbose: bool = True) -> SimulationTask:
+    def get(cls, task_id: str, verbose: bool = True, resource_id: Optional[str] = None) -> SimulationTask:
         """Get task from the server by id.
 
         Parameters
@@ -324,10 +324,13 @@ def get(cls, task_id: str, verbose: bool = True) -> SimulationTask:
             :class:`.SimulationTask` object containing info about status,
              size, credits of task and others.
         """
+        if not resource_id:
+            resource_id = task_id
+
         try:
-            resp = http.get(f"tidy3d/tasks/{task_id}/detail")
+            resp = http.get(f"tidy3d/tasks/{resource_id}/detail")
         except WebNotFoundError as e:
-            td.log.error(f"The requested task ID '{task_id}' does not exist.")
+            td.log.error(f"The requested resource ID '{resource_id}' does not exist.")
             raise e
 
         task = SimulationTask(**resp) if resp else None
@@ -412,7 +415,6 @@ 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.
@@ -437,22 +439,18 @@ def upload_simulation(
             # upload simulation
             # compress .hdf5 to .hdf5.gz
             stub.to_hdf5_gz(file_name)
-            if task_type == "RF":
-                upload_file(
-                    self.batch_id,
-                    file_name,
-                    remote_sim_file,
-                    verbose=verbose,
-                    progress_callback=progress_callback,
-                )
+            if (self.task_type == "RF") and (self.task_id is None):
+                resource_id = self.batch_id
             else:
-                upload_file(
-                    self.task_id,
-                    file_name,
-                    remote_sim_file,
-                    verbose=verbose,
-                    progress_callback=progress_callback,
-                )
+                resource_id = self.task_id
+
+            upload_file(
+                resource_id,
+                file_name,
+                remote_sim_file,
+                verbose=verbose,
+                progress_callback=progress_callback,
+            )
         finally:
             os.unlink(file_name)
 
@@ -477,11 +475,16 @@ def upload_file(
         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 (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         upload_file(
-            self.task_id,
+            resource_id,
             local_file,
             remote_filename,
             verbose=verbose,
@@ -519,8 +522,18 @@ def submit(
         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/{self.task_id}/submit",
+            f"tidy3d/tasks/{resource_id}/submit",
             {
                 "solverVersion": solver_version,
                 "workerGroup": worker_group,
@@ -545,16 +558,21 @@ def estimate_cost(self, solver_version=None) -> float:
         flex_unit_cost: float
             estimated cost in FlexCredits
         """
-        if not self.task_id:
-            raise WebError("Expected field 'task_id' is unset.")
-
         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
+
         resp = http.post(
-            f"tidy3d/tasks/{self.task_id}/metadata",
+            f"tidy3d/tasks/{resource_id}/metadata",
             {
                 "solverVersion": solver_version,
                 "protocolVersion": protocol_version,
@@ -585,13 +603,18 @@ def get_sim_data_hdf5(
         path: pathlib.Path
             Path to saved file.
         """
-        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 (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         file = None
         try:
             file = download_gz_file(
-                resource_id=self.task_id,
+                resource_id=resource_id,
                 remote_filename=remote_data_file,
                 to_file=to_file,
                 verbose=verbose,
@@ -605,7 +628,7 @@ def get_sim_data_hdf5(
         if not file:
             try:
                 file = download_file(
-                    resource_id=self.task_id,
+                    resource_id=resource_id,
                     remote_filename=remote_data_file[:-3],
                     to_file=to_file,
                     verbose=verbose,
@@ -642,11 +665,16 @@ def get_simulation_hdf5(
         path: pathlib.Path
             Path to saved file.
         """
-        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 (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         return download_gz_file(
-            resource_id=self.task_id,
+            resource_id=resource_id,
             remote_filename=remote_sim_file,
             to_file=to_file,
             verbose=verbose,
@@ -668,7 +696,15 @@ def get_running_info(self) -> tuple[float, float]:
         if not self.task_id:
             raise WebError("Expected field 'task_id' is unset.")
 
-        resp = http.get(f"tidy3d/tasks/{self.task_id}/progress")
+        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
+
+        resp = http.get(f"tidy3d/tasks/{resource_id}/progress")
         perc_done = resp.get("perc_done")
         field_decay = resp.get("field_decay")
         return perc_done, field_decay
@@ -696,11 +732,16 @@ def get_log(
             Path to saved file.
         """
 
-        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 (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         return download_file(
-            self.task_id,
+            resource_id,
             SIM_LOG_FILE,
             to_file=to_file,
             verbose=verbose,
@@ -722,11 +763,16 @@ def get_error_json(self, to_file: str, verbose: bool = True) -> pathlib.Path:
         path: pathlib.Path
             Path to saved file.
         """
-        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 (self.task_type == "RF") and (self.task_id is None):
+            resource_id = self.batch_id
+        else:
+            resource_id = self.task_id
 
         return download_file(
-            self.task_id,
+            resource_id,
             SIM_ERROR_FILE,
             to_file=to_file,
             verbose=verbose,