Merge pull request #431 from dvonthenen/missing-classes-in-init

Missing Exported Class Names

deepgram/__init__.py

@@ -46,10 +46,11 @@
     ErrorResponse,
 )
 
-# live
+# speect-to-text WS
+from .client import LiveClient, AsyncLiveClient  # backward compat
+from .client import ListenWebSocketClient, AsyncListenWebSocketClient
 from .client import LiveTranscriptionEvents
-from .client import LiveClient, AsyncLiveClient
-from .client import LiveOptions
+from .client import LiveOptions, ListenWebSocketOptions
 from .client import (
     # OpenResponse,
     LiveResultResponse,
@@ -62,11 +63,14 @@
 )
 
 # prerecorded
-from .client import PreRecordedClient, AsyncPreRecordedClient
+from .client import PreRecordedClient, AsyncPreRecordedClient  # backward compat
+from .client import ListenRESTClient, AsyncListenRESTClient
 from .client import (
+    ListenRESTOptions,
     PrerecordedOptions,
     PreRecordedStreamSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 from .client import (
     AsyncPrerecordedResponse,
@@ -91,8 +95,10 @@
 # speak
 from .client import (
     SpeakOptions,
+    SpeakRESTOptions,
+    SpeakWebSocketOptions,
     # FileSource,
-    SpeakWebSocketSource,
+    SpeakRestSource,
     SpeakSource,
 )
 from .client import SpeakWebSocketEvents

deepgram/client.py

@@ -32,9 +32,16 @@
 # listen client
 from .clients import Listen, Read, Speak
 
-# live
-from .clients import LiveClient, AsyncLiveClient
+# speech-to-text
+from .clients import LiveClient, AsyncLiveClient  # backward compat
 from .clients import (
+    ListenRESTClient,
+    AsyncListenRESTClient,
+    ListenWebSocketClient,
+    AsyncListenWebSocketClient,
+)
+from .clients import (
+    ListenWebSocketOptions,
     LiveOptions,
     LiveTranscriptionEvents,
 )
@@ -57,9 +64,11 @@
     AsyncPreRecordedClient,
 )
 from .clients import (
+    ListenRESTOptions,
     PrerecordedOptions,
     PreRecordedStreamSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 
 # prerecorded client responses
@@ -88,8 +97,10 @@
 # speak
 from .clients import (
     SpeakOptions,
+    SpeakRESTOptions,
+    SpeakWebSocketOptions,
     # FileSource,
-    SpeakWebSocketSource,
+    SpeakRestSource,
     SpeakSource,
 )
 from .clients import SpeakWebSocketEvents

deepgram/clients/__init__.py

@@ -36,14 +36,18 @@
     AsyncLiveClient,
 )
 
-# rest
+# speech-to-text rest
+from .listen import ListenRESTClient, AsyncListenRESTClient
+
 ## input
 from .listen import (
+    ListenRESTOptions,
     PrerecordedOptions,
     PreRecordedStreamSource,
     # UrlSource,
     # FileSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 
 ## output
@@ -54,9 +58,12 @@
 )
 
 
-# websocket
+# speech-to-text websocket
+from .listen import ListenWebSocketClient, AsyncListenWebSocketClient
+
 ## input
 from .listen import (
+    ListenWebSocketOptions,
     LiveOptions,
 )
 
@@ -93,18 +100,20 @@
     SyncAnalyzeResponse,
 )
 
-# speak
+# text-to-speech
 ## common
 from .speak import (
     SpeakOptions,
+    SpeakRESTOptions,
+    SpeakWebSocketOptions,
     # FileSource,
-    SpeakWebSocketSource,
+    SpeakRestSource,
     SpeakSource,
 )
 
 from .speak import SpeakWebSocketEvents
 
-## speak REST
+## text-to-speech REST
 from .speak import (
     SpeakClient,  # backward compat
     SpeakRESTClient,
@@ -116,7 +125,7 @@
     SpeakRESTResponse,
 )
 
