🐛 More bug fixes to offline Sender class tests

Author: kzscisoft

simvue/api/objects/administrator/tenant.py

@@ -30,6 +30,7 @@ def new(
         max_runs: int = 0,
         max_data_volume: int = 0,
         offline: bool = False,
+        **_,
     ) -> Self:
         """Create a new tenant on the Simvue server.
 

simvue/sender/actions.py

@@ -1067,7 +1067,7 @@ def upload(
         _ = simvue_monitor_run
         _ = upload_status
 
-        _local_config: SimvueConfiguration = SimvueConfiguration.fetch()
+        _local_config: SimvueConfiguration = SimvueConfiguration.fetch(mode="online")
 
         if not _local_config.metrics.enable_emission_metrics:
             return

tests/functional/test_run_class.py

@@ -21,9 +21,7 @@
 import simvue
 from simvue.api.objects import Alert, Metrics
 from simvue.api.objects.grids import GridMetrics
-from simvue.eco.api_client import CO2SignalData, CO2SignalResponse
 from simvue.exception import ObjectNotFoundError, SimvueRunError
-from simvue.eco.emissions_monitor import TIME_FORMAT, CO2Monitor
 from simvue.sender import Sender
 import simvue.run as sv_run
 import simvue.client as sv_cl
@@ -1222,27 +1220,30 @@ def test_add_alerts_offline(monkeypatch) -> None:
         rule="is inside range",
     )
 
-    _id_mapping = sv_send.sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
-    _online_run = RunObject(identifier=_id_mapping.get(run.id))
+    _sender = Sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
+    _sender.upload()
+    _online_run = RunObject(identifier=_sender.id_mapping.get(run.id))
 
     # Check that there is no duplication
-    assert sorted(_online_run.alerts) == sorted([_id_mapping.get(_id) for _id in _expected_alerts])
+    assert sorted(_online_run.alerts) == sorted([_sender.id_mapping.get(_id) for _id in _expected_alerts])
 
     # Create another run without adding to run
     _id = run.create_user_alert(name=f"user_alert_{_uuid}", attach_to_run=False)
-    _id_mapping = sv_send.sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
+    _sender = Sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
+    _sender.upload()
 
     # Check alert is not added
     _online_run.refresh()
-    assert sorted(_online_run.alerts) == sorted([_id_mapping.get(_id) for _id in _expected_alerts])
+    assert sorted(_online_run.alerts) == sorted([_sender.id_mapping.get(_id) for _id in _expected_alerts])
 
     # Try adding alerts with IDs, check there is no duplication
     _expected_alerts.append(_id)
     run.add_alerts(ids=_expected_alerts)
-    _id_mapping = sv_send.sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
+    _sender = Sender(os.environ["SIMVUE_OFFLINE_DIRECTORY"], 2, 10, throw_exceptions=True)
+    _sender.upload()
 
     _online_run.refresh()
-    assert sorted(_online_run.alerts) == sorted([_id_mapping.get(_id) for _id in _expected_alerts])
+    assert sorted(_online_run.alerts) == sorted([_sender.id_mapping.get(_id) for _id in _expected_alerts])
 
     run.close()
 
@@ -1253,7 +1254,7 @@ def test_add_alerts_offline(monkeypatch) -> None:
             remove_runs=True,
             recursive=True
         )
-    for _id in [_id_mapping.get(_id) for _id in _expected_alerts]:
+    for _id in [_sender.id_mapping.get(_id) for _id in _expected_alerts]:
         client.delete_alert(_id)
 
 
@@ -1478,7 +1479,6 @@ def test_reconnect_functionality(mode, monkeypatch: pytest.MonkeyPatch) -> None:
     if mode == "offline":
         _sender = Sender(cache_directory=os.environ["SIMVUE_OFFLINE_DIRECTORY"], max_workers=2, threading_threshold=10, throw_exceptions=True)
         _sender.upload()
-        _id_mapping = _sender.id_mapping
 
     _reconnected_run = client.get_run(run_id)
     assert dict(_reconnected_run.metrics)["test_metric"]["last"] == 1

tests/unit/test_tag.py

@@ -79,7 +79,7 @@ def test_tag_modification_offline(offline_cache_setup) -> None:
 
     assert _local_data.get("name") == f"test_tag_{_uuid}"
 
-    _sender = sender(_tag._local_staging_file.parents[1], 1, 10, throw_exceptions=True)
+    _sender = Sender(_tag._local_staging_file.parents[1], 1, 10, throw_exceptions=True)
     _sender.upload(["tags"])
     _online_id = _sender.id_mapping.get(_tag.id)
     _online_tag = Tag(_online_id)

tests/unit/test_tenant.py

@@ -40,8 +40,8 @@ def test_create_tenant_offline(offline_cache_setup) -> None:
     assert _local_data.get("name") == _uuid
     assert _local_data.get("is_enabled") == True
 
-    _sender = Sender(_new_tenant._local_staging_file.parents[1], 1, 10, ["tenants"], throw_exceptions=True)
-    _sender.upload()
+    _sender = Sender(_new_tenant._local_staging_file.parents[1], 1, 10, throw_exceptions=True)
+    _sender.upload(["tenants"])
     time.sleep(1)
     _online_user = Tenant(_sender.id_mapping.get(_new_tenant.id))
     assert _online_user.name == _uuid