Add Speech GAPIC for sync_recognize. #2615

daspecster · 2016-10-25T23:28:51Z

This adds GAPIC support to speech sync_recognize().

dhermes

Some comments, as discussed in chat, the impl. should resemble the Pub/Sub and Logging implementations, i.e. separation of concerns by having HTTP-only and GAX-only API objects.

speech/google/cloud/speech/transcript.py

@@ -40,6 +40,19 @@ def from_api_repr(cls, transcript):
        """
        return cls(transcript['transcript'], transcript['confidence'])

+    @classmethod
+    def from_pb(cls, transcript):


speech/google/cloud/speech/transcript.py

+    def from_pb(cls, transcript):
+        """Factory: construct ``Transcript`` from protobuf response.
+
+        :type transcript: :class:`SpeechRecognitionAlternative`


speech/google/cloud/speech/transcript.py

+        :param transcript: Instance of ``SpeechRecognitionAlternative``
+                           from protobuf.
+
+        :rtype: :class:`~Transcript`


speech/unit_tests/test_client.py

-                                         max_alternatives=2,
-                                         profanity_filter=True,
-                                         speech_context=self.HINTS)
+        with _Monkey(MUT, _USE_GAX=False):


speech/unit_tests/test_client.py

@@ -142,7 +161,8 @@ def test_sync_recognize_source_uri_without_optional_parameters(self):

        sample = Sample(source_uri=self.AUDIO_SOURCE_URI, encoding=encoding,
                        sample_rate=self.SAMPLE_RATE)
-        response = client.sync_recognize(sample)
+        with _Monkey(MUT, _USE_GAX=False):


speech/unit_tests/test_client.py

-                            encoding=speech.Encoding.FLAC,
-                            sample_rate=self.SAMPLE_RATE)
-            client.sync_recognize(sample)
+        with self.assertRaises(IndexError):


speech/unit_tests/test_client.py

-                            sample_rate=self.SAMPLE_RATE)
-            client.sync_recognize(sample)
+        with self.assertRaises(IndexError):
+            with _Monkey(MUT, _USE_GAX=False):


speech/unit_tests/test_client.py

@@ -207,6 +248,46 @@ def test_async_recognize(self):
        self.assertIsNone(operation.metadata)


+class _RecognitionConfig(object):
+    def __init__(self, *args, **kwargs):


dhermes

Big 👍 on the refactor

speech/google/cloud/speech/_gax.py

@@ -0,0 +1,76 @@
+


speech/google/cloud/speech/client.py

+_USE_GAX = _HAVE_GAX and not _DISABLE_GAX
+
+
+class Client(JSONClient):


speech/google/cloud/speech/client.py

+try:
+    from google.cloud.speech._gax import GAPICSpeechAPI
+except ImportError:  # pragma: NO COVER
+    _HAVE_GAX = False


speech/google/cloud/speech/client.py

+        """Helper for speech-related API calls."""
+        if self._speech_api is None:
+            if self._use_gax:
+                self._speech_api = GAPICSpeechAPI()


speech/google/cloud/speech/client.py


-        api_response = self.connection.api_request(
+class JSONSpeechAPI(object):


speech/unit_tests/test_client.py

@@ -206,6 +244,90 @@ def test_async_recognize(self):
        self.assertFalse(operation.complete)
        self.assertIsNone(operation.metadata)

+    def test_speech_api_with_gapic(self):


speech/unit_tests/test_client.py

+            api = client.speech_api
+            self.assertIsInstance(api, _MockGAPICSpeechAPI)
+
+    def test_speech_api_without_gapic(self):


speech/unit_tests/test_client.py

+            api = client.speech_api
+            self.assertIsInstance(api, _MockJSONSpeechAPI)
+
+    def test_speech_api_preset(self):


speech/google/cloud/speech/_gax.py

+
+
+class GAPICSpeechAPI(object):
+    """Object to manage calls through GAPIC wrappers to the Speech API."""


speech/google/cloud/speech/_gax.py

+                                 uri=sample.source_uri)
+        api = self._gapic_api
+        api_response = api.sync_recognize(config=config, audio=audio)
+        results = api_response.results.pop()


speech/setup.py

