New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add speech async gapic #2663

Merged

daspecster merged 1 commit into googleapis:master from daspecster:add-speech-async-gapic

Nov 3, 2016

Contributor

daspecster commented Nov 2, 2016 •

edited by dhermes

Loading

~~This will need #2661 in order for travis-ci to pass since I don't need metadata.py and operation.py after @dhermes refactored the core operation.py@ Thanks!~~

@dhermes, I think we talked about this back and forth a little bit, but as you can see from the system tests, the surface is much different between sync_recognize()'s results and async_recognize()'s results.

There will be some updates for the gRPC version of sync_recognize() that will follow this as well.

daspecster added the api: speech label

daspecster assigned tseaver and dhermes

googlebot added the cla: yes label

daspecster force-pushed the add-speech-async-gapic branch from 0e14c9d to 5078aa4 Compare

November 2, 2016 03:07

daspecster mentioned this pull request

Re-factoring Speech operation to use the base class. #2664

Merged

daspecster force-pushed the add-speech-async-gapic branch 2 times, most recently from 54b981b to eb08066 Compare

November 2, 2016 04:10

daspecster mentioned this pull request

Tracking Speech API development. #2522

Closed

14 tasks

daspecster force-pushed the add-speech-async-gapic branch from eb08066 to 46cd146 Compare

November 2, 2016 04:17

daspecster commented

View reviewed changes

speech/setup.py

