Restore websockets onto clients and fix tests

Author: twitchard

poetry.lock

@@ -68,7 +68,7 @@ pydantic = ">= 1.9.2"
 pydantic-core = ">=2.18.2"
 sounddevice = { version = "^0.4.6", optional = true}
 typing_extensions = ">= 4.0.0"
-websockets = ">=12.0"
+websockets = ">=12.0,<14.0"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "==1.13.0"

pyproject.toml

@@ -6,12 +6,7 @@
 
 from .base_client import AsyncBaseHumeClient, BaseHumeClient
 
-from .empathic_voice.socket_client import AsyncEmpathicVoiceClientWithWebsocket, EmpathicVoiceClientWithWebsocket
 from .environment import HumeClientEnvironment
-from .expression_measurement.socket_client import (
-    AsyncExpressionMeasurementClientWithWebsocket,
-    ExpressionMeasurementClientWithWebsocket
-)
 
 
 class HumeClient(BaseHumeClient):
@@ -71,14 +66,6 @@ def __init__(
             follow_redirects=follow_redirects,
             httpx_client=httpx_client,
         )
-        self.empathic_voice: EmpathicVoiceClientWithWebsocket = (
-            EmpathicVoiceClientWithWebsocket(client_wrapper=self._client_wrapper)
-        )
-        self.expression_measurement: ExpressionMeasurementClientWithWebsocket = (
-            ExpressionMeasurementClientWithWebsocket(
-                client_wrapper=self._client_wrapper
-            )
-        )
 
 
 class AsyncHumeClient(AsyncBaseHumeClient):
@@ -126,12 +113,3 @@ def __init__(
             follow_redirects=follow_redirects,
             httpx_client=httpx_client,
         )
-        self._empathic_voice: AsyncEmpathicVoiceClientWithWebsocket = (
-            AsyncEmpathicVoiceClientWithWebsocket(client_wrapper=self._client_wrapper)
-        )  #  noqa
-        self._expression_measurement: AsyncExpressionMeasurementClientWithWebsocket = (
-            AsyncExpressionMeasurementClientWithWebsocket(
-                client_wrapper=self._client_wrapper
-            )
-        )  #  noqa
-

src/hume/client.py

