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

Re-expose Error Classes

Author: davidvonthenen

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 (