Remove unneeded mocks, and PR feedback.

Author: daspecster

speech/google/cloud/speech/_gax.py

@@ -14,13 +14,14 @@
 
 """GAX/GAPIC module for managing Speech API requests."""
 
-from google.longrunning import operations_grpc
+
+from google.cloud._helpers import make_secure_stub
+from google.cloud.connection import DEFAULT_USER_AGENT
+
+from google.cloud.speech.alternative import Alternative
+from google.cloud.speech.operation import Operation
 
 from google.cloud.gapic.speech.v1beta1.speech_api import SpeechApi
-from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import (
-    AsyncRecognizeMetadata)
-from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import (
-    AsyncRecognizeResponse)
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import SpeechContext
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import RecognitionConfig
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import RecognitionAudio
@@ -29,24 +30,21 @@
 from google.cloud.grpc.speech.v1beta1.cloud_speech_pb2 import (
     StreamingRecognizeRequest)
 
-from google.cloud.speech.alternative import Alternative
-from google.cloud._helpers import make_secure_stub
-from google.cloud.connection import DEFAULT_USER_AGENT
-from google.cloud.speech.operation import Operation
-from google.cloud.operation import register_type
-
+from google.longrunning import operations_grpc
 
 OPERATIONS_API_HOST = 'speech.googleapis.com'
 
-register_type(AsyncRecognizeMetadata)
-register_type(AsyncRecognizeResponse)
-
 
 class GAPICSpeechAPI(object):
     """Manage calls through GAPIC wrappers to the Speech API."""
     def __init__(self, client=None):
         self._client = client
         self._gapic_api = SpeechApi()
