Skip to content

Commit 648fbc0

Browse files
committed
Fix review findings
1 parent 4b2d93a commit 648fbc0

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

kuksa-client/kuksa_client/grpc/__init__.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,9 @@ def wrapper(self, *args, **kwargs):
991991
return wrapper
992992

993993
def connect(self, target_host=None):
994+
# Reset the id mapping on each new connection to the data broker because the broker
995+
# could have been restarted and assigned new ids to paths in between.
996+
# Furthermore, the specified target host could have changed.
994997
self.path_to_id_mapping.clear()
995998
self.id_to_path_mapping.clear()
996999

@@ -1223,7 +1226,7 @@ def subscribe_target_values(
12231226
"""
12241227
try:
12251228
logger.debug("Try to subscribe actuation requests via v2")
1226-
for updates in self.v2_subscribe_batch_actuation(paths, **rpc_kwargs):
1229+
for updates in self.v2_subscribe_actuation_requests(paths, **rpc_kwargs):
12271230
yield {
12281231
update.entry.path: update.entry.actuator_target for update in updates
12291232
}
@@ -1392,7 +1395,7 @@ def subscribe(
13921395
"code": grpc.StatusCode.INVALID_ARGUMENT.value[0],
13931396
"reason": grpc.StatusCode.INVALID_ARGUMENT.value[1],
13941397
"message": ("Method subscribe supports v1, only. "
1395-
"Use v2_subscribe or v2_subscribe_batch_actuation instead."),
1398+
"Use v2_subscribe or v2_subscribe_actuation_requests instead."),
13961399
},
13971400
errors=[],
13981401
)
@@ -1437,7 +1440,7 @@ def v2_subscribe(
14371440
raise VSSClientError.from_grpc_error(exc) from exc
14381441

14391442
@check_connected
1440-
def v2_subscribe_batch_actuation(
1443+
def v2_subscribe_actuation_requests(
14411444
self, paths: Iterable[str], **rpc_kwargs
14421445
) -> Iterator[List[EntryUpdate]]:
14431446
"""

kuksa-client/kuksa_client/grpc/aio.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ async def subscribe_target_values(
341341
"""
342342
try:
343343
logger.debug("Try to subscribe actuation requests via v2")
344-
async for updates in self.v2_subscribe_batch_actuation(paths=paths, **rpc_kwargs):
344+
async for updates in self.v2_subscribe_actuation_requests(paths=paths, **rpc_kwargs):
345345
yield {
346346
update.entry.path: update.entry.actuator_target for update in updates
347347
}
@@ -515,7 +515,7 @@ async def subscribe(
515515
"code": grpc.StatusCode.INVALID_ARGUMENT.value[0],
516516
"reason": grpc.StatusCode.INVALID_ARGUMENT.value[1],
517517
"message": ("Method subscribe supports v1, only. "
518-
"Use v2_subscribe or v2_subscribe_batch_actuation instead."),
518+
"Use v2_subscribe or v2_subscribe_actuation_requests instead."),
519519
},
520520
errors=[],
521521
)
@@ -560,7 +560,7 @@ async def v2_subscribe(
560560
raise VSSClientError.from_grpc_error(exc) from exc
561561

562562
@check_connected_async_iter
563-
async def v2_subscribe_batch_actuation(
563+
async def v2_subscribe_actuation_requests(
564564
self, paths: Iterable[str], **rpc_kwargs
565565
) -> AsyncIterator[List[EntryUpdate]]:
566566
"""

kuksa-client/tests/test_grpc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ async def subscribe_response_stream(**kwargs):
683683
EntryUpdate(DataEntry('Vehicle.Chassis.SteeringWheel.Tilt',
684684
actuator_target=Datapoint(42)), (Field.ACTUATOR_TARGET,)),
685685
]
686-
mocker.patch.object(client, 'v2_subscribe_batch_actuation',
686+
mocker.patch.object(client, 'v2_subscribe_actuation_requests',
687687
side_effect=subscribe_response_stream)
688688

689689
received_updates = {}
@@ -692,7 +692,7 @@ async def subscribe_response_stream(**kwargs):
692692
]):
693693
received_updates.update(updates)
694694

695-
assert list(client.v2_subscribe_batch_actuation.call_args_list[0][1]['paths']) == [
695+
assert list(client.v2_subscribe_actuation_requests.call_args_list[0][1]['paths']) == [
696696
'Vehicle.ADAS.ABS.IsActive',
697697
'Vehicle.Chassis.SteeringWheel.Tilt',
698698
]
@@ -1846,7 +1846,7 @@ async def test_subscribe_some_entries_v2_target(
18461846
actual_responses = []
18471847

18481848
with pytest.raises(VSSClientError):
1849-
async for updates in client.v2_subscribe_batch_actuation(
1849+
async for updates in client.v2_subscribe_actuation_requests(
18501850
paths=(
18511851
path
18521852
for path in ( # generator is intentional (Iterable)

0 commit comments

Comments
 (0)