@@ @@ -51,6 +51,8 @@ @@
               REQUIREMENTS = [
                   'google-cloud-core >= 0.20.0',
+                  'grpcio >= 1.0.0, < 2.0dev',
+                  'google-gax >= 0.14.1, < 0.15dev',

This comment was marked as spam.

Sign in to view

daspecster force-pushed the add-speech-async-gapic branch 2 times, most recently from 0ca8559 to bf805e3 Compare

November 2, 2016 04:49

dhermes reviewed

View reviewed changes

speech/google/cloud/speech/_gax.py

+              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

This comment was marked as spam.

Sign in to view

speech/google/cloud/speech/_gax.py

+              OPERATIONS_API_HOST = 'speech.googleapis.com'
+              register_type(AsyncRecognizeMetadata)
+              register_type(AsyncRecognizeResponse)

This comment was marked as spam.

Sign in to view

speech/google/cloud/speech/_gax.py

@@ @@ -72,9 +88,26 @@ 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.
-                      :raises NotImplementedError: Always.
+                      :rtype: :class:`~google.cloud.operation.Opeartion`

This comment was marked as spam.

Sign in to view

speech/google/cloud/speech/_gax.py

+                      api = self._gapic_api
+                      response = api.async_recognize(config=config, audio=audio)
+                      self._client._operations_stub = make_secure_stub(

This comment was marked as spam.

Sign in to view

speech/setup.py

@@ @@ -52,7 +52,6 @@ @@
               REQUIREMENTS = [
                   'google-cloud-core >= 0.20.0',
                   'gapic-google-cloud-speech-v1beta1 >= 0.11.1, < 0.12.0',
-                  'grpc-google-cloud-speech-v1beta1 >= 0.11.1, < 0.12.0',

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

@@ @@ -199,11 +199,10 @@ def test_sync_recognize_with_empty_results_gax(self): @@
                       credentials = _Credentials()
                       client = self._makeOne(credentials=credentials, use_gax=True)
                       client.connection = _Connection()
+                      _MockGAPICSpeechAPI._results = []

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

@@ @@ -277,13 +274,16 @@ def test_async_recognize_with_gax(self): @@
                       credentials = _Credentials()
                       client = self._makeOne(credentials=credentials)
                       client.connection = _Connection()
+                      client.connection.credentials = credentials

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

+                          operation = client.async_recognize(sample)
+                      self.assertFalse(operation.complete)
+                      self.assertIsNone(operation.response)

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

@@ @@ -321,28 +321,40 @@ class _MockGAPICAlternative(object): @@
                   confidence = 0.95234356
+              class _MockGAPICMetadata(object):
+                  type_url = None

This comment was marked as spam.

Sign in to view

daspecster force-pushed the add-speech-async-gapic branch from 375feeb to 2e9f486 Compare

November 2, 2016 18:20

Contributor Author

daspecster commented Nov 2, 2016

@dhermes I think there are just thow two open questions. Did you have anything else?

dhermes reviewed

View reviewed changes

speech/unit_tests/test_client.py

+                  @staticmethod
+                  def _make_result(transcript, confidence):
+                      from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+                      return cloud_speech_pb2.SpeechRecognitionResult(

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

+                          alternatives=[
+                              cloud_speech_pb2.SpeechRecognitionAlternative(
+                                  transcript=transcript,
+                                  confidence=confidence,

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

+                  def _make_sync_response(self, *results):
+                      from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+                      response = cloud_speech_pb2.SyncRecognizeResponse(

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

		from google.cloud import speech
		from google.cloud.speech import _gax as MUT

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

                       from google.cloud.speech.sample import Sample
                       credentials = _Credentials()
                       client = self._makeOne(credentials=credentials, use_gax=True)
                       client.connection = _Connection()
+                      client.connection.credentials = credentials
+                      _MockGAPICSpeechAPI._response = self._make_sync_response()

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

@@ @@ -277,13 +274,16 @@ def test_async_recognize_with_gax(self): @@
                       credentials = _Credentials()
                       client = self._makeOne(credentials=credentials)
                       client.connection = _Connection()
+                      client.connection.credentials = credentials

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

-                      mock_response = self._response
-                      mock_response.results = self._results
-                      return mock_response
+                      # self._response.results = self._results

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

speech/unit_tests/test_client.py

+                  _results = None
+                  def async_recognize(self, config, audio):
+                      from google.longrunning.operations_pb2 import Operation

This comment was marked as spam.

Sign in to view

daspecster added the PR: Needs to be squashed label

dhermes reviewed

View reviewed changes

speech/unit_tests/test_client.py

+                          "confidence": 0.9224355
+                      }, {
+                          "transcript": 'testing 4 5 6',
+                          "confidence": 0.0123456

This comment was marked as spam.

Sign in to view

dhermes reviewed

View reviewed changes

speech/unit_tests/test_client.py

    
                      with self.assertRaises(ValueError):

                          with _Monkey(MUT, SpeechApi=_MockGAPICSpeechAPI):

                          with _Monkey(_gax, SpeechApi=speech_api):

This comment was marked as spam.

Sign in to view

dhermes reviewed

View reviewed changes

speech/unit_tests/test_client.py

+                          self.assertEqual(results[1].transcript,
+                                           alternatives[1]['transcript'])
+                          self.assertEqual(results[1].confidence,
+                                           alternatives[1]['confidence'])

This comment was marked as spam.

Sign in to view

dhermes approved these changes

View reviewed changes

Contributor

dhermes left a comment

LGTM provided you clear up my most recent comments and resolve the setup.py question for @jonparrott


          Add speech async GAPIC.

5d4272f

daspecster force-pushed the add-speech-async-gapic branch from 77b6d16 to 5d4272f Compare

November 3, 2016 18:52

daspecster removed the PR: Needs to be squashed label

Contributor Author

daspecster commented Nov 3, 2016

Travis has gone on strike again...

Contributor Author

daspecster commented Nov 3, 2016

Finally travis ran this job. @dhermes, I'm merging(in 15minutes) since I got your suggestions in.

Contributor

dhermes commented Nov 3, 2016

Feel free to merge now

daspecster merged commit 3de5bc0 into googleapis:master

daspecster mentioned this pull request

Speech unit tests cleanup. #2676

Merged

daspecster mentioned this pull request

Add async support to Speech API #2384

Closed

dhermes mentioned this pull request

Upgrading core to version to 0.21.0. #2733

Merged

daspecster mentioned this pull request

Add support for query parameters #2776

Merged

daspecster deleted the add-speech-async-gapic branch

January 24, 2017 15:17

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request


          Merge pull request googleapis#2663 from daspecster/add-speech-async-g…

1b209fd

…apic

Add speech async gapic

theacodes unassigned dhermes

atulep pushed a commit that referenced this pull request


          Merge pull request #2663 from daspecster/add-speech-async-gapic

64537ed

Add speech async gapic

atulep pushed a commit that referenced this pull request


          Merge pull request #2663 from daspecster/add-speech-async-gapic

f3bbb9a

Add speech async gapic

parthea pushed a commit that referenced this pull request


          Merge pull request #2663 from daspecster/add-speech-async-gapic

5aa40c0

Add speech async gapic

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: speech cla: yes