+        self._operations_stub = make_secure_stub(
+            self._client.connection.credentials,
+            DEFAULT_USER_AGENT,
+            operations_grpc.OperationsStub,
+            OPERATIONS_API_HOST)
 
     def async_recognize(self, sample, language_code=None,
                         max_alternatives=None, profanity_filter=None,
@@ -88,7 +86,7 @@ def async_recognize(self, sample, language_code=None,
                                and phrases. This can also be used to add new
                                words to the vocabulary of the recognizer.
 
-        :rtype: :class:`~google.cloud.operation.Opeartion`
+        :rtype: :class:`~google.cloud.speech.operation.Operation`
         :returns: Instance of ``Operation`` to poll for results.
         """
         config = RecognitionConfig(
@@ -102,12 +100,7 @@ def async_recognize(self, sample, language_code=None,
         api = self._gapic_api
         response = api.async_recognize(config=config, audio=audio)
 
-        self._client._operations_stub = make_secure_stub(
-            self._client.connection.credentials,
-            DEFAULT_USER_AGENT,
-            operations_grpc.OperationsStub,
-            OPERATIONS_API_HOST)
-        return Operation.from_pb(response, self._client)
+        return Operation.from_pb(response, self)
 
     def sync_recognize(self, sample, language_code=None, max_alternatives=None,
                        profanity_filter=None, speech_context=None):

speech/unit_tests/test_client.py

@@ -21,6 +21,26 @@ class TestClient(unittest.TestCase):
     AUDIO_SOURCE_URI = 'gs://sample-bucket/sample-recording.flac'
     AUDIO_CONTENT = '/9j/4QNURXhpZgAASUkq'
 
+    @staticmethod
+    def _make_result(transcript, confidence):
+        from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+        return cloud_speech_pb2.SpeechRecognitionResult(
+            alternatives=[
+                cloud_speech_pb2.SpeechRecognitionAlternative(
+                    transcript=transcript,
+                    confidence=confidence,
+                ),
+            ],
+        )
+
+    def _make_sync_response(self, *results):
+        from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+        response = cloud_speech_pb2.SyncRecognizeResponse(
+            results=results,
+        )
+
+        return response
+
     def _getTargetClass(self):
         from google.cloud.speech.client import Client
 
@@ -199,7 +219,9 @@ def test_sync_recognize_with_empty_results_gax(self):
         credentials = _Credentials()
         client = self._makeOne(credentials=credentials, use_gax=True)
         client.connection = _Connection()
-        _MockGAPICSpeechAPI._results = []
+        client.connection.credentials = credentials
+
+        _MockGAPICSpeechAPI._response = self._make_sync_response()
 
         with self.assertRaises(ValueError):
             with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
@@ -216,18 +238,20 @@ def test_sync_recognize_with_gax(self):
         creds = _Credentials()
         client = self._makeOne(credentials=creds, use_gax=True)
         client.connection = _Connection()
+        client.connection.credentials = creds
         client._speech_api = None
-        _MockGAPICSpeechAPI._results = [_MockGAPICSyncResult]
+        transcript = 'testing 1 2 3'
+        confidence = 0.9224355
+        result = self._make_result(transcript, confidence)
+        _MockGAPICSpeechAPI._response = self._make_sync_response(result)
 
         with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
             sample = client.sample(source_uri=self.AUDIO_SOURCE_URI,
                                    encoding=speech.Encoding.FLAC,
                                    sample_rate=self.SAMPLE_RATE)
             results = client.sync_recognize(sample)
-            self.assertEqual(results[0].transcript,
-                             _MockGAPICAlternative.transcript)
-            self.assertEqual(results[0].confidence,
-                             _MockGAPICAlternative.confidence)
+            self.assertEqual(results[0].transcript, transcript)
+            self.assertEqual(results[0].confidence, confidence)
 
     def test_async_supported_encodings(self):
         from google.cloud import speech
@@ -270,6 +294,7 @@ def test_async_recognize_with_gax(self):
         from google.cloud.speech import _gax as MUT
         from google.cloud._testing import _Monkey
         from google.cloud import speech
+        from google.cloud.speech.operation import Operation
 
         credentials = _Credentials()
         client = self._makeOne(credentials=credentials)
@@ -282,6 +307,7 @@ def test_async_recognize_with_gax(self):
         with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):
             operation = client.async_recognize(sample)
 
+        self.assertIsInstance(operation, Operation)
         self.assertFalse(operation.complete)
         self.assertIsNone(operation.response)
 
@@ -316,32 +342,28 @@ def test_speech_api_preset(self):
         self.assertIs(client.speech_api, fake_api)
 
 
-class _MockGAPICAlternative(object):
-    transcript = 'testing 1 2 3'
-    confidence = 0.95234356
-
-
-class _MockGAPICMetadata(object):
-    type_url = None
-
-
-class _MockGAPICSyncResult(object):
-    alternatives = [_MockGAPICAlternative()]
-
-
-class _MockGAPICSpeechResponse(object):
-    error = None
-    endpointer_type = None
-    name = None
-    metadata = _MockGAPICMetadata()
-    results = []
-    result_index = 0
+# class _MockGAPICAlternative(object):
+#     transcript = 'testing 1 2 3'
+#     confidence = 0.95234356
+#
+#
+# class _MockGAPICSyncResult(object):
+#     alternatives = [_MockGAPICAlternative()]
+#
+#
+# class _MockGAPICSpeechResponse(object):
+#     error = None
+#     endpointer_type = None
+#     name = None
+#     metadata = _MockGAPICMetadata()
+#     results = []
+#     result_index = 0
 
 
 class _MockGAPICSpeechAPI(object):
     _requests = None
-    _response = _MockGAPICSpeechResponse
-    _results = [_MockGAPICSyncResult()]
+    _response = None
+    _results = None
 
     def async_recognize(self, config, audio):
         from google.longrunning.operations_pb2 import Operation
@@ -353,7 +375,7 @@ def async_recognize(self, config, audio):
     def sync_recognize(self, config, audio):
         self.config = config
         self.audio = audio
-        self._response.results = self._results
+        # self._response.results = self._results
         return self._response