Use new TargetIds and ComponentIds

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

src/frequenz/dispatch/_actor_dispatcher.py

@@ -11,9 +11,8 @@
 from typing import Any, Awaitable, cast
 
 from frequenz.channels import Broadcast, Receiver, Sender, select
-from frequenz.client.common.microgrid.components import ComponentCategory
+from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId
 from frequenz.client.dispatch.types import TargetComponents as ClientTargetComponents
-from frequenz.client.microgrid import ComponentId
 from frequenz.sdk.actor import Actor, BackgroundService
 
 from ._dispatch import Dispatch

tests/test_frequenz_dispatch.py

@@ -17,6 +17,7 @@
 from frequenz.client.dispatch.test.client import FakeClient, to_create_params
 from frequenz.client.dispatch.test.generator import DispatchGenerator
 from frequenz.client.dispatch.types import Dispatch as BaseDispatch
+from frequenz.client.dispatch.types import TargetIds
 from pytest import fixture
 
 from frequenz.dispatch import (
@@ -564,7 +565,9 @@ async def test_multiple_dispatches_merge_running_intervals(
         generator.generate_dispatch(),
         active=True,
         duration=timedelta(seconds=30),
-        target=[1, 2] if isinstance(merge_strategy, MergeByType) else [3, 4],
+        target=TargetIds(
+            *[1, 2] if isinstance(merge_strategy, MergeByType) else [3, 4]
+        ),
         start_time=_now() + timedelta(seconds=5),
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",
@@ -573,7 +576,7 @@ async def test_multiple_dispatches_merge_running_intervals(
         generator.generate_dispatch(),
         active=True,
         duration=timedelta(seconds=10),
-        target=[3, 4],
+        target=TargetIds(3, 4),
         start_time=_now() + timedelta(seconds=10),  # starts after dispatch1
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",
@@ -641,7 +644,9 @@ async def test_multiple_dispatches_sequential_intervals_merge(
         active=True,
         duration=timedelta(seconds=5),
         # If merging by type, we want to test having different targets in dispatch 1 and 2
-        target=[3, 4] if isinstance(merge_strategy, MergeByType) else [1, 2],
+        target=TargetIds(
+            *[3, 4] if isinstance(merge_strategy, MergeByType) else [1, 2]
+        ),
         start_time=_now() + timedelta(seconds=5),
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",
@@ -651,7 +656,7 @@ async def test_multiple_dispatches_sequential_intervals_merge(
         generator.generate_dispatch(),
         active=True,
         duration=timedelta(seconds=5),
-        target=[1, 2],
+        target=TargetIds(1, 2),
         start_time=dispatch1.start_time + dispatch1.duration,
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",
@@ -706,7 +711,9 @@ async def test_at_least_one_running_filter(
         generator.generate_dispatch(),
         active=True,
         duration=timedelta(seconds=10),
-        target=[1, 2] if isinstance(merge_strategy, MergeByType) else [3, 4],
+        target=TargetIds(
+            *[1, 2] if isinstance(merge_strategy, MergeByType) else [3, 4]
+        ),
         start_time=_now() + timedelta(seconds=5),
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",
@@ -737,7 +744,7 @@ async def test_at_least_one_running_filter(
         generator.generate_dispatch(),
         active=False,
         duration=timedelta(seconds=10),
-        target=[3, 4],
+        target=TargetIds(3, 4),
         start_time=_now() + timedelta(seconds=50),
         recurrence=RecurrenceRule(),
         type="TEST_TYPE",

tests/test_managing_actor.py

@@ -14,11 +14,12 @@
 import pytest
 import time_machine
 from frequenz.channels import Broadcast, Receiver, Sender
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.dispatch import recurrence
 from frequenz.client.dispatch.recurrence import Frequency, RecurrenceRule
 from frequenz.client.dispatch.test.client import FakeClient
 from frequenz.client.dispatch.test.generator import DispatchGenerator
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.dispatch.types import TargetIds
 from frequenz.sdk.actor import Actor
 from pytest import fixture
 
@@ -31,6 +32,7 @@
     MergeByTypeTarget,
     MergeStrategy,
 )
+from frequenz.dispatch._actor_dispatcher import _convert_target_components
 from frequenz.dispatch._bg_service import DispatchScheduler
 
 
@@ -153,7 +155,7 @@ async def test_simple_start_stop(
         active=True,
         dry_run=False,
         duration=duration,
-        target=[1, 10, 15],
+        target=TargetIds(1, 10, 15),
         start_time=now,
         payload={"test": True},
         type="UNIT_TEST",
@@ -301,7 +303,7 @@ async def test_dry_run(test_env: _TestEnv, fake_time: time_machine.Coordinates)
     event = test_env.actor(1).initial_dispatch
 
     assert event.dry_run is dispatch.dry_run
-    assert event.components == dispatch.target
+    assert event.components == _convert_target_components(dispatch.target)
     assert event.options == dispatch.payload
     assert test_env.actor(1).is_running is True