fix listen

Author: davidvonthenen

deepgram/__init__.py

@@ -88,6 +88,7 @@
  SpeakWebSocketSource,
  SpeakSource,
 )
+from .client import SpeakWebSocketEvents
 
 ## speak REST
 from .client import (

deepgram/client.py

@@ -83,6 +83,7 @@
  SpeakWebSocketSource,
  SpeakSource,
 )
+from .clients import SpeakWebSocketEvents
 
 ## speak REST
 from .clients import (

deepgram/clients/__init__.py

@@ -12,16 +12,49 @@
  Sentiment,
 )
 
-# listen
 from .listen_router import Listen
 from .read_router import Read
 from .speak_router import Speak
 
-# live
-from .live import LiveClient, AsyncLiveClient
-from .live import LiveOptions
-from .live import LiveTranscriptionEvents
+# listen
+from .listen import LiveTranscriptionEvents
+
+## backward compat
+from .prerecorded import (
+ PreRecordedClient,
+ AsyncPreRecordedClient,
+)
 from .live import (
+ LiveClient,
+ AsyncLiveClient,
+)
+
+# rest
+## input
+from .listen import (
+ PrerecordedOptions,
+ PreRecordedStreamSource,
+ UrlSource,
+ FileSource,
+ PrerecordedSource,
+)
+
+## output
+from .listen import (
+ AsyncPrerecordedResponse,
+ PrerecordedResponse,
+ SyncPrerecordedResponse,
+)
+
+
+# websocket
+## input
+from .listen import (
+ LiveOptions,
+)
+
+## output
+from .listen import (
  OpenResponse,
  LiveResultResponse,
  MetadataResponse,
@@ -32,19 +65,13 @@
  UnhandledResponse,
 )
 
-# prerecorded
-from .prerecorded import PreRecordedClient, AsyncPreRecordedClient
-from .prerecorded import PrerecordedOptions
-from .prerecorded import (
- PreRecordedStreamSource,
- PrerecordedSource,
-)
-from .prerecorded import (
- AsyncPrerecordedResponse,
- PrerecordedResponse,
- SyncPrerecordedResponse,
+## clients
+from .listen import (
+ ListenWebSocketClient,
+ AsyncListenWebSocketClient,
 )
 
+
 # read
 from .analyze import ReadClient, AsyncReadClient
 from .analyze import AnalyzeClient, AsyncAnalyzeClient
@@ -60,14 +87,17 @@
 )
 
 # speak
+## common
 from .speak import (
  SpeakOptions,
  FileSource,
  SpeakWebSocketSource,
  SpeakSource,
 )
 
-# speak REST
+from .speak import SpeakWebSocketEvents
+
+## speak REST
 from .speak import (
  SpeakClient, # backward compat
  SpeakRESTClient,
@@ -79,7 +109,7 @@
  SpeakRESTResponse,
 )
 
