Merge pull request #395 from watson-developer-cloud/pylint

Address pylint issues

Author: germanattanasio

examples/conversation_v1.py

@@ -2,17 +2,18 @@
 import pyaudio
 import tempfile
 from watson_developer_cloud import SpeechToTextV1
-from watson_developer_cloud.websocket import RecognizeCallback, RecognizeListener
+from watson_developer_cloud.websocket import RecognizeCallback
 
 speech_to_text = SpeechToTextV1(
     username='YOUR SERVICE USERNAME',
     password='YOUR SERVICE PASSWORD',
     url='https://stream.watsonplatform.net/speech-to-text/api')
 
+
 # Example using websockets
 class MyRecognizeCallback(RecognizeCallback):
     def __init__(self):
-        pass
+        RecognizeCallback.__init__(self)
 
     def on_transcription(self, transcript):
         print(transcript)
@@ -35,6 +36,7 @@ def on_transcription_complete(self):
     def on_hypothesis(self, hypothesis):
         print(hypothesis)
 
+
 mycallback = MyRecognizeCallback()
 tmp = tempfile.NamedTemporaryFile()
 
@@ -45,9 +47,12 @@ def on_hypothesis(self, hypothesis):
 RECORD_SECONDS = 5
 
 audio = pyaudio.PyAudio()
-stream = audio.open(format=FORMAT, channels=CHANNELS,
-                rate=RATE, input=True,
-                frames_per_buffer=CHUNK)
+stream = audio.open(
+    format=FORMAT,
+    channels=CHANNELS,
+    rate=RATE,
+    input=True,
+    frames_per_buffer=CHUNK)
 
 print('recording....')
 with open(tmp.name, 'w') as f:
@@ -61,4 +66,5 @@ def on_hypothesis(self, hypothesis):
 print('Done recording...')
 
 with open(tmp.name) as f:
-    speech_to_text.recognize_with_websocket(audio=f, recognize_callback=mycallback)
+    speech_to_text.recognize_with_websocket(
+        audio=f, recognize_callback=mycallback)

examples/microphone-speech-to-text.py

@@ -2,7 +2,7 @@
 import json
 from os.path import join, dirname
 from watson_developer_cloud import SpeechToTextV1
