Revert "feat(Text to Speech): Synthesize using web sockets"

Author: ehdsouza

README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/watson-developer-cloud/python-sdk.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/python-sdk)
 [![Slack](https://wdc-slack-inviter.mybluemix.net/badge.svg)](https://wdc-slack-inviter.mybluemix.net)
+[![codecov.io](https://codecov.io/github/watson-developer-cloud/python-sdk/coverage.svg?branch=master)](https://codecov.io/github/watson-developer-cloud/python-sdk?branch=master)
 [![Latest Stable Version](https://img.shields.io/pypi/v/watson-developer-cloud.svg)](https://pypi.python.org/pypi/watson-developer-cloud)
 [![CLA assistant](https://cla-assistant.io/readme/badge/watson-developer-cloud/python-sdk)](https://cla-assistant.io/watson-developer-cloud/python-sdk)
 
@@ -250,37 +251,13 @@ This would give an output of `DetailedResponse` having the structure:
 ```
 You can use the `get_result()`, `get_headers()` and get_status_code() to return the result, headers and status code respectively.
 
-## Using Websockets
-The Text to Speech service supports synthesizing text to spoken audio using web sockets with the `synthesize_using_websocket`. The Speech to Text service supports recognizing speech to text using web sockets with the `recognize_using_websocket`. These methods need a custom callback class to listen to events. Below is an example of `synthesize_using_websocket`. Note: The service accepts one request per connection.
-
-```py
-from watson_developer_cloud.websocket import SynthesizeCallback
-
-class MySynthesizeCallback(SynthesizeCallback):
-    def __init__(self):
-        SynthesizeCallback.__init__(self)
-
-    def on_audio_stream(self, audio_stream):
-        return audio_stream
-
-    def on_data(self, data):
-        return data
-
-my_callback = MySynthesizeCallback()
-service.synthesize_using_websocket('I like to pet dogs',
-                                   my_callback,
-                                   accept='audio/wav',
-                                   voice='en-US_AllisonVoice'
-                                  )
-```
-
 ## Dependencies
 
 * [requests]
 * `python_dateutil` >= 2.5.3
 * [responses] for testing
 * Following for web sockets support in speech to text
-   * `websocket-client` 0.52.0
+   * `websocket-client` 0.47.0
 
 ## Contributing
 

examples/speaker_text_to_speech.py

@@ -3,7 +3,6 @@
 import json
 from os.path import join, dirname
 from watson_developer_cloud import TextToSpeechV1
-from watson_developer_cloud.websocket import SynthesizeCallback
 
 # If service instance provides API key authentication
 # service = TextToSpeechV1(
@@ -64,36 +63,3 @@
 
 # response = service.delete_voice_model('YOUR CUSTOMIZATION ID').get_result()
 # print(response)
-
-# Synthesize using websocket. Note: The service accepts one request per connection
-file_path = join(dirname(__file__), "../resources/dog.wav")
-class MySynthesizeCallback(SynthesizeCallback):
-    def __init__(self):
-        SynthesizeCallback.__init__(self)
-        self.fd = open(file_path, 'ab')
-
-    def on_connected(self):
-        print('Connection was successful')
-
-    def on_error(self, error):
-        print('Error received: {}'.format(error))
-
-    def on_content_type(self, content_type):
-        print('Content type: {}'.format(content_type))
-
-    def on_timing_information(self, timing_information):
-        print(timing_information)
-
-    def on_audio_stream(self, audio_stream):
-        self.fd.write(audio_stream)
-
-    def on_close(self):
-        self.fd.close()
-        print('Done synthesizing. Closing the connection')
-
-my_callback = MySynthesizeCallback()
-service.synthesize_using_websocket('I like to pet dogs',
-                                   my_callback,
-                                   accept='audio/wav',
-                                   voice='en-US_AllisonVoice'
-                                  )

examples/text_to_speech_v1.py

@@ -17,4 +17,4 @@ Sphinx>=1.3.1
 bumpversion>=0.5.3
 
 # Web sockets
-websocket-client==0.52.0
+websocket-client==0.47.0

requirements-dev.txt

@@ -1,3 +1,3 @@
 requests>=2.0,<3.0
 python_dateutil>=2.5.3
-websocket-client==0.52.0
+websocket-client==0.47.0

requirements.txt

@@ -64,7 +64,7 @@ def run_tests(self):
       version=__version__,
       description='Client library to use the IBM Watson Services',
       license='Apache 2.0',
-      install_requires=['requests>=2.0, <3.0', 'python_dateutil>=2.5.3', 'websocket-client==0.52.0'],
+      install_requires=['requests>=2.0, <3.0', 'python_dateutil>=2.5.3', 'websocket-client==0.47.0'],
       tests_require=['responses', 'pytest', 'python_dotenv', 'pytest-rerunfailures', 'tox'],
       cmdclass={'test': PyTest},
       author='Jeffrey Stylos',

setup.py

@@ -97,12 +97,12 @@ def on_error(self, error):
             def on_transcription(self, transcript):
                 self.transcript = transcript
 
-        test_callback = MyRecognizeCallback()
+        testCallback = MyRecognizeCallback()
         with open(os.path.join(os.path.dirname(__file__), '../../resources/speech.wav'), 'rb') as audio_file:
             audio_source = AudioSource(audio_file, False)
-            t = threading.Thread(target=self.speech_to_text.recognize_using_websocket, args=(audio_source, "audio/l16; rate=44100", test_callback))
+            t = threading.Thread(target=self.speech_to_text.recognize_using_websocket, args=(audio_source, "audio/l16; rate=44100", testCallback))
             t.start()
             t.join()
-        assert test_callback.error is None
-        assert test_callback.transcript is not None
-        assert test_callback.transcript[0]['transcript'] == 'thunderstorms could produce large hail isolated tornadoes and heavy rain '
+        assert testCallback.error is None
+        assert testCallback.transcript is not None
+        assert testCallback.transcript[0]['transcript'] == 'thunderstorms could produce large hail isolated tornadoes and heavy rain '

test/integration/test_speech_to_text_v1.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 import unittest
 import watson_developer_cloud
-from watson_developer_cloud.websocket import SynthesizeCallback
 import pytest
 import os
 
@@ -68,34 +67,3 @@ def test_custom_words(self):
         self.text_to_speech.delete_word(customization_id, 'ACLs')
         word = self.text_to_speech.get_word(customization_id, 'MACLs').get_result()
         assert word['translation'] == 'mackles'
-
-    def test_synthesize_using_websocket(self):
-        file = 'tongue_twister.wav'
-        class MySynthesizeCallback(SynthesizeCallback):
-            def __init__(self):
-                SynthesizeCallback.__init__(self)
-                self.fd = None
-                self.error = None
-
-            def on_connected(self):
-                self.fd = open(file, 'ab')
-
-            def on_error(self, error):
-                self.error = error
-
-            def on_audio_stream(self, audio_stream):
-                self.fd.write(audio_stream)
-
-            def on_close(self):
-                self.fd.close()
-
-        test_callback = MySynthesizeCallback()
-        self.text_to_speech.synthesize_using_websocket('She sells seashells by the seashore',
-                                                       test_callback,
-                                                       accept='audio/wav',
-                                                       voice='en-GB_KateVoice'
-                                                      )
-        assert test_callback.error is None
-        assert test_callback.fd is not None
-        assert os.stat(file).st_size > 0
-        os.remove(file)

test/integration/test_text_to_speech_v1.py

@@ -31,6 +31,5 @@
 from .discovery_v1 import DiscoveryV1
 from .version import __version__
 from .speech_to_text_v1_adapter import SpeechToTextV1Adapter as SpeechToTextV1
-from .text_to_speech_adapter_v1 import TextToSpeechV1Adapter as TextToSpeechV1
 from .visual_recognition_v3_adapter import VisualRecognitionV3Adapter as VisualRecognitionV3
 from .discovery_v1_adapter import DiscoveryV1Adapter as DiscoveryV1