end of copilot changes

Author: momchil-flex

tidy3d/web/api/states.py

@@ -36,16 +36,13 @@
 
 END_STATES = ERROR_STATES | COMPLETED_STATES
 
-POST_VALIDATE_STATES = {
-    "validate_success",
-    "validate_warn",
-}
+POST_VALIDATE_STATES = {"validate_success", "validate_warn"}
 
 RUNNING_STATES = (
     PRE_VALIDATE_STATES | POST_VALIDATE_STATES | {"running"} | POST_RUN_STATES | COMPLETED_STATES
 )
 
-ALL_POST_VALIDATE_STATES = POST_VALIDATE_STATES | {"running"} | POST_RUN_STATES | COMPLETED_STATES
+ALL_POST_VALIDATE_STATES = POST_VALIDATE_STATES | {"running"} | POST_RUN_STATES | END_STATES
 
 VALID_PROGRESS_STATES = RUNNING_STATES | PRE_ERROR_STATES
 

tidy3d/web/api/webapi.py

@@ -669,8 +669,9 @@ 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.")
-    info = TaskFactory.normalize_info(task)
-    return info
+    if isinstance(task, BatchTask):
+        return task.detail()
+    return TaskInfo(**{"taskId": task.task_id, **task.dict()})
 
 
 @wait_for_connection
@@ -747,7 +748,7 @@ def _get_batch_detail_handle_error_status(batch: BatchTask) -> BatchDetail:
     detail = batch.detail()
     status = detail.status.lower()
     if status in ERROR_STATES:
-        raise _batch_detail_error(batch.id)
+        raise _batch_detail_error(batch.task_id)
     return detail
 
 
@@ -1515,6 +1516,7 @@ def estimate_cost(
         if status in ERROR_STATES:
             raise _batch_detail_error(resource_id=task_id)
         raise WebError("Could not get estimated cost!")
+
     # simulation path
     task.estimate_cost(solver_version=solver_version)
     task_info = get_info(task_id)
@@ -1724,3 +1726,4 @@ def test() -> None:
             f"For details, check the instructions at {url}."
         )
         raise WebError(msg) from e
+        raise WebError(msg) from e

tidy3d/web/core/task_core.py

@@ -11,7 +11,7 @@
 
 import requests
 from botocore.exceptions import ClientError
-from pydantic.v1 import BaseModel, Extra, Field, parse_obj_as
+from pydantic.v1 import Extra, Field, parse_obj_as
 
 import tidy3d as td
 from tidy3d.config import config
@@ -143,20 +143,6 @@ def list_tasks(self, projects_endpoint: str = "tidy3d/projects") -> list[Tidy3DR
         )
 
 
-class WebTaskInfo(BaseModel):
-    """Normalized task/batch info."""
-
-    taskId: str
-    taskType: str
-    status: Optional[str] = None
-    folderId: Optional[str] = None
-    folderName: Optional[str] = None
-    estFlexUnit: Optional[float] = None
-    realFlexUnit: Optional[float] = None
-    metadataStatus: Optional[str] = None
-    createdAt: Optional[datetime] = None
-
-
 class WebTask(ResourceLifecycle, Submittable, extra=Extra.allow):
     """Interface for managing the running a task on the server."""
 
@@ -947,39 +933,10 @@ def get(cls, task_id: str, verbose: bool = True) -> WebTask:
         if kind == "simulation":
             task = SimulationTask.get(task_id, verbose=verbose)
             return task
-        # probe batch non-throwing
         if WebTask.is_batch(task_id):
             cls.register(task_id, "batch")
             return BatchTask(task_id)
         task = SimulationTask.get(task_id, verbose=verbose)
         if task:
             cls.register(task_id, "simulation")
         return task
-
-    @classmethod
-    def normalize_info(cls, task: WebTask) -> WebTaskInfo:
-        if isinstance(task, BatchTask):
-            detail = task.detail()
-            return WebTaskInfo(
-                taskId=task.task_id,
-                taskType="RF",
-                status=detail.status,
-                folderId=getattr(detail, "folderId", None),
-                folderName=getattr(detail, "folderName", None),
-                estFlexUnit=getattr(detail, "estFlexUnit", None),
-                realFlexUnit=getattr(detail, "realFlexUnit", None),
-                metadataStatus=getattr(detail, "metadataStatus", None),
-                createdAt=None,
-            )
-        # SimulationTask
-        return WebTaskInfo(
-            taskId=task.task_id,
-            taskType=getattr(task, "task_type", None),
-            status=getattr(task, "status", None),
-            folderId=getattr(task, "folder_id", None),
-            folderName=getattr(task, "folder_name", None),
-            estFlexUnit=getattr(task, "estFlexUnit", None),
-            realFlexUnit=getattr(task, "real_flex_unit", None),
-            metadataStatus=getattr(task, "metadataStatus", None),
-            createdAt=getattr(task, "created_at", None),
-        )