@@ -51,6 +51,8 @@

 REQUIREMENTS = [
    'google-cloud-core >= 0.20.0',
+    'gapic-google-cloud-speech-v1beta1==0.11.1',
+    'grpc-google-cloud-speech-v1beta1==0.11.1',


speech/unit_tests/test_client.py

@@ -91,18 +100,19 @@ def test_sync_recognize_content_with_optional_parameters(self):
            }
        }
        credentials = _Credentials()
-        client = self._makeOne(credentials=credentials)
+        client = self._makeOne(credentials=credentials, use_gax=False)
        client.connection = _Connection(RETURNED)


daspecster · 2016-10-26T03:53:35Z

It looks like SpeechApi() does some credential digging.
https://travis-ci.org/GoogleCloudPlatform/google-cloud-python/builds/170660357#L201-L212

So I _Monkey'd SpeechApi back.

@dhermes I think I got everything you covered there. LMKWYT.

daspecster · 2016-10-26T04:24:30Z

Yeah I was trying something with testing. I just pushed that back up.

daspecster · 2016-10-26T04:27:26Z

Ok yeah, that causes an error.
https://travis-ci.org/GoogleCloudPlatform/google-cloud-python/builds/170666346#L461-L474
I think because of this https://pypi.python.org/pypi/grpc-google-cloud-speech-v1beta1/1.0.0

daspecster · 2016-10-26T04:42:05Z

Ok that should be resolved now.

    'gapic-google-cloud-speech-v1beta1>=0.11.1,<0.12.0',
    'grpc-google-cloud-speech-v1beta1>=0.11.1,<0.12.0',

dhermes · 2016-10-26T05:05:12Z

LGTM.

Add Speech GAPIC for sync_recognize.

daspecster added the api: speech Issues related to the Speech-to-Text API. label Oct 25, 2016

daspecster assigned tseaver and dhermes Oct 25, 2016

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Oct 25, 2016

daspecster mentioned this pull request Oct 25, 2016

Tracking Speech API development. #2522

Closed

14 tasks

dhermes reviewed Oct 25, 2016

View reviewed changes

dhermes reviewed Oct 26, 2016

View reviewed changes

daspecster force-pushed the add-speech-sync-gapic branch from 7e2e8f4 to e24e96a Compare October 26, 2016 03:48

daspecster force-pushed the add-speech-sync-gapic branch 2 times, most recently from d3d3ced to 9c3a578 Compare October 26, 2016 04:38

Add Speech GAPIC for sync_recognize.

9031a0f

daspecster force-pushed the add-speech-sync-gapic branch from 29cb827 to 9031a0f Compare October 26, 2016 05:07

daspecster merged commit 2e6ac38 into googleapis:master Oct 26, 2016

daspecster deleted the add-speech-sync-gapic branch October 26, 2016 05:25

dhermes mentioned this pull request Nov 14, 2016

Upgrading core to version to 0.21.0. #2733

Merged

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017

Merge pull request googleapis#2615 from daspecster/add-speech-sync-gapic

dce4dfe

Add Speech GAPIC for sync_recognize.

theacodes unassigned dhermes Sep 28, 2018

atulep pushed a commit that referenced this pull request Apr 3, 2023

Merge pull request #2615 from daspecster/add-speech-sync-gapic

6fd2058

Add Speech GAPIC for sync_recognize.

atulep pushed a commit that referenced this pull request Apr 18, 2023

Merge pull request #2615 from daspecster/add-speech-sync-gapic

898f5ad

Add Speech GAPIC for sync_recognize.

parthea pushed a commit that referenced this pull request Oct 22, 2023

Merge pull request #2615 from daspecster/add-speech-sync-gapic

91a1927

Add Speech GAPIC for sync_recognize.

		_USE_GAX = _HAVE_GAX and not _DISABLE_GAX


		class Client(JSONClient):


		api_response = self.connection.api_request(
		class JSONSpeechAPI(object):



		class GAPICSpeechAPI(object):
		"""Object to manage calls through GAPIC wrappers to the Speech API."""

Add Speech GAPIC for sync_recognize. #2615

Add Speech GAPIC for sync_recognize. #2615

Conversation

daspecster commented Oct 25, 2016

dhermes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

dhermes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

daspecster commented Oct 26, 2016

daspecster commented Oct 26, 2016

daspecster commented Oct 26, 2016 • edited Loading

daspecster commented Oct 26, 2016

dhermes commented Oct 26, 2016

daspecster commented Oct 26, 2016 •

edited

Loading