Merge pull request #462 from dvonthenen/reexpose-error-classes

Re-expose Error Classes

deepgram/__init__.py

@@ -24,7 +24,14 @@
 
 from .client import Deepgram, DeepgramClient
 from .client import DeepgramClientOptions, ClientOptionsFromEnv
-from .client import DeepgramApiKeyError, DeepgramModuleError
+from .client import (
+    DeepgramError,
+    DeepgramTypeError,
+    DeepgramModuleError,
+    DeepgramApiError,
+    DeepgramUnknownApiError,
+)
+from .errors import DeepgramApiKeyError
 
 # listen/read client
 from .client import Listen, Read
@@ -173,7 +180,7 @@
 )
 
 # utilities
-from .audio import Microphone
+from .audio import Microphone, DeepgramMicrophoneError
 from .audio import (
     LOGGING,
     CHANNELS,

deepgram/audio/__init__.py

@@ -4,3 +4,4 @@
 
 from .microphone import Microphone
 from .microphone import LOGGING, CHANNELS, RATE, CHUNK
+from .microphone import DeepgramMicrophoneError

deepgram/audio/microphone/__init__.py

@@ -4,3 +4,4 @@
 
 from .microphone import Microphone
 from .constants import LOGGING, CHANNELS, RATE, CHUNK
+from .errors import DeepgramMicrophoneError

deepgram/client.py

@@ -28,6 +28,13 @@
     UnhandledResponse,
     ErrorResponse,
 )
+from .clients import (
+    DeepgramError,
+    DeepgramTypeError,
+    DeepgramModuleError,
+    DeepgramApiError,
+    DeepgramUnknownApiError,
+)
 
 # listen client
 from .clients import Listen, Read, Speak
@@ -178,7 +185,7 @@
 
 # client errors and options
 from .options import DeepgramClientOptions, ClientOptionsFromEnv
-from .errors import DeepgramApiKeyError, DeepgramModuleError
+from .errors import DeepgramApiKeyError
 
 # pylint: enable=unused-import
 

deepgram/clients/__init__.py

@@ -18,6 +18,8 @@
     UnhandledResponse,
     ErrorResponse,
 )
+from .common import DeepgramError, DeepgramTypeError
+from .errors import DeepgramModuleError, DeepgramApiError, DeepgramUnknownApiError
 
 from .listen_router import Listen
 from .read_router import Read

deepgram/clients/abstract_async_client.py

@@ -10,7 +10,8 @@
 
 from .helpers import append_query_params
 from ..options import DeepgramClientOptions
-from .errors import DeepgramError, DeepgramApiError, DeepgramUnknownApiError
+from .errors import DeepgramApiError, DeepgramUnknownApiError
+from .common.v1.errors import DeepgramError
 
 
 class AbstractAsyncRestClient:

deepgram/clients/abstract_sync_client.py

@@ -10,7 +10,8 @@
 
 from .helpers import append_query_params
 from ..options import DeepgramClientOptions
-from .errors import DeepgramError, DeepgramApiError, DeepgramUnknownApiError
+from .errors import DeepgramApiError, DeepgramUnknownApiError
+from .common.v1.errors import DeepgramError
 
 
 class AbstractSyncRestClient:

deepgram/clients/analyze/__init__.py

@@ -7,5 +7,3 @@
 from .client import AnalyzeOptions
 from .client import UrlSource, FileSource, AnalyzeStreamSource, AnalyzeSource
 from .client import AsyncAnalyzeResponse, AnalyzeResponse, SyncAnalyzeResponse
-
-from ...options import DeepgramClientOptions, ClientOptionsFromEnv

deepgram/clients/analyze/v1/__init__.py

@@ -11,5 +11,4 @@
     AnalyzeStreamSource,
     AnalyzeSource,
 )
-from ....options import DeepgramClientOptions, ClientOptionsFromEnv
 from .response import AsyncAnalyzeResponse, AnalyzeResponse, Sentiment

deepgram/clients/analyze/v1/async_client.py

@@ -10,7 +10,7 @@
 from ....utils import verboselogs
 from ....options import DeepgramClientOptions
 from ...abstract_async_client import AbstractAsyncRestClient
