Unifying detail and delete methods

Author: momchil-flex

tidy3d/web/api/webapi.py

@@ -671,9 +671,7 @@ def get_info(task_id: TaskId, verbose: bool = True) -> TaskInfo | BatchDetail:
     task = TaskFactory.get(task_id, verbose=verbose)
     if not task:
         raise ValueError("Task not found.")
-    if isinstance(task, BatchTask):
-        return task.detail()
-    return TaskInfo(**{"taskId": task.task_id, "taskType": task.task_type, **task.dict()})
+    return task.detail()
 
 
 @wait_for_connection

tidy3d/web/core/task_core.py

@@ -33,7 +33,7 @@
 from .http_util import http
 from .s3utils import download_file, download_gz_file, upload_file
 from .stub import TaskStub
-from .task_info import BatchDetail
+from .task_info import BatchDetail, TaskInfo
 from .types import PayType, Queryable, ResourceLifecycle, Submittable, Tidy3DResource
 
 
@@ -204,6 +204,7 @@ def create(
                 "groupName": task_name,
                 "folderId": folder.folder_id,
                 "fileType": file_type,
+                "taskType": task_type,
             }
             resp = http.post("rf/task", payload)
         else:
@@ -363,6 +364,33 @@ def is_batch(resource_id: str) -> bool:
         except Exception:
             return False
 
+    def delete(self, versions: bool = False) -> None:
+        """Delete current task from server.
+
+        Parameters
+        ----------
+        versions : bool = False
+            If ``True``, delete all versions of the task in the task group. Otherwise, delete only
+            the version associated with the current task ID.
+        """
+        if not self.task_id:
+            raise ValueError("Task id not found.")
+
+        task_details = self.detail()
+
+        if task_details and "groupId" in task_details:
+            group_id = task_details["groupId"]
+            if versions:
+                http.delete("tidy3d/group", json={"groupIds": [group_id]})
+                return
+            elif "version" in task_details:
+                version = task_details["version"]
+                http.delete(f"tidy3d/group/{group_id}/versions", json={"versions": [version]})
+                return
+
+        # Fallback to old method if we can't get the groupId and version
+        http.delete(f"tidy3d/tasks/{self.task_id}")
+
 
 class SimulationTask(WebTask):
     """Interface for managing the running of solver tasks on the server."""
@@ -455,28 +483,16 @@ def get_running_tasks(cls) -> list[SimulationTask]:
             return []
         return parse_obj_as(list[SimulationTask], resp)
 
-    def delete(self, versions: bool = False) -> None:
-        """Delete current task from server.
+    def detail(self) -> TaskInfo:
+        """Fetches the detailed information and status of the task.
 
-        Parameters
-        ----------
-        versions : bool = False
-            If ``True``, delete all versions of the task in the task group. Otherwise, delete only the version associated with the current task ID.
+        Returns
+        -------
+        TaskInfo
+            An object containing the task's latest data.
         """
-        if not self.task_id:
-            raise ValueError("Task id not found.")
-
-        task_details = http.get(f"tidy3d/tasks/{self.task_id}")
-
-        if task_details and "groupId" in task_details and "version" in task_details:
-            group_id = task_details["groupId"]
-            version = task_details["version"]
-            if versions:
-                http.delete("tidy3d/group", json={"groupIds": [group_id]})
-            else:
-                http.delete(f"tidy3d/group/{group_id}/versions", json={"versions": [version]})
-        else:  # Fallback to old method if we can't get the groupId and version
-            http.delete(f"tidy3d/tasks/{self.task_id}")
+        resp = http.get(f"tidy3d/tasks/{self.task_id}/detail")
+        return TaskInfo(**{"taskId": self.task_id, "taskType": self.task_type, **resp})
 
     def get_simulation_json(self, to_file: PathLike, verbose: bool = True) -> None:
         """Get json file for a :class:`.Simulation` from server.
@@ -945,20 +961,6 @@ def abort(self) -> requests.Response:
             raise ValueError("Batch id not found.")
         return http.put(f"rf/task/{self.task_id}/abort", {})
 
-    def delete(self, versions: bool = False) -> None:
-        """Delete current batch task from server.
-
-        Parameters
-        ----------
-        versions : bool = False
-            Ignored for batch tasks; present for API compatibility.
-        """
-        if not self.task_id:
-            raise ValueError("Batch id not found.")
-        if versions:
-            raise NotImplementedError("Deleting all versions is not supported for batch tasks.")
-        http.delete(f"rf/task/{self.task_id}")
-
 
 class TaskFactory:
     """Factory for obtaining the correct task subclass."""