Messy but reproduces behaviour

Author: daquinteroflex

docs/notebooks

@@ -59,10 +59,20 @@
 }
 
 
-def _get_url(task_id: str) -> str:
+def _get_url(task_id: Optional[str] = None, resource_id: Optional[str] = None, resource_type: Literal["task", "group"] = "task") -> str:
     """Get the URL for a task on our server."""
-    return f"{Env.current.website_endpoint}/workbench?taskId={task_id}"
+    if task_id:
+        resource_id = task_id
 
+    elif not resource_id:
+        raise WebError(
+            "Required URL resource ID."
+        )
+
+    if resource_type=="task":
+        return f"{Env.current.website_endpoint}/workbench?taskId={resource_id}"
+    elif resource_type=="group":
+        return f"{Env.current.website_endpoint}/workbench?groupId={resource_id}"
 
 def _get_folder_url(folder_id: str) -> str:
     """Get the URL for a task folder on our server."""
@@ -167,7 +177,7 @@ def run(
         Monitor progress of each of the running tasks.
     """
     if isinstance(simulation, ComponentModelerType):
-        task_id = upload(
+        batch_id = upload(
             simulation=simulation,
             task_name=task_name,
             folder_name=folder_name,
@@ -179,20 +189,34 @@ def run(
             solver_version=solver_version,
             reduce_simulation=reduce_simulation,
         )
-        start(
-            task_id,
-            solver_version=solver_version,
-            worker_group=worker_group,
-            pay_type=pay_type,
-            priority=priority,
+        from tidy3d.plugins.smatrix.run import create_batch
+        batch = create_batch(
+            modeler=simulation,
+            folder_name=folder_name,
+            # parent_tasks=[task_id]
         )
-        monitor(task_id, verbose=verbose)
+        batch.run()
+        from ..core.http_util import http
+        http.post(
+            f"tidy3d/projects/{batch_id}/postprocess",
+            {
+                "batchType": "RF_SWEEP"
+            },
+        )
+        # start(
+        #     task_id,
+        #     solver_version=solver_version,
+        #     worker_group=worker_group,
+        #     pay_type=pay_type,
+        #     priority=priority,
+        # )
+        # monitor(task_id, verbose=verbose)
         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
+        # if isinstance(simulation, ModeSolver):
+        #     simulation._patch_data(data=data)
+        # return data
     else:
         task_id = upload(
             simulation=simulation,
@@ -322,8 +346,8 @@ def upload(
             )
         if task_type in GUI_SUPPORTED_TASK_TYPES:
             if isinstance(simulation, ComponentModelerType):
-                url = _get_url(task.batch_id)
-                folder_url = _get_folder_url(task.batch_id)
+                url = _get_url(resource_id=task.group_id, resource_type="group")
+                folder_url = _get_folder_url(task.folder_id)
                 console.log(f"View task using web UI at [link={url}]'{url}'[/link].")
                 console.log(f"Task folder: [link={folder_url}]'{task.folder_name}'[/link].")
             else:
@@ -335,23 +359,40 @@ def upload(
     remote_sim_file = SIM_FILE_HDF5_GZ
     if task_type == "MODE_SOLVER":
         remote_sim_file = MODE_FILE_HDF5_GZ
-    elif task_type == "RF":
+    elif isinstance(simulation, ComponentModelerType):
         remote_sim_file = MODELER_FILE_HDF5_GZ
 
-    task.upload_simulation(
-        stub=stub,
-        verbose=verbose,
-        task_type=task_type,
-        progress_callback=progress_callback,
-        remote_sim_file=remote_sim_file,
-    )
-    estimate_cost(task_id=task.task_id, solver_version=solver_version, verbose=verbose)
+    if isinstance(simulation, ComponentModelerType):
+        task.upload_simulation(
+            stub=stub,
+            verbose=verbose,
+            task_type=task_type,
+            progress_callback=progress_callback,
+            remote_sim_file=remote_sim_file,
+        )
+        #  TODO talk momchil
+        # estimate_cost(task_id=task.task_id, solver_version=solver_version, verbose=verbose)
+
+        task.validate_post_upload(parent_tasks=parent_tasks)
+
+        # log the url for the task in the web UI
+        log.debug(f"{Env.current.website_endpoint}/folders/{task.folder_id}/tasks/{task.group_id}")
+        return task.batch_id
+    else:
+        task.upload_simulation(
+            stub=stub,
+            verbose=verbose,
+            task_type=task_type,
+            progress_callback=progress_callback,
+            remote_sim_file=remote_sim_file,
+        )
+        estimate_cost(task_id=task.task_id, solver_version=solver_version, verbose=verbose)
 
-    task.validate_post_upload(parent_tasks=parent_tasks)
+        task.validate_post_upload(parent_tasks=parent_tasks)
 
-    # log the url for the task in the web UI
-    log.debug(f"{Env.current.website_endpoint}/folders/{task.folder_id}/tasks/{task.task_id}")
-    return task.task_id
+        # log the url for the task in the web UI
+        log.debug(f"{Env.current.website_endpoint}/folders/{task.folder_id}/tasks/{task.task_id}")
+        return task.task_id
 
 
 def get_reduced_simulation(simulation, reduce_simulation):

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

@@ -139,11 +139,12 @@ class SimulationTask(ResourceLifecycle, Submittable, extra=Extra.allow):
     """Interface for managing the running of a :class:`.Simulation` task on server."""
 
     task_id: Optional[str] = Field(
-        ...,
+        None,
         title="task_id",
         description="Task ID number, set when the task is uploaded, leave as None.",
         alias="taskId",
     )
+
     folder_id: Optional[str] = Field(
         None,
         title="folder_id",
@@ -186,8 +187,15 @@ class SimulationTask(ResourceLifecycle, Submittable, extra=Extra.allow):
         alias="batchId",
     )
 
-    batch_task_name_map: dict[str, str] = Field(
+    group_id: Optional[str] = Field(
         ...,
+        title="group_id",
+        description="Group ID number, set when the task is uploaded, leave as None.",
+        alias="groupId",
+    )
+
+    batch_task_name_map: Optional[dict[str, str]] = Field(
+        None,
         title="batch_task_name_map",
         description="Batch ID number, set when the task is uploaded, leave as None.",
         alias="batchTaskNameIdsMap",
@@ -278,7 +286,7 @@ def create(
             )
             print(resp)
             task = SimulationTask(**resp, taskType=task_type, folder_name=folder_name)
-            print(task)
+            # print(task)
             return task
         else:
             # handle backwards compatibility, "tidy3d" is the default simulation_type
@@ -325,6 +333,7 @@ def get(cls, task_id: str, verbose: bool = True) -> SimulationTask:
         task = SimulationTask(**resp) if resp else None
         return task
 
+
     @classmethod
     def get_running_tasks(cls) -> list[SimulationTask]:
         """Get a list of running tasks from the server"