Updates from #2344 for speech API.

Author: daspecster

google-cloud-speech/google/cloud/speech/client.py

@@ -46,26 +46,17 @@ class Client(client_module.Client):
 
     _connection_class = Connection
 
-    def async_recognize(self, content, source_uri, encoding, sample_rate,
+    def async_recognize(self, encoding, sample_rate, content=None,
                         language_code=None, max_alternatives=None,
-                        profanity_filter=None, speech_context=None):
+                        profanity_filter=None, source_uri=None,
+                        speech_context=None):
         """Asychronous Recognize request to Google Speech API.
 
         .. _async_recognize: https://cloud.google.com/speech/reference/\
                              rest/v1beta1/speech/asyncrecognize
 
         See `async_recognize`_.
 
-        :type content: bytes
-        :param content: Byte stream of audio.
-
-        :type source_uri: str
-        :param source_uri: URI that points to a file that contains audio
-                           data bytes as specified in RecognitionConfig.
-                           Currently, only Google Cloud Storage URIs are
-                           supported, which must be specified in the following
-                           format: ``gs://bucket_name/object_name``.
-
         :type encoding: str
         :param encoding: encoding of audio data sent in all RecognitionAudio
                          messages, can be one of: :attr:`~.Encoding.LINEAR16`,
@@ -80,6 +71,9 @@ def async_recognize(self, content, source_uri, encoding, sample_rate,
                             native sample rate of the audio source (instead of
                             re-sampling).
 
+        :type content: bytes
+        :param content: Byte stream of audio.
+
         :type language_code: str
         :param language_code: (Optional) The language of the supplied audio as
                               BCP-47 language tag. Example: ``'en-GB'``.
@@ -99,6 +93,13 @@ def async_recognize(self, content, source_uri, encoding, sample_rate,
                                  asterisks, e.g. ``'f***'``. If False or
                                  omitted, profanities won't be filtered out.
 
+        :type source_uri: str
+        :param source_uri: URI that points to a file that contains audio
+                           data bytes as specified in RecognitionConfig.
+                           Currently, only Google Cloud Storage URIs are
+                           supported, which must be specified in the following
+                           format: ``gs://bucket_name/object_name``.
+
         :type speech_context: list
         :param speech_context: A list of strings (max 50) containing words and
                                phrases "hints" so that the speech recognition
@@ -121,26 +122,17 @@ def async_recognize(self, content, source_uri, encoding, sample_rate,
 
         return Operation.from_api_repr(self, api_response)
 
-    def sync_recognize(self, content, source_uri, encoding, sample_rate,
+    def sync_recognize(self, encoding, sample_rate, content=None,
                        language_code=None, max_alternatives=None,
-                       profanity_filter=None, speech_context=None):
+                       profanity_filter=None, source_uri=None,
+                       speech_context=None):
         """Synchronous Speech Recognition.
 
         .. _sync_recognize: https://cloud.google.com/speech/reference/\
                             rest/v1beta1/speech/syncrecognize
 
         See `sync_recognize`_.
 
-        :type content: bytes
-        :param content: Byte stream of audio.
-
-        :type source_uri: str
-        :param source_uri: URI that points to a file that contains audio
-                           data bytes as specified in RecognitionConfig.
-                           Currently, only Google Cloud Storage URIs are
-                           supported, which must be specified in the following
-                           format: ``gs://bucket_name/object_name``.
-
         :type encoding: str
         :param encoding: encoding of audio data sent in all RecognitionAudio
                          messages, can be one of: :attr:`~.Encoding.LINEAR16`,
@@ -155,6 +147,10 @@ def sync_recognize(self, content, source_uri, encoding, sample_rate,
                             native sample rate of the audio source (instead of
                             re-sampling).
 
+        :type content: bytes
+        :param content: Byte stream of audio.
+
+
         :type language_code: str
         :param language_code: (Optional) The language of the supplied audio as
                               BCP-47 language tag. Example: ``'en-GB'``.
@@ -174,6 +170,13 @@ def sync_recognize(self, content, source_uri, encoding, sample_rate,
                                  asterisks, e.g. ``'f***'``. If False or
                                  omitted, profanities won't be filtered out.
 
+        :type source_uri: str
+        :param source_uri: URI that points to a file that contains audio
+                           data bytes as specified in RecognitionConfig.
+                           Currently, only Google Cloud Storage URIs are
+                           supported, which must be specified in the following
+                           format: ``gs://bucket_name/object_name``.
+
         :type speech_context: list
         :param speech_context: A list of strings (max 50) containing words and
                                phrases "hints" so that the speech recognition
@@ -206,21 +209,12 @@ def sync_recognize(self, content, source_uri, encoding, sample_rate,
             raise ValueError('result in api should have length 1')
 
 
-def _build_request_data(content, source_uri, encoding, sample_rate,
+def _build_request_data(encoding, sample_rate, content=None,
                         language_code=None, max_alternatives=None,
-                        profanity_filter=None, speech_context=None):
+                        profanity_filter=None, source_uri=None,
+                        speech_context=None):
     """Builds the request data before making API request.
 
-    :type content: bytes
-    :param content: Byte stream of audio.
-
-    :type source_uri: str
-    :param source_uri: URI that points to a file that contains audio
-                       data bytes as specified in RecognitionConfig.
-                       Currently, only Google Cloud Storage URIs are
-                       supported, which must be specified in the following
-                       format: ``gs://bucket_name/object_name``.
-
     :type encoding: str
     :param encoding: encoding of audio data sent in all RecognitionAudio
                      messages, can be one of: :attr:`~.Encoding.LINEAR16`,
@@ -235,6 +229,10 @@ def _build_request_data(content, source_uri, encoding, sample_rate,
                         native sample rate of the audio source (instead of
                         re-sampling).
 
+    :type content: bytes
+    :param content: Byte stream of audio.
+
+
     :type language_code: str
     :param language_code: (Optional) The language of the supplied audio as
                           BCP-47 language tag. Example: ``'en-GB'``.
@@ -254,6 +252,13 @@ def _build_request_data(content, source_uri, encoding, sample_rate,
                              asterisks, e.g. ``'f***'``. If False or
                              omitted, profanities won't be filtered out.
 
+    :type source_uri: str
+    :param source_uri: URI that points to a file that contains audio
+                       data bytes as specified in RecognitionConfig.
+                       Currently, only Google Cloud Storage URIs are
+                       supported, which must be specified in the following
+                       format: ``gs://bucket_name/object_name``.
+
     :type speech_context: list
     :param speech_context: A list of strings (max 50) containing words and
                            phrases "hints" so that the speech recognition