-# speak WebSocket
+## speak WebSocket
 from .speak import (
  SpeakWebSocketClient,
  AsyncSpeakWebSocketClient,

deepgram/clients/listen/__init__.py

@@ -0,0 +1,56 @@
+# Copyright 2023-2024 Deepgram SDK contributors. All Rights Reserved.
+# Use of this source code is governed by a MIT license that can be found in the LICENSE file.
+# SPDX-License-Identifier: MIT
+
+from .enums import LiveTranscriptionEvents
+from ...options import DeepgramClientOptions, ClientOptionsFromEnv
+
+# backward compat
+from .client import (
+ PreRecordedClient,
+ AsyncPreRecordedClient,
+ LiveClient,
+ AsyncLiveClient,
+)
+
+# rest
+## input
+from .client import (
+ PrerecordedOptions,
+ PreRecordedStreamSource,
+ UrlSource,
+ FileSource,
+ PrerecordedSource,
+)
+
+## output
+from .client import (
+ AsyncPrerecordedResponse,
+ PrerecordedResponse,
+ SyncPrerecordedResponse,
+)
+
+
+# websocket
+## input
+from .client import (
+ LiveOptions,
+)
+
+## output
+from .client import (
+ OpenResponse,
+ LiveResultResponse,
+ MetadataResponse,
+ SpeechStartedResponse,
+ UtteranceEndResponse,
+ CloseResponse,
+ ErrorResponse,
+ UnhandledResponse,
+)
+
+# clients
+from .client import (
+ ListenWebSocketClient,
+ AsyncListenWebSocketClient,
+)

deepgram/clients/listen/client.py

@@ -0,0 +1,85 @@
+# Copyright 2023-2024 Deepgram SDK contributors. All Rights Reserved.
+# Use of this source code is governed by a MIT license that can be found in the LICENSE file.
+# SPDX-License-Identifier: MIT
+
+
+from ...options import DeepgramClientOptions, ClientOptionsFromEnv
+
+# rest
+from .v1 import (
+ ListenRESTClient as ListenRESTClientLatest,
+ AsyncListenRESTClient as AsyncListenRESTClientLatest,
+)
+from .v1 import PrerecordedOptions as PrerecordedOptionsLatest
+
+from .v1 import (
+ UrlSource as UrlSourceLatest,
+ FileSource as FileSourceLatest,
+ PreRecordedStreamSource as PreRecordedStreamSourceLatest,
+ PrerecordedSource as PrerecordedSourceLatest,
+)
+from .v1 import (
+ AsyncPrerecordedResponse as AsyncPrerecordedResponseLatest,
+ PrerecordedResponse as PrerecordedResponseLatest,
+ SyncPrerecordedResponse as SyncPrerecordedResponseLatest,
+)
+
+# websocket
+from .v1 import (
+ ListenWebSocketClient as ListenWebSocketClientLatest,
+ AsyncListenWebSocketClient as AsyncListenWebSocketClientLatest,
+)
+from .v1 import LiveOptions as LiveOptionsLatest, LiveOptions as SteamingOptionsLatest
+from .v1 import (
+ OpenResponse as OpenResponseLatest,
+ LiveResultResponse as LiveResultResponseLatest,
+ MetadataResponse as MetadataResponseLatest,
+ SpeechStartedResponse as SpeechStartedResponseLatest,
+ UtteranceEndResponse as UtteranceEndResponseLatest,
+ CloseResponse as CloseResponseLatest,
+ ErrorResponse as ErrorResponseLatest,
+ UnhandledResponse as UnhandledResponseLatest,
+)
+
+# The vX/client.py points to the current supported version in the SDK.
+# Older versions are supported in the SDK for backwards compatibility.
+
+
+# backward compat
+PreRecordedClient = ListenRESTClientLatest
+AsyncPreRecordedClient = AsyncListenRESTClientLatest
+LiveClient = ListenWebSocketClientLatest
+AsyncLiveClient = ListenWebSocketClientLatest
+
+# rest
+## input
+PrerecordedOptions = PrerecordedOptionsLatest
+PreRecordedStreamSource = PreRecordedStreamSourceLatest
+UrlSource = UrlSourceLatest
+FileSource = FileSourceLatest
+PrerecordedSource = PrerecordedSourceLatest
+
+## output
+AsyncPrerecordedResponse = AsyncPrerecordedResponseLatest
+PrerecordedResponse = PrerecordedResponseLatest
+SyncPrerecordedResponse = SyncPrerecordedResponseLatest
+
+
+# websocket
+## input
+LiveOptions = LiveOptionsLatest
+
+## output
+OpenResponse = OpenResponseLatest
+LiveResultResponse = LiveResultResponseLatest
+MetadataResponse = MetadataResponseLatest
+SpeechStartedResponse = SpeechStartedResponseLatest
+UtteranceEndResponse = UtteranceEndResponseLatest
+CloseResponse = CloseResponseLatest
+ErrorResponse = ErrorResponseLatest
+UnhandledResponse = UnhandledResponseLatest
+
+
+# clients
+ListenWebSocketClient = ListenWebSocketClientLatest
+AsyncListenWebSocketClient = AsyncListenWebSocketClientLatest

deepgram/clients/live/enums.py renamed to deepgram/clients/listen/enums.py

@@ -20,6 +20,23 @@ def __str__(self):
  return f"{self.name}: {self.message}"
 
 
+class DeepgramTypeError(Exception):
+ """
+ Exception raised for unknown errors related to unknown Types for Transcription.
+
+ Attributes:
+ message (str): The error message describing the exception.
+ """
+
+ def __init__(self, message: str):
+ super().__init__(message)
+ self.name = "DeepgramTypeError"
+ self.message = message
+
+ def __str__(self):
+ return f"{self.name}: {self.message}"
+
+
 class DeepgramWebsocketError(Exception):
  """
  Exception raised for known errors related to Websocket library.

deepgram/clients/live/errors.py renamed to deepgram/clients/listen/errors.py

@@ -0,0 +1,44 @@
+# Copyright 2024 Deepgram SDK contributors. All Rights Reserved.
+# Use of this source code is governed by a MIT license that can be found in the LICENSE file.
+# SPDX-License-Identifier: MIT
+
+from ....options import DeepgramClientOptions, ClientOptionsFromEnv
+
+# backward compat
+from .rest import (
+ ListenRESTClient as PreRecordedClient,
+ AsyncListenRESTClient as AsyncPreRecordedClient,
+)
+from .websocket import (
+ ListenWebSocketClient as LiveClient,
+ AsyncListenWebSocketClient as AsyncLiveClient,
+)
+
+# rest
+from .rest import ListenRESTClient, AsyncListenRESTClient
+from .rest import PrerecordedOptions
+from .rest import (
+ UrlSource,
+ FileSource,
+ PreRecordedStreamSource,
+ PrerecordedSource,
+)
+from .rest import (
+ AsyncPrerecordedResponse,
+ PrerecordedResponse,
+ SyncPrerecordedResponse,
+)
+
+# websocket
+from .websocket import ListenWebSocketClient, AsyncListenWebSocketClient
+from .websocket import LiveOptions, LiveOptions as SteamingOptions
+from .websocket import (
+ OpenResponse,
+ LiveResultResponse,
+ MetadataResponse,
+ SpeechStartedResponse,
+ UtteranceEndResponse,
+ CloseResponse,
+ ErrorResponse,
+ UnhandledResponse,
+)

deepgram/clients/listen/v1/__init__.py

@@ -0,0 +1,21 @@
+# Copyright 2023-2024 Deepgram SDK contributors. All Rights Reserved.
+# Use of this source code is governed by a MIT license that can be found in the LICENSE file.
+# SPDX-License-Identifier: MIT
+
+from .client import ListenRESTClient
+from .async_client import AsyncListenRESTClient
+from .options import (
+ PrerecordedOptions,
+ FileSource,
+ UrlSource,
+ PreRecordedStreamSource,
+ PrerecordedSource,
+)
+from .response import (
+ AsyncPrerecordedResponse,
+ PrerecordedResponse,
+ SyncPrerecordedResponse,
+ Sentiment,
+)
+
+from .....options import DeepgramClientOptions, ClientOptionsFromEnv