Test fixes and fixture to clear TaskFactory registry

Author: momchil-flex

tests/test_web/test_local_cache.py

@@ -43,7 +43,7 @@
     resolve_local_cache,
 )
 from tidy3d.web.cli.app import tidy3d_cli
-from tidy3d.web.core.task_core import BatchTask
+from tidy3d.web.core.task_core import BatchTask, SimulationTask
 
 common.CONNECTION_RETRY_TIME = 0.1
 
@@ -245,7 +245,9 @@ def _fake_field_map_from_file(*args, **kwargs):
     monkeypatch.setattr(
         io_utils, "load_simulation", lambda task_id, *args, **kwargs: TASK_TO_SIM[task_id]
     )
-    monkeypatch.setattr(BatchTask, "is_batch", lambda *args, **kwargs: "success")
+    monkeypatch.setattr(
+        SimulationTask, "get", lambda *args, **kwargs: SimpleNamespace(taskType="FDTD")
+    )
     monkeypatch.setattr(
         BatchTask, "detail", lambda *args, **kwargs: SimpleNamespace(status="success")
     )

tests/test_web/test_webapi.py

@@ -415,7 +415,7 @@ def test_run_with_invalid_priority(mock_webapi, priority):
 
 
 @responses.activate
-def test_get_run_info(mock_get_run_info):
+def test_get_run_info(mock_get_run_info, mock_get_info):
     assert get_run_info(TASK_ID) == (100, 0)
 
 

tests/test_web/test_webapi_eme.py

@@ -260,7 +260,7 @@ def test_get_info(mock_get_info):
 
 
 @responses.activate
-def test_get_run_info(mock_get_run_info):
+def test_get_run_info(mock_get_run_info, mock_get_info):
     assert get_run_info(TASK_ID) == (100, 0)
 
 

tests/test_web/test_webapi_heat.py

@@ -250,7 +250,7 @@ def test_get_info(mock_get_info):
 
 
 @responses.activate
-def test_get_run_info(mock_get_run_info):
+def test_get_run_info(mock_get_run_info, mock_get_info):
     assert get_run_info(TASK_ID) == (100, 0)
 
 

tests/test_web/test_webapi_mode.py

@@ -307,7 +307,7 @@ def test_get_info(mock_get_info):
 
 
 @responses.activate
-def test_get_run_info(mock_get_run_info):
+def test_get_run_info(mock_get_run_info, mock_get_info):
     assert get_run_info(TASK_ID) == (100, 0)
 
 

tests/test_web/test_webapi_mode_sim.py

@@ -303,7 +303,7 @@ def test_get_info(mock_get_info):
 
 
 @responses.activate
-def test_get_run_info(mock_get_run_info):
+def test_get_run_info(mock_get_run_info, mock_get_info):
     assert get_run_info(TASK_ID) == (100, 0)
 
 

tidy3d/web/api/webapi.py

@@ -1368,9 +1368,9 @@ def delete(task_id: TaskId, versions: bool = False) -> TaskInfo:
         Object containing information about status, size, credits of task.
 
     """
-    task = TaskFactory.get(task_id, verbose=False)
-    if not task:
+    if not task_id:
         raise ValueError("Task id not found.")
+    task = TaskFactory.get(task_id, verbose=False)
     task.delete(versions)
     return TaskInfo(**{"taskId": task.task_id, **task.dict()})
 

tidy3d/web/core/task_core.py

@@ -965,6 +965,11 @@ class TaskFactory:
 
     _REGISTRY: dict[str, str] = {}
 
+    @classmethod
+    def reset(cls) -> None:
+        """Clear the cached task kind registry (used in tests)."""
+        cls._REGISTRY.clear()
+
     @classmethod
     def register(cls, task_id: str, kind: str) -> None:
         cls._REGISTRY[task_id] = kind

tidy3d/web/tests/conftest.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from collections.abc import Generator
+
+import pytest
+from tidy3d_frontend.tidy3d.web.core.task_core import TaskFactory
+
+
+@pytest.fixture(autouse=True)
+def clear_task_factory_registry() -> Generator[None, None, None]:
+    """Ensure TaskFactory registry is empty for each test."""
+    TaskFactory.reset()
+    TaskFactory.reset()
+    yield
+    TaskFactory.reset()