-## speak WebSocket
+## text-to-speech WebSocket
 from .speak import (
     SpeakWebSocketClient,
     AsyncSpeakWebSocketClient,

deepgram/clients/listen/__init__.py

@@ -16,11 +16,13 @@
 # rest
 ## input
 from .client import (
+    ListenRESTOptions,
     PrerecordedOptions,
     PreRecordedStreamSource,
     UrlSource,
     FileSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 
 ## output
@@ -34,6 +36,7 @@
 # websocket
 ## input
 from .client import (
+    ListenWebSocketOptions,
     LiveOptions,
 )
 
@@ -51,6 +54,8 @@
 
 # clients
 from .client import (
+    ListenRESTClient,
+    AsyncListenRESTClient,
     ListenWebSocketClient,
     AsyncListenWebSocketClient,
 )

deepgram/clients/listen/client.py

@@ -10,13 +10,17 @@
     ListenRESTClient as ListenRESTClientLatest,
     AsyncListenRESTClient as AsyncListenRESTClientLatest,
 )
-from .v1 import PrerecordedOptions as PrerecordedOptionsLatest
+from .v1 import (
+    PrerecordedOptions as PrerecordedOptionsLatest,
+    ListenRESTOptions as ListenRESTOptionsLatest,
+)
 
 from .v1 import (
     UrlSource as UrlSourceLatest,
     FileSource as FileSourceLatest,
     PreRecordedStreamSource as PreRecordedStreamSourceLatest,
     PrerecordedSource as PrerecordedSourceLatest,
+    ListenRestSource as ListenRestSourceLatest,
 )
 from .v1 import (
     AsyncPrerecordedResponse as AsyncPrerecordedResponseLatest,
@@ -29,7 +33,10 @@
     ListenWebSocketClient as ListenWebSocketClientLatest,
     AsyncListenWebSocketClient as AsyncListenWebSocketClientLatest,
 )
-from .v1 import LiveOptions as LiveOptionsLatest, LiveOptions as SteamingOptionsLatest
+from .v1 import (
+    LiveOptions as LiveOptionsLatest,
+    ListenWebSocketOptions as ListenWebSocketOptionsLatest,
+)
 from .v1 import (
     OpenResponse as OpenResponseLatest,
     LiveResultResponse as LiveResultResponseLatest,
@@ -53,11 +60,13 @@
 
 # rest
 ## input
+ListenRESTOptions = ListenRESTOptionsLatest
 PrerecordedOptions = PrerecordedOptionsLatest
 PreRecordedStreamSource = PreRecordedStreamSourceLatest
 UrlSource = UrlSourceLatest
 FileSource = FileSourceLatest
 PrerecordedSource = PrerecordedSourceLatest
+ListenRestSource = ListenRestSourceLatest
 
 ## output
 AsyncPrerecordedResponse = AsyncPrerecordedResponseLatest
@@ -67,6 +76,7 @@
 
 # websocket
 ## input
+ListenWebSocketOptions = ListenWebSocketOptionsLatest
 LiveOptions = LiveOptionsLatest
 
 ## output
@@ -81,5 +91,7 @@
 
 
 # clients
+ListenRESTClient = ListenRESTClientLatest
+AsyncListenRESTClient = AsyncListenRESTClientLatest
 ListenWebSocketClient = ListenWebSocketClientLatest
 AsyncListenWebSocketClient = AsyncListenWebSocketClientLatest

deepgram/clients/listen/v1/__init__.py

@@ -16,12 +16,13 @@
 
 # rest
 from .rest import ListenRESTClient, AsyncListenRESTClient
-from .rest import PrerecordedOptions
+from .rest import ListenRESTOptions, PrerecordedOptions
 from .rest import (
     UrlSource,
     FileSource,
     PreRecordedStreamSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 from .rest import (
     AsyncPrerecordedResponse,
@@ -31,7 +32,7 @@
 
 # websocket
 from .websocket import ListenWebSocketClient, AsyncListenWebSocketClient
-from .websocket import LiveOptions, LiveOptions as SteamingOptions
+from .websocket import LiveOptions, ListenWebSocketOptions
 from .websocket import (
     OpenResponse,
     LiveResultResponse,

deepgram/clients/listen/v1/rest/__init__.py

@@ -5,11 +5,13 @@
 from .client import ListenRESTClient
 from .async_client import AsyncListenRESTClient
 from .options import (
+    ListenRESTOptions,
     PrerecordedOptions,
     FileSource,
     UrlSource,
     PreRecordedStreamSource,
     PrerecordedSource,
+    ListenRestSource,
 )
 from .response import (
     AsyncPrerecordedResponse,