-from watson_developer_cloud.websocket import RecognizeCallback, RecognizeListener
+from watson_developer_cloud.websocket import RecognizeCallback
 
 speech_to_text = SpeechToTextV1(
     username='YOUR SERVICE USERNAME',
@@ -27,7 +27,7 @@
 # Example using websockets
 class MyRecognizeCallback(RecognizeCallback):
     def __init__(self):
-        pass
+        RecognizeCallback.__init__(self)
 
     def on_transcription(self, transcript):
         print(transcript)

examples/speech_to_text_v1.py

@@ -16,4 +16,4 @@
 from dotenv import load_dotenv, find_dotenv
 
 # load the .env file containing your environment variables for the required
-load_dotenv(find_dotenv())
+load_dotenv(find_dotenv())

test/integration/__init__.py

@@ -3,79 +3,104 @@
 from unittest import TestCase
 import os
 import watson_developer_cloud
-import json
 import random
 
+
 class Discoveryv1(TestCase):
     def setUp(self):
         self.discovery = watson_developer_cloud.DiscoveryV1(
             version='2017-10-16',
             username=os.getenv('DISCOVERY_TO_TEXT_USERNAME'),
             password=os.getenv('DISCOVERY_TO_TEXT_PASSWORD'))
-        self.discovery.set_default_headers({'X-Watson-Learning-Opt-Out': '1', 'X-Watson-Test': '1'})
-        self.environment_id = 'e15f6424-f887-4f50-b4ea-68267c36fc9c' # This environment is created for integration testing
-        self.collection_id = self.discovery.list_collections(self.environment_id)['collections'][0]['collection_id']
+        self.discovery.set_default_headers({
+            'X-Watson-Learning-Opt-Out': '1',
+            'X-Watson-Test': '1'
+        })
+        self.environment_id = 'e15f6424-f887-4f50-b4ea-68267c36fc9c'  # This environment is created for integration testing
+        self.collection_id = self.discovery.list_collections(
+            self.environment_id)['collections'][0]['collection_id']
 
     def test_environments(self):
         envs = self.discovery.list_environments()
         assert envs is not None
-        env = self.discovery.get_environment(envs['environments'][0]['environment_id'])
+        env = self.discovery.get_environment(
+            envs['environments'][0]['environment_id'])
         assert env is not None
-        fields = self.discovery.list_fields(self.environment_id, self.collection_id)
+        fields = self.discovery.list_fields(self.environment_id,
+                                            self.collection_id)
         assert fields is not None
 
     def test_configurations(self):
         configs = self.discovery.list_configurations(self.environment_id)
         assert configs is not None
-        new_configuration_id = self.discovery.create_configuration(self.environment_id, 'test', 'creating new config for python sdk')['configuration_id']
+        new_configuration_id = self.discovery.create_configuration(
+            self.environment_id, 'test',
+            'creating new config for python sdk')['configuration_id']
         assert new_configuration_id is not None
-        self.discovery.get_configuration(self.environment_id, new_configuration_id)
-        updated_config = self.discovery.update_configuration(self.environment_id, new_configuration_id, 'lala')
+        self.discovery.get_configuration(self.environment_id,
+                                         new_configuration_id)
+        updated_config = self.discovery.update_configuration(
+            self.environment_id, new_configuration_id, 'lala')
         assert updated_config['name'] == 'lala'
-        deleted_config = self.discovery.delete_configuration(self.environment_id, new_configuration_id)
+        deleted_config = self.discovery.delete_configuration(
+            self.environment_id, new_configuration_id)
         assert deleted_config['status'] == 'deleted'
 
     def test_collections_and_expansions(self):
-        new_collection_id = self.discovery.create_collection(self.environment_id,
-                                                    name='Example collection for python' + random.choice('ABCDEFGHIJKLMNOPQ'),
-                                                    description="Integration test for python sdk")['collection_id']
+        new_collection_id = self.discovery.create_collection(
+            self.environment_id,
+            name='Example collection for python' +
+            random.choice('ABCDEFGHIJKLMNOPQ'),
+            description="Integration test for python sdk")['collection_id']
         assert new_collection_id is not None
         self.discovery.get_collection(self.environment_id, new_collection_id)
-        updated_collection = self.discovery.update_collection(self.environment_id, new_collection_id, name='lala')
+        updated_collection = self.discovery.update_collection(
+            self.environment_id, new_collection_id, name='lala')
         assert updated_collection['name'] == 'lala'
 
-        self.discovery.create_expansions(self.environment_id, new_collection_id, [{'input_terms': ['a'], 'expanded_terms': ['aa']}])
-        expansions = self.discovery.list_expansions(self.environment_id, new_collection_id)
-        assert len(expansions['expansions']) > 0
-        self.discovery.delete_expansions(self.environment_id, new_collection_id)
+        self.discovery.create_expansions(self.environment_id,
+                                         new_collection_id, [{
+                                             'input_terms': ['a'],
+                                             'expanded_terms': ['aa']
+                                         }])
+        expansions = self.discovery.list_expansions(self.environment_id,
+                                                    new_collection_id)
+        assert expansions['expansions']
+        self.discovery.delete_expansions(self.environment_id,
+                                         new_collection_id)
 
-        deleted_collection = self.discovery.delete_collection(self.environment_id, new_collection_id)
+        deleted_collection = self.discovery.delete_collection(
+            self.environment_id, new_collection_id)
         assert deleted_collection['status'] == 'deleted'
 
     def test_documents(self):
         with open(os.path.join(os.path.dirname(__file__), '../../resources/simple.html'), 'r') as fileinfo:
-            add_doc = self.discovery.add_document(environment_id=self.environment_id,
-                                         collection_id=self.collection_id,
-                                         file=fileinfo)
-        add_doc['document_id'] is not None
+            add_doc = self.discovery.add_document(
+                environment_id=self.environment_id,
+                collection_id=self.collection_id,
+                file=fileinfo)
+        assert add_doc['document_id'] is not None
 
-        doc_status = self.discovery.get_document_status(self.environment_id, self.collection_id, add_doc['document_id'])
+        doc_status = self.discovery.get_document_status(
+            self.environment_id, self.collection_id, add_doc['document_id'])
         assert doc_status is not None
 
         with open(os.path.join(os.path.dirname(__file__), '../../resources/simple.html'), 'r') as fileinfo:
-            update_doc = self.discovery.update_document(self.environment_id,
-                                                        self.collection_id,
-                                                        add_doc['document_id'],
-                                                        file=fileinfo,
-                                                        filename='newname.html')
+            update_doc = self.discovery.update_document(
+                self.environment_id,
+                self.collection_id,
+                add_doc['document_id'],
+                file=fileinfo,
+                filename='newname.html')
         assert update_doc is not None
-        delete_doc = self.discovery.delete_document(self.environment_id, self.collection_id, add_doc['document_id'])
+        delete_doc = self.discovery.delete_document(
+            self.environment_id, self.collection_id, add_doc['document_id'])
         assert delete_doc['status'] == 'deleted'
 
-
     def test_queries(self):
-        query_results = self.discovery.query(self.environment_id,
-                                        self.collection_id,
-                                        filter='extracted_metadata.sha1::9181d244*',
-                                        return_fields='extracted_metadata.sha1')
-        assert query_results is not None
+        query_results = self.discovery.query(
+            self.environment_id,
+            self.collection_id,
+            filter='extracted_metadata.sha1::9181d244*',
+            return_fields='extracted_metadata.sha1')
+        assert query_results is not None

test/integration/test_integration_discovery_v1.py

@@ -1,16 +1,19 @@
 from unittest import TestCase
-import pytest
 import os
 import watson_developer_cloud
-from watson_developer_cloud.speech_to_text_v1 import SpeechRecognitionResults
 
 
 class TestSpeechToTextV1(TestCase):
     def setUp(self):
         self.speech_to_text = watson_developer_cloud.SpeechToTextV1(
             username=os.getenv('SPEECH_TO_TEXT_USERNAME'),
             password=os.getenv('SPEECH_TO_TEXT_PASSWORD'))
-        self.speech_to_text.set_default_headers({'X-Watson-Learning-Opt-Out': '1', 'X-Watson-Test': '1'})
+        self.speech_to_text.set_default_headers({
+            'X-Watson-Learning-Opt-Out':
+            '1',
+            'X-Watson-Test':
+            '1'
+        })
         self.custom_models = self.speech_to_text.list_language_models()
         self.create_custom_model = self.speech_to_text.create_language_model(
             name="integration_test_model",
@@ -37,10 +40,7 @@ def test_create_custom_model(self):
             self.custom_models['customizations']) >= 1
 
     def test_recognize(self):
-        with open(
-                os.path.join(
-                    os.path.dirname(__file__), '../../resources/speech.wav'),
-                'rb') as audio_file:
+        with open(os.path.join(os.path.dirname(__file__), '../../resources/speech.wav'), 'rb') as audio_file:
             output = self.speech_to_text.recognize(
                 audio=audio_file, content_type='audio/l16; rate=44100')
         assert output['results'][0]['alternatives'][0][
@@ -70,4 +70,5 @@ def test_acoustic_model(self):
         self.speech_to_text.reset_acoustic_model(
             get_acoustic_model['customization_id'])
 
-        self.speech_to_text.delete_acoustic_model(get_acoustic_model['customization_id'])
+        self.speech_to_text.delete_acoustic_model(
+            get_acoustic_model['customization_id'])

test/integration/test_integration_speech_to_text_v1.py

@@ -1,12 +1,17 @@
-import pytest
+
 import unittest
 import watson_developer_cloud
-import os
+
 
 class TestIntegrationTextToSpeechV1(unittest.TestCase):
     def setUp(self):
         self.text_to_speech = watson_developer_cloud.TextToSpeechV1()
-        self.text_to_speech.set_default_headers({'X-Watson-Learning-Opt-Out': '1', 'X-Watson-Test': '1'})
+        self.text_to_speech.set_default_headers({
+            'X-Watson-Learning-Opt-Out':
+            '1',
+            'X-Watson-Test':
+            '1'
+        })
         self.original_customizations = self.text_to_speech.list_voice_models()
         self.created_customization = self.text_to_speech.create_voice_model(
             name="test_integration_customization",
@@ -27,11 +32,11 @@ def test_speak(self):
             text="my voice is my passport",
             accept='audio/wav',
             voice='en-US_AllisonVoice')
-        output.content is not None
+        assert output.content is not None
 
     def test_pronunciation(self):
         output = self.text_to_speech.get_pronunciation('hello')
-        output['pronunciation'] is not None
+        assert output['pronunciation'] is not None
 
     def test_customizations(self):
         old_length = len(self.original_customizations['customizations'])
@@ -44,16 +49,9 @@ def test_custom_words(self):
         words = self.text_to_speech.list_words(customization_id)['words']
         assert len(words) == 0
         self.text_to_speech.add_word(
-            customization_id,
-            word="ACLs",
-            translation="ackles")
-
-        words = [
-            {
-            "word": "MACLs",
-            "translation": "mackles"
-            }
-        ]
+            customization_id, word="ACLs", translation="ackles")
+
+        words = [{"word": "MACLs", "translation": "mackles"}]
 
         self.text_to_speech.add_words(customization_id, words)
         self.text_to_speech.delete_word(customization_id, 'ACLs')

test/integration/test_integration_text_to_speech_v1.py

@@ -6,29 +6,46 @@
 import json
 
 pytestmark = pytest.mark.skip('Run These Manually, they are destructive')
-class IntegrationTestVisualRecognitionV3(TestCase):
 
+
+class IntegrationTestVisualRecognitionV3(TestCase):
     def setUp(self):
-        self.visual_recognition = watson_developer_cloud.VisualRecognitionV3('2016-05-20', api_key=os.environ.get(
-            'YOUR API KEY'))
-        self.visual_recognition.set_default_headers({'X-Watson-Learning-Opt-Out': '1', 'X-Watson-Test': '1'})
+        self.visual_recognition = watson_developer_cloud.VisualRecognitionV3(
+            '2016-05-20', api_key=os.environ.get('YOUR API KEY'))
+        self.visual_recognition.set_default_headers({
+            'X-Watson-Learning-Opt-Out':
+            '1',
+            'X-Watson-Test':
+            '1'
+        })
 
     def test_classify(self):
         car_path = join(dirname(__file__), '../../resources/cars.zip')
         with open(car_path, 'rb') as images_file:
-            parameters = json.dumps({'threshold': 0.1, 'classifier_ids': ['CarsvsTrucks_1479118188', 'default']})
-            car_results = self.visual_recognition.classify(images_file=images_file,
-                                                        parameters=parameters)
+            parameters = json.dumps({
+                'threshold':
+                0.1,
+                'classifier_ids': ['CarsvsTrucks_1479118188', 'default']
+            })
+            car_results = self.visual_recognition.classify(
+                images_file=images_file, parameters=parameters)
         assert car_results is not None
 
     def test_detect_faces(self):
-        output = self.visual_recognition.detect_faces(parameters=json.dumps({'url': 'https://www.ibm.com/ibm/ginni/images/ginni_bio_780x981_v4_03162016.jpg'}))
+        output = self.visual_recognition.detect_faces(
+            parameters=json.dumps({
+                'url':
+                'https://www.ibm.com/ibm/ginni/images/ginni_bio_780x981_v4_03162016.jpg'
+            }))
         assert output is not None
 
     def test_custom_classifier(self):
         with open(os.path.join(os.path.dirname(__file__), '../../resources/cars.zip'), 'rb') as cars, \
             open(os.path.join(os.path.dirname(__file__), '../../resources/trucks.zip'), 'rb') as trucks:
-            classifier = self.visual_recognition.create_classifier('Cars vs Trucks', cars_positive_examples=cars, negative_examples=trucks)
+            classifier = self.visual_recognition.create_classifier(
+                'Cars vs Trucks',
+                cars_positive_examples=cars,
+                negative_examples=trucks)
 
         assert classifier is not None
 

test/integration/test_integration_visual_recognition.py

@@ -14,4 +14,4 @@
 from dotenv import load_dotenv, find_dotenv
 
 # load the .env file containing your environment variables for the required
-load_dotenv(find_dotenv())
+load_dotenv(find_dotenv())