cleanup

Author: momchil-flex

tidy3d/config/profiles.py

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

tidy3d/web/api/webapi.py

@@ -125,24 +125,22 @@ def _batch_detail_error(resource_id: str) -> Optional[WebError]:
         return
 
     if hasattr(batch_detail, "validateErrors") and batch_detail.validateErrors:
-        error_details = []
-        for key, error_str in batch_detail.validateErrors.items():
-            try:
-                error_dict = json.loads(error_str)
-                validation_error = error_dict.get("validation_error", "Unknown validation error.")
-                msg = f"- Subtask '{key}' failed: {validation_error}"
-                log.error(msg)
+        try:
+            error_details = []
+            for key, error_str in batch_detail.validateErrors.items():
+                msg = f"- Subtask '{key}' failed: {error_str}"
                 error_details.append(msg)
-            except (json.JSONDecodeError, TypeError):
-                # Handle cases where the error string isn't valid JSON
-                log.error(f"Could not parse validation error for subtask '{key}'.")
-                error_details.append(f"- Subtask '{key}': Could not parse error details.")
-
-        details_string = "\n".join(error_details)
-        full_error_msg = (
-            "One or more subtasks failed validation. Please fix the component modeler configuration.\n"
-            f"Details:\n{details_string}"
-        )
+
+            details_string = "\n".join(error_details)
+            full_error_msg = (
+                "One or more subtasks failed validation. Please fix the component modeler "
+                "configuration.\n"
+                f"Details:\n{details_string}"
+            )
+        except Exception as e:
+            raise WebError(
+                "One or more subtasks failed validation. Failed to parse validation errors."
+            ) from e
         raise WebError(full_error_msg)
 
     # Handle all other generic error states
@@ -864,7 +862,7 @@ def monitor_preprocess() -> None:
     if verbose:
         # verbose case, update progressbar
         console.log("running solver")
-        if task_type == "FDTD":
+        if "FDTD" in task_type:
             with Progress(console=console) as progress:
                 pbar_pd = progress.add_task("% done", total=100)
                 perc_done, _ = get_run_info(task_id)
@@ -1472,8 +1470,10 @@ def estimate_cost(
     console = get_logging_console() if verbose else None
 
     task = TaskFactory.get(task_id, verbose=False)
+    detail = task.detail()
     if isinstance(task, BatchTask):
-        task.check(solver_version=solver_version)
+        check_task_type = "FDTD" if detail.taskType == "MODAL_CM" else "RF_FDTD"
+        task.check(solver_version=solver_version, check_task_type=check_task_type)
         detail = task.detail()
         status = detail.status.lower()
         while status not in ALL_POST_VALIDATE_STATES:
@@ -1593,7 +1593,7 @@ def real_cost(task_id: str, verbose: bool = True) -> float | None:
     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":
+            if flex_unit != ori_flex_unit and "FDTD" in task_info.taskType:
                 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 "

tidy3d/web/core/task_core.py

@@ -873,6 +873,7 @@ def detail(self) -> BatchDetail:
 
     def check(
         self,
+        check_task_type: str,
         solver_version: Optional[str] = None,
         protocol_version: Optional[str] = None,
     ) -> requests.Response:
@@ -897,6 +898,7 @@ def check(
             {
                 "solverVersion": solver_version,
                 "protocolVersion": protocol_version,
+                "taskType": check_task_type,
             },
         )