@@ -186,7 +186,7 @@ async def connect(
         resumed_chat_group_id: typing.Optional[str] = None,
         verbose_transcription: typing.Optional[bool] = None,
         api_key: typing.Optional[str] = None,
-        session_settings: ConnectSessionSettings,
+        session_settings: typing.Optional[ConnectSessionSettings] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.AsyncIterator[AsyncChatSocketClient]:
         """

src/hume/empathic_voice/chat/client.py

@@ -4,6 +4,8 @@
 
 import typing
 
+from hume.empathic_voice.chat.client import AsyncChatClient, ChatClient
+
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from .raw_client import AsyncRawEmpathicVoiceClient, RawEmpathicVoiceClient
 
@@ -24,6 +26,7 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._configs: typing.Optional[ConfigsClient] = None
         self._chats: typing.Optional[ChatsClient] = None
         self._chat_groups: typing.Optional[ChatGroupsClient] = None
+        self._chat: typing.Optional[ChatClient] = None
 
     @property
     def with_raw_response(self) -> RawEmpathicVoiceClient:
@@ -86,6 +89,7 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._configs: typing.Optional[AsyncConfigsClient] = None
         self._chats: typing.Optional[AsyncChatsClient] = None
         self._chat_groups: typing.Optional[AsyncChatGroupsClient] = None
+        self._chat: typing.Optional[AsyncChatClient] = None
 
     @property
     def with_raw_response(self) -> AsyncRawEmpathicVoiceClient:
@@ -137,3 +141,11 @@ def chat_groups(self):
 
             self._chat_groups = AsyncChatGroupsClient(client_wrapper=self._client_wrapper)
         return self._chat_groups
+
+    @property
+    def chat(self):
+        if self._chat is None:
+            from .chat.client import AsyncChatClient  # noqa: E402
+
+            self._chat = AsyncChatClient(client_wrapper=self._client_wrapper)
+        return self._chat

src/hume/empathic_voice/client.py

@@ -9,13 +9,15 @@
 
 if typing.TYPE_CHECKING:
     from .batch.client import AsyncBatchClient, BatchClient
+    from .stream.stream.client import StreamClient, AsyncStreamClient
 
 
 class ExpressionMeasurementClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._raw_client = RawExpressionMeasurementClient(client_wrapper=client_wrapper)
         self._client_wrapper = client_wrapper
         self._batch: typing.Optional[BatchClient] = None
+        self._stream: typing.Optional[StreamClient] = None
 
     @property
     def with_raw_response(self) -> RawExpressionMeasurementClient:
@@ -36,12 +38,20 @@ def batch(self):
             self._batch = BatchClient(client_wrapper=self._client_wrapper)
         return self._batch
 
+    @property
+    def stream(self):
+        if self._stream is None:
+            from .stream.stream.client import StreamClient  # noqa: E402
+            self._stream = StreamClient(client_wrapper=self._client_wrapper)
+        return self._batch
+
 
 class AsyncExpressionMeasurementClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._raw_client = AsyncRawExpressionMeasurementClient(client_wrapper=client_wrapper)
         self._client_wrapper = client_wrapper
         self._batch: typing.Optional[AsyncBatchClient] = None
+        self._stream: typing.Optional[AsyncStreamClient] = None
 
     @property
     def with_raw_response(self) -> AsyncRawExpressionMeasurementClient:
@@ -61,3 +71,11 @@ def batch(self):
 
             self._batch = AsyncBatchClient(client_wrapper=self._client_wrapper)
         return self._batch
+
+    @property
+    def stream(self):
+        if self._stream is None:
+            from .stream.stream.client import AsyncStreamClient  # noqa: E402
+
+            self._stream = AsyncStreamClient(client_wrapper=self._client_wrapper)
+        return self._stream

src/hume/expression_measurement/client.py

@@ -4,6 +4,8 @@
 
 import typing
 
+from hume.tts.stream_input.client import StreamInputClient
+
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from .raw_client import AsyncRawTtsClient, RawTtsClient
@@ -17,6 +19,7 @@
 
 if typing.TYPE_CHECKING:
     from .voices.client import AsyncVoicesClient, VoicesClient
+    from .stream_input.client import AsyncStreamInputClient, StreamInputClient
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
 
@@ -26,6 +29,7 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._raw_client = RawTtsClient(client_wrapper=client_wrapper)
         self._client_wrapper = client_wrapper
         self._voices: typing.Optional[VoicesClient] = None
+        self._stream_input: typing.Optional[StreamInputClient] = None
 
     @property
     def with_raw_response(self) -> RawTtsClient:
@@ -475,12 +479,20 @@ def voices(self):
             self._voices = VoicesClient(client_wrapper=self._client_wrapper)
         return self._voices
 
+    @property
+    def stream_input(self):
+        if self._stream_input is None:
+            from .stream_input.client import StreamInputClient  # noqa: E402
+            self._stream_input = StreamInputClient(client_wrapper=self._client_wrapper)
+        return self._stream_input
+
 
 class AsyncTtsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._raw_client = AsyncRawTtsClient(client_wrapper=client_wrapper)
         self._client_wrapper = client_wrapper
         self._voices: typing.Optional[AsyncVoicesClient] = None
+        self._stream_input: typing.Optional[AsyncStreamInputClient] = None
 
     @property
     def with_raw_response(self) -> AsyncRawTtsClient:
@@ -964,3 +976,13 @@ def voices(self):
 
             self._voices = AsyncVoicesClient(client_wrapper=self._client_wrapper)
         return self._voices
+
+    @property
+    def stream_input(self):
+        if self._stream_input is None:
+            from .stream_input.client import AsyncStreamInputClient
+
+            self._stream_input = AsyncStreamInputClient(
+                client_wrapper=self._client_wrapper,
+            )
+        return self._stream_input

src/hume/tts/client.py

@@ -3,18 +3,18 @@
 from typing import AsyncContextManager, AsyncIterator, Optional, Any
 from unittest.mock import Mock
 
-import websockets
+import websockets.legacy.client
+from hume.expression_measurement.stream.stream.socket_client import AsyncStreamSocketClient
 from pytest import MonkeyPatch
 
 from hume.client import AsyncHumeClient
-from hume.empathic_voice.chat.socket_client import ChatWebsocketConnection
-from hume.expression_measurement.stream.socket_client import StreamWebsocketConnection
+from hume.empathic_voice.chat.socket_client import AsyncChatSocketClient 
 
 logger = logging.getLogger(__name__)
 
 
 # pylint: disable=unused-argument
-def get_mock_connect(connection_string: str, assert_max_size: bool = False) -> Any:
+def get_mock_connect(connection_string: str) -> Any:
     def mock_connect(
         uri: str,
         extra_headers: Optional[dict[str, str]] = None,
@@ -26,8 +26,6 @@ def mock_connect(
         assert isinstance(extra_headers, dict)
         assert extra_headers.get("X-Fern-Language") == "Python"
         assert isinstance(extra_headers.get("X-Fern-SDK-Version"), str)
-        if assert_max_size:
-            assert max_size == 16777216
 
         @asynccontextmanager
         async def mock_connection() -> AsyncIterator[Mock]:
@@ -40,12 +38,12 @@ async def mock_connection() -> AsyncIterator[Mock]:
 
 async def test_chat_connect_basic(monkeypatch: MonkeyPatch) -> None:
     hu = AsyncHumeClient(api_key="0000-0000-0000-0000")
-    monkeypatch.setattr(websockets, "connect", get_mock_connect("wss://api.hume.ai/v0/evi/chat", assert_max_size=True))
+    monkeypatch.setattr(websockets.legacy.client, "connect", get_mock_connect("wss://api.hume.ai/v0/evi/chat"))
     async with hu.empathic_voice.chat.connect() as socket:
-        assert isinstance(socket, ChatWebsocketConnection)
+        assert isinstance(socket, AsyncChatSocketClient)
 
 async def test_stream_models_connect_basic(monkeypatch: MonkeyPatch) -> None:
     hu = AsyncHumeClient(api_key="0000-0000-0000-0000")
-    monkeypatch.setattr(websockets, "connect", get_mock_connect("wss://api.hume.ai/v0/stream/models"))
+    monkeypatch.setattr(websockets.legacy.client, "connect", get_mock_connect("wss://api.hume.ai/v0/stream/models"))
     async with hu.expression_measurement.stream.connect() as socket:
-        assert isinstance(socket, StreamWebsocketConnection)
+        assert isinstance(socket, AsyncStreamSocketClient)