Merge pull request #316 from dvonthenen/audit-legacy-v2-syntax

Examine Legacy Syntax and Verify/Identify Issues

Author: davidvonthenen

deepgram/__init__.py

@@ -28,11 +28,11 @@
 # prerecorded
 from .client import PreRecordedClient, AsyncPreRecordedClient
 from .client import (
-    PrerecordedSource,
     FileSource,
+    PrerecordedSource,
     UrlSource,
     BufferSource,
-    ReadStreamSource,
+    StreamSource,
     PrerecordedOptions,
     Sentiment,
 )
@@ -49,7 +49,7 @@
     TextSource,
     UrlSource,
     BufferSource,
-    AnalyzeStreamSource,
+    StreamSource,
     AnalyzeOptions,
     Sentiment,
 )

deepgram/client.py

@@ -29,11 +29,11 @@
 # prerecorded
 from .clients import PreRecordedClient, AsyncPreRecordedClient
 from .clients import (
-    PrerecordedSource,
     FileSource,
+    PrerecordedSource,
     UrlSource,
     BufferSource,
-    ReadStreamSource,
+    StreamSource,
     PrerecordedOptions,
     Sentiment,
 )
@@ -52,7 +52,7 @@
     TextSource,
     UrlSource,
     BufferSource,
-    AnalyzeStreamSource,
+    StreamSource,
     AnalyzeOptions,
     Sentiment,
 )

deepgram/clients/__init__.py

@@ -23,11 +23,11 @@
 from .prerecorded import PrerecordedOptions
 from .prerecorded import Sentiment
 from .prerecorded import (
-    PrerecordedSource,
     FileSource,
+    PrerecordedSource,
     UrlSource,
     BufferSource,
-    ReadStreamSource,
+    StreamSource,
 )
 from .prerecorded import (
     AsyncPrerecordedResponse,
@@ -44,7 +44,7 @@
     TextSource,
     UrlSource,
     BufferSource,
-    AnalyzeStreamSource,
+    StreamSource,
 )
 from .analyze import (
     AsyncAnalyzeResponse,

deepgram/clients/analyze/__init__.py

@@ -5,14 +5,14 @@
 from .client import AnalyzeClient
 from .client import AsyncAnalyzeClient
 from .client import AnalyzeOptions
-from .client import Sentiment
-from .source import (
-    AnalyzeSource,
-    TextSource,
+from .client import (
     UrlSource,
     BufferSource,
-    AnalyzeStreamSource,
+    StreamSource,
+    AnalyzeSource,
+    TextSource,
 )
+from .client import Sentiment
 from .client import AsyncAnalyzeResponse, AnalyzeResponse, SyncAnalyzeResponse
 
 from ...options import DeepgramClientOptions

deepgram/clients/analyze/client.py

@@ -2,10 +2,18 @@
 # Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 # SPDX-License-Identifier: MIT
 
+from typing import Union
+
 from .v1.client import AnalyzeClient as AnalyzeClientLatest
 from .v1.async_client import AsyncAnalyzeClient as AsyncAnalyzeClientLatest
-from .v1.options import AnalyzeOptions as AnalyzeOptionsLatest
-from .source import AnalyzeSource, TextSource, UrlSource
+from .v1.options import (
+    AnalyzeOptions as AnalyzeOptionsLatest,
+    StreamSource as StreamSourceLatest,
+    BufferSource as BufferSourceLatest,
+    UrlSource as UrlSourceLatest,
+    AnalyzeSource as AnalyzeSourceLatest,
+    TextSource as TextSourceLatest,
+)
 from .v1.response import (
     SyncAnalyzeResponse as SyncAnalyzeResponseLatest,
     AnalyzeResponse as AnalyzeResponseLatest,
@@ -28,6 +36,37 @@ class AnalyzeOptions(AnalyzeOptionsLatest):
     pass
 
 
+class StreamSource(StreamSourceLatest):
+    """
+    Please see StreamSourceLatest for details
+    """
+
+    pass
+
+
+class BufferSource(BufferSourceLatest):
+    """
+    Please see BufferSourceLatest for details
+    """
+
+    pass
+
+
+class UrlSource(UrlSourceLatest):
+    """
+    Please see UrlSourceLatest for details
+    """
+
+    pass
+
+
+AnalyzeSource = AnalyzeSourceLatest
+TextSource = TextSourceLatest
+
+
+# responses
+
+
 class AsyncAnalyzeResponse(AsyncAnalyzeResponseLatest):
     """
     Please see AnalyzeResponseLatest for details

deepgram/clients/analyze/source.py

@@ -4,7 +4,14 @@
 
 from .client import AnalyzeClient
 from .async_client import AsyncAnalyzeClient
-from .options import AnalyzeOptions
+from .options import (
+    AnalyzeOptions,
+    UrlSource,
+    BufferSource,
+    StreamSource,
+    TextSource,
+    AnalyzeSource,
+)
 from ....options import DeepgramClientOptions
 from .response import AsyncAnalyzeResponse, AnalyzeResponse
 from ..enums import Sentiment