-from ..errors import DeepgramError, DeepgramTypeError
+from ...common.v1.errors import DeepgramError, DeepgramTypeError
 
 from .helpers import is_buffer_source, is_readstream_source, is_url_source
 from .options import (

deepgram/clients/analyze/v1/client.py

@@ -10,7 +10,7 @@
 from ....utils import verboselogs
 from ....options import DeepgramClientOptions
 from ...abstract_sync_client import AbstractSyncRestClient
-from ..errors import DeepgramError, DeepgramTypeError
+from ...common.v1.errors import DeepgramError, DeepgramTypeError
 
 from .helpers import is_buffer_source, is_readstream_source, is_url_source
 from .options import (

deepgram/clients/common/__init__.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 # SPDX-License-Identifier: MIT
 
+from .v1 import DeepgramError, DeepgramTypeError
+
 from .v1 import (
     TextSource as TextSourceLatest,
     BufferSource as BufferSourceLatest,
@@ -16,6 +18,5 @@
 BufferSource = BufferSourceLatest
 StreamSource = StreamSourceLatest
 
-
 Sentiment = SentimentLatest
 FileSource = FileSourceLatest

deepgram/clients/common/v1/__init__.py

@@ -4,6 +4,8 @@
 
 from .enums import Sentiment
 
+from .errors import DeepgramError, DeepgramTypeError
+
 from .options import (
     TextSource,
     BufferSource,

deepgram/clients/errors.py

@@ -3,23 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 
-class DeepgramError(Exception):
-    """
-    Exception raised for unknown errors related to the Deepgram API.
-
-    Attributes:
-        message (str): The error message describing the exception.
-    """
-
-    def __init__(self, message: str):
-        super().__init__(message)
-        self.name = "DeepgramError"
-        self.message = message
-
-    def __str__(self):
-        return f"{self.name}: {self.message}"
-
-
 class DeepgramModuleError(Exception):
     """
     Base class for exceptions raised for a missing Deepgram module.

deepgram/clients/listen/__init__.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 from .enums import LiveTranscriptionEvents
-from ...options import DeepgramClientOptions, ClientOptionsFromEnv
 
 # backward compat
 from .client import (

deepgram/clients/listen/client.py

@@ -2,9 +2,6 @@
 # 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,

deepgram/clients/listen/v1/__init__.py

@@ -2,8 +2,6 @@
 # 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,

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

@@ -19,5 +19,3 @@
     SyncPrerecordedResponse,
     Sentiment,
 )
-
-from .....options import DeepgramClientOptions, ClientOptionsFromEnv

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

@@ -10,7 +10,7 @@
 from .....utils import verboselogs
 from .....options import DeepgramClientOptions
 from ....abstract_async_client import AbstractAsyncRestClient
-from ...errors import DeepgramError, DeepgramTypeError
+from ....common.v1.errors import DeepgramError, DeepgramTypeError
 
 from .helpers import is_buffer_source, is_readstream_source, is_url_source
 from .options import (

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

@@ -10,7 +10,7 @@
 from .....utils import verboselogs
 from .....options import DeepgramClientOptions
 from ....abstract_sync_client import AbstractSyncRestClient
-from ...errors import DeepgramError, DeepgramTypeError
+from ....common.v1.errors import DeepgramError, DeepgramTypeError
 
 from .helpers import is_buffer_source, is_readstream_source, is_url_source
 from .options import (

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

@@ -5,7 +5,6 @@
 from .client import ListenWebSocketClient
 from .async_client import AsyncListenWebSocketClient
 from .options import LiveOptions, ListenWebSocketOptions
-from .....options import DeepgramClientOptions, ClientOptionsFromEnv
 from .response import (
     OpenResponse,
     LiveResultResponse,

deepgram/clients/listen/v1/websocket/async_client.py

@@ -15,7 +15,7 @@
 from .....options import DeepgramClientOptions
 from ...enums import LiveTranscriptionEvents
 from ..helpers import convert_to_websocket_url, append_query_params
-from ...errors import DeepgramError
+from ....common.v1.errors import DeepgramError
 
 from .response import (
     OpenResponse,

deepgram/clients/listen/v1/websocket/client.py

@@ -15,7 +15,7 @@
 from .....options import DeepgramClientOptions
 from ...enums import LiveTranscriptionEvents
 from ..helpers import convert_to_websocket_url, append_query_params
-from ...errors import DeepgramError
+from ....common.v1.errors import DeepgramError
 
 from .response import (
     OpenResponse,

deepgram/clients/live/__init__.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 from .v1 import LiveTranscriptionEvents
-from .v1 import DeepgramError, DeepgramTypeError, DeepgramWebsocketError
 
 from .v1 import LiveClient
 from .v1 import AsyncLiveClient

deepgram/clients/live/v1/__init__.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 from .enums import LiveTranscriptionEvents
-from .errors import DeepgramError, DeepgramTypeError, DeepgramWebsocketError
 
 from .client import LiveClient
 from .client import AsyncLiveClient

deepgram/clients/manage/__init__.py

@@ -32,4 +32,3 @@
     ModelResponse,
     ModelsResponse,
 )
-from ...options import DeepgramClientOptions, ClientOptionsFromEnv

deepgram/clients/prerecorded/__init__.py

@@ -2,8 +2,6 @@
 # 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
-
 from .v1 import PreRecordedClient
 from .v1 import AsyncPreRecordedClient
 from .v1 import PrerecordedOptions

deepgram/clients/prerecorded/v1/__init__.py

@@ -2,8 +2,6 @@
 # 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
-
 from .client import PreRecordedClient
 from .client import AsyncPreRecordedClient
 from .client import PrerecordedOptions

deepgram/clients/selfhosted/__init__.py

@@ -4,4 +4,3 @@
 
 from .client import SelfHostedClient, OnPremClient
 from .client import AsyncSelfHostedClient, AsyncOnPremClient
-from ...options import DeepgramClientOptions, ClientOptionsFromEnv

deepgram/clients/selfhosted/v1/__init__.py

@@ -4,4 +4,3 @@
 
 from .client import SelfHostedClient
 from .async_client import AsyncSelfHostedClient
-from ....options import DeepgramClientOptions, ClientOptionsFromEnv

deepgram/clients/speak/__init__.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 from .enums import SpeakWebSocketEvents
-from ...options import DeepgramClientOptions, ClientOptionsFromEnv
 
 from .client import (
     SpeakClient,  # backward compat