Skip to content

Commit e308a55

Browse files
authored
refactor: HRIConnector remove deprecated methods (#536)
1 parent 2f724c3 commit e308a55

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

src/rai_core/rai/communication/hri_connector.py

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import base64
1616
import uuid
1717
from io import BytesIO
18-
from typing import Generic, Literal, Optional, Sequence, TypeVar, get_args
18+
from typing import Generic, Literal, Optional, TypeVar
1919

2020
from langchain_core.messages import AIMessage, HumanMessage
2121
from langchain_core.messages import BaseMessage as LangchainBaseMessage
@@ -143,45 +143,11 @@ class HRIConnector(Generic[T], BaseConnector[T]):
143143
Used for sending and receiving messages between human and robot from various sources.
144144
"""
145145

146-
configured_targets: Sequence[str]
147-
configured_sources: Sequence[str]
148-
149-
def __init__(
150-
self, configured_targets: Sequence[str], configured_sources: Sequence[str]
151-
):
152-
super().__init__()
153-
self.configured_targets = configured_targets
154-
self.configured_sources = configured_sources
155-
if not hasattr(self, "__orig_bases__"):
156-
self.__orig_bases__ = {}
157-
raise HRIException(
158-
f"Error while instantiating {str(self.__class__)}: Message type T derived from HRIMessage needs to be provided e.g. Connector[MessageType]()"
159-
)
160-
self.T_class = get_args(self.__orig_bases__[-1])[0]
161-
162146
def _build_message(
163147
self,
164148
message: LangchainBaseMessage | RAIMultimodalMessage,
165149
communication_id: Optional[str] = None,
166150
seq_no: int = 0,
167151
seq_end: bool = False,
168152
) -> T:
169-
return self.T_class.from_langchain(message, communication_id, seq_no, seq_end)
170-
171-
def send_all_targets(
172-
self,
173-
message: LangchainBaseMessage | RAIMultimodalMessage,
174-
communication_id: Optional[str] = None,
175-
seq_no: int = 0,
176-
seq_end: bool = False,
177-
):
178-
for target in self.configured_targets:
179-
to_send = self._build_message(message, communication_id, seq_no, seq_end)
180-
self.send_message(to_send, target)
181-
182-
def receive_all_sources(self, timeout_sec: float = 1.0) -> dict[str, T]:
183-
ret = {}
184-
for source in self.configured_sources:
185-
received = self.receive_message(source, timeout_sec)
186-
ret[source] = received
187-
return ret
153+
return self.T_class.from_langchain(message, communication_id, seq_no, seq_end) # type: ignore

src/rai_core/rai/communication/sound_device/connector.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ def __init__(
4848
targets: list[Tuple[str, SoundDeviceConfig]],
4949
sources: list[Tuple[str, SoundDeviceConfig]],
5050
):
51-
configured_targets = [target[0] for target in targets]
52-
configured_sources = [source[0] for source in sources]
5351
self.devices: dict[str, SoundDeviceAPI] = {}
5452
self.action_handles: dict[str, Tuple[str, bool]] = {}
5553

@@ -60,7 +58,7 @@ def __init__(
6058
for dev_target, dev_config in zip(all_names, all_configs):
6159
self.configure_device(dev_target, dev_config)
6260

63-
super().__init__(configured_targets, configured_sources)
61+
super().__init__()
6462

6563
def get_audio_params(self, target: str) -> AudioParams:
6664
return AudioParams(

0 commit comments

Comments
 (0)