Everything kind of works now

Author: momchil-flex

tidy3d/config/profiles.py

@@ -21,8 +21,8 @@
     },
     "dev": {
         "web": {
-            "api_endpoint": "https://tidy3d-api.dev-simulation.cloud",
-            "website_endpoint": "https://tidy3d.dev-simulation.cloud",
+            "api_endpoint": "https://tidy3d2-api.dev-simulation.cloud",
+            "website_endpoint": "https://tidy3d2.dev-simulation.cloud",
             "s3_region": "us-east-1",
         }
     },

tidy3d/web/api/webapi.py

@@ -96,10 +96,6 @@ def _is_modeler_batch(resource_id: str) -> bool:
     return BatchTask.is_batch(resource_id)
 
 
-def _batch_detail(resource_id: str) -> BatchDetail:
-    return BatchTask(resource_id).detail()
-
-
 def _batch_detail_error(resource_id: str) -> Optional[WebError]:
     """Processes a failed batch job to generate a detailed error.
 
@@ -759,14 +755,7 @@ def _get_batch_detail_handle_error_status(task_id: TaskId) -> str:
     detail = batch.detail()
     status = detail.status.lower()
     if status in ERROR_STATES:
-        try:
-            # TODO Try to obtain the error message
-            error_msg = "Error message could not be obtained, please contact customer support."
-        except Exception:
-            # If the error message could not be obtained, raise a generic error message
-            error_msg = "Error message could not be obtained, please contact customer support."
-
-        raise WebError(f"Error running task {task_id}! {error_msg}")
+        _batch_detail_error(task_id)
     return detail
 
 
@@ -1003,9 +992,9 @@ def abort(task_id: TaskId) -> Optional[TaskInfo]:
         )
         if _is_modeler_batch(task_id):
             detail = task.detail()
-            return TaskInfo(**{"taskId": detail.batch_id, "taskType": "RF", **detail.dict()})
+            return TaskInfo(**{"taskId": task_id, "taskType": "RF", **detail.dict()})
         else:
-            return TaskInfo(**{"taskId": task.task_id, **task.dict()})
+            return TaskInfo(**{"taskId": task_id, **task.dict()})
 
 
 @wait_for_connection
@@ -1211,7 +1200,7 @@ def load(
     if verbose and task_id is not None:
         console = get_logging_console()
         if _is_modeler_batch(task_id):
-            console.log(f"loading component modeler data from {path}")
+            console.log(f"Loading component modeler data from {path}")
         else:
             console.log(f"Loading simulation from {path}")
 
@@ -1243,36 +1232,37 @@ def load(
     return stub_data
 
 
+def _status_to_stage(status: str) -> tuple[str, int]:
+    """Map task status to monotonic stage for progress bars."""
+    s = (status or "").lower()
+    # Map a broader set of states to monotonic stages for progress bars
+    if s in ("draft", "created"):
+        return ("draft", 0)
+    if s in ("queue", "queued"):
+        return ("queued", 1)
+    if s in ("preprocess", "preprocessing"):
+        return ("preprocess", 1)
+    if s in ("validating",):
+        return ("validating", 2)
+    if s in ("validate_success", "validate_warn"):
+        return ("validate", 3)
+    if s in ("running", "preprocess_success"):
+        return ("running", 4)
+    if s in ("run_success", "postprocess"):
+        return ("postprocess", 5)
+    if s in ("success", "postprocess_success"):
+        return ("success", 6)
+    # Unknown states map to earliest stage to avoid showing 100% prematurely
+    return (s or "unknown", 0)
+
+
 def _monitor_modeler_batch(
     batch_id: str,
     verbose: bool = True,
     max_detail_tasks: int = 20,
 ) -> None:
     """Monitor modeler batch progress with aggregate and per-task views."""
     console = get_logging_console() if verbose else None
-
-    def _status_to_stage(status: str) -> tuple[str, int]:
-        s = (status or "").lower()
-        # Map a broader set of states to monotonic stages for progress bars
-        if s in ("draft", "created"):
-            return ("draft", 0)
-        if s in ("queue", "queued"):
-            return ("queued", 1)
-        if s in ("preprocess",):
-            return ("preprocess", 1)
-        if s in ("validating",):
-            return ("validating", 2)
-        if s in ("validate_success", "validate_warn"):
-            return ("validate", 3)
-        if s in ("running", "preprocess_success"):
-            return ("running", 4)
-        if s in ("postprocess",):
-            return ("postprocess", 5)
-        if s in ("run_success", "success", "postprocess_success"):
-            return ("success", 6)
-        # Unknown states map to earliest stage to avoid showing 100% prematurely
-        return (s or "unknown", 0)
-
     detail = _get_batch_detail_handle_error_status(batch_id)
     name = detail.name or "modeler_batch"
     group_id = detail.groupId
@@ -1312,7 +1302,7 @@ def _status_to_stage(status: str) -> tuple[str, int]:
             r = detail.runSuccess or 0
             if status != prev_status:
                 prev_status = status
-                console.log(f"Batch status = {status}")
+                console.log(f"Batch status = {_status_to_stage(status)[0]}")
 
             # Create per-task bars as soon as tasks appear
             if total and total <= max_detail_tasks and detail.tasks:
@@ -1636,42 +1626,24 @@ def real_cost(task_id: str, verbose: bool = True) -> float | None:
         )
 
     console = get_logging_console() if verbose else None
-    if _is_modeler_batch(task_id):
-        status = _batch_detail(task_id).status.lower()
-        flex_unit = _batch_detail(task_id).realFlexUnit or None
-        if (status not in ["success", "run_success"]) or (flex_unit is None):
-            log.warning(
-                f"Billed FlexCredit for task '{task_id}' is not available. If the task has been "
-                "successfully run, it should be available shortly. If this issue persists, contact customer support."
-            )
-        else:
-            if verbose:
+    task_info = get_info(task_id)
+    flex_unit = task_info.realFlexUnit
+    ori_flex_unit = getattr(task_info, "oriRealFlexUnit", flex_unit)
+    if not flex_unit:
+        log.warning(
+            f"Billed FlexCredit for task '{task_id}' is not available. If the task has been "
+            "successfully run, it should be available shortly."
+        )
+    else:
+        if verbose:
+            console.log(f"Billed flex credit cost: {flex_unit:1.3f}.")
+            if flex_unit != ori_flex_unit and task_info.taskType == "FDTD":
                 console.log(
-                    f"Billed FlexCredit cost: {flex_unit:1.3f}. Minimum cost depends on "
-                    "task execution details. Use 'web.real_cost(task_id)' to get the billed FlexCredit "
-                    "cost after a simulation run."
+                    "Note: the task cost pro-rated due to early shutoff was below the minimum "
+                    "threshold, due to fast shutoff. Decreasing the simulation 'run_time' should "
+                    "decrease the estimated, and correspondingly the billed cost of such tasks."
                 )
-
-        return flex_unit
-    else:
-        task_info = get_info(task_id)
-        flex_unit = task_info.realFlexUnit
-        ori_flex_unit = task_info.oriRealFlexUnit
-        if not flex_unit:
-            log.warning(
-                f"Billed FlexCredit for task '{task_id}' is not available. If the task has been "
-                "successfully run, it should be available shortly."
-            )
-        else:
-            if verbose:
-                console.log(f"Billed flex credit cost: {flex_unit:1.3f}.")
-                if flex_unit != ori_flex_unit and task_info.taskType == "FDTD":
-                    console.log(
-                        "Note: the task cost pro-rated due to early shutoff was below the minimum "
-                        "threshold, due to fast shutoff. Decreasing the simulation 'run_time' should "
-                        "decrease the estimated, and correspondingly the billed cost of such tasks."
-                    )
-        return flex_unit
+    return flex_unit
 
 
 @wait_for_connection

tidy3d/web/core/task_core.py

@@ -924,6 +924,6 @@ def get_data_hdf5(
 
     def abort(self) -> requests.Response:
         """Aborting current task from server."""
-        if not self.task_id:
-            raise ValueError("Task id not found.")
-        return http.put(f"rf/task/{self.batch_id}/abort")
+        if not self.batch_id:
+            raise ValueError("Batch id not found.")
+        return http.put(f"rf/task/{self.batch_id}/abort", {})

tidy3d/web/core/task_info.py

@@ -234,6 +234,7 @@ class BatchDetail(TaskBase):
         totalCheckMillis: Total time in milliseconds spent on checks.
         message: A general message providing information about the batch status.
         tasks: A list of `BatchMember` objects, one for each task in the batch.
+        taskType: The type of tasks contained in the batch.
     """
 
     refId: str = None
@@ -255,6 +256,7 @@ class BatchDetail(TaskBase):
     message: str = None
     tasks: list[BatchMember] = []
     validateErrors: dict = None
+    taskType: str = "RF"
 
 
 class AsyncJobDetail(TaskBase):