Skip to content
This repository was archived by the owner on Apr 20, 2024. It is now read-only.

feat: add model and language_codes fields in RecognitionConfig message + enable default _ recognizer #524

Merged
parthea merged 2 commits into from
Jul 5, 2023
Merged

feat: add model and language_codes fields in RecognitionConfig message + enable default _ recognizer #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b71ba9
feat: add `model` and `language_codes` fields in `RecognitionConfig` …
gcf-owl-bot[bot] Jul 5, 2023
d87b400
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions google/cloud/speech_v2/services/speech/async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,7 @@ async def sample_create_recognizer():
client = speech_v2.SpeechAsyncClient()

# Initialize request argument(s)
recognizer = speech_v2.Recognizer()
recognizer.model = "model_value"
recognizer.language_codes = ['language_codes_value1', 'language_codes_value2']

request = speech_v2.CreateRecognizerRequest(
recognizer=recognizer,
parent="parent_value",
)

Expand Down Expand Up @@ -624,12 +619,7 @@ async def sample_update_recognizer():
client = speech_v2.SpeechAsyncClient()

# Initialize request argument(s)
recognizer = speech_v2.Recognizer()
recognizer.model = "model_value"
recognizer.language_codes = ['language_codes_value1', 'language_codes_value2']

request = speech_v2.UpdateRecognizerRequest(
recognizer=recognizer,
)

# Make the request
Expand Down Expand Up @@ -1030,6 +1020,8 @@ async def sample_recognize():
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an
empty implicit Recognizer.

This corresponds to the ``recognizer`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down Expand Up @@ -1213,17 +1205,26 @@ def request_generator():
[StreamingRecognize][google.cloud.speech.v2.Speech.StreamingRecognize]
method. Multiple
[StreamingRecognizeRequest][google.cloud.speech.v2.StreamingRecognizeRequest]
messages are sent. The first message must contain a
messages are sent in one call.

If the [Recognizer][google.cloud.speech.v2.Recognizer]
referenced by
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
contains a fully specified request configuration then
the stream may only contain messages with only
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio]
set.

Otherwise the first message must contain a
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
and optionally a
and a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message and must not contain
message that together fully specify the request
configuration and must not contain
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio].
All subsequent messages must contain
All subsequent messages must only have
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio]
and must not contain a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message.
set.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
Expand Down Expand Up @@ -1367,8 +1368,11 @@ async def sample_batch_recognize():
[BatchRecognize][google.cloud.speech.v2.Speech.BatchRecognize]
method.
recognizer (:class:`str`):
Required. Resource name of the
recognizer to be used for ASR.
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an
empty implicit Recognizer.

This corresponds to the ``recognizer`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down
42 changes: 23 additions & 19 deletions google/cloud/speech_v2/services/speech/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,7 @@ def sample_create_recognizer():
client = speech_v2.SpeechClient()

# Initialize request argument(s)
recognizer = speech_v2.Recognizer()
recognizer.model = "model_value"
recognizer.language_codes = ['language_codes_value1', 'language_codes_value2']

request = speech_v2.CreateRecognizerRequest(
recognizer=recognizer,
parent="parent_value",
)

Expand Down Expand Up @@ -963,12 +958,7 @@ def sample_update_recognizer():
client = speech_v2.SpeechClient()

# Initialize request argument(s)
recognizer = speech_v2.Recognizer()
recognizer.model = "model_value"
recognizer.language_codes = ['language_codes_value1', 'language_codes_value2']

request = speech_v2.UpdateRecognizerRequest(
recognizer=recognizer,
)

# Make the request
Expand Down Expand Up @@ -1369,6 +1359,8 @@ def sample_recognize():
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an
empty implicit Recognizer.

This corresponds to the ``recognizer`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down Expand Up @@ -1550,17 +1542,26 @@ def request_generator():
[StreamingRecognize][google.cloud.speech.v2.Speech.StreamingRecognize]
method. Multiple
[StreamingRecognizeRequest][google.cloud.speech.v2.StreamingRecognizeRequest]
messages are sent. The first message must contain a
messages are sent in one call.

If the [Recognizer][google.cloud.speech.v2.Recognizer]
referenced by
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
contains a fully specified request configuration then
the stream may only contain messages with only
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio]
set.

Otherwise the first message must contain a
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
and optionally a
and a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message and must not contain
message that together fully specify the request
configuration and must not contain
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio].
All subsequent messages must contain
All subsequent messages must only have
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio]
and must not contain a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message.
set.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
Expand Down Expand Up @@ -1700,8 +1701,11 @@ def sample_batch_recognize():
[BatchRecognize][google.cloud.speech.v2.Speech.BatchRecognize]
method.
recognizer (str):
Required. Resource name of the
recognizer to be used for ASR.
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an
empty implicit Recognizer.

This corresponds to the ``recognizer`` field
on the ``request`` instance; if ``request`` is provided, this
Expand Down
80 changes: 61 additions & 19 deletions google/cloud/speech_v2/types/cloud_speech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ class Recognizer(proto.Message):
User-settable, human-readable name for the
Recognizer. Must be 63 characters or less.
model (str):
Required. Which model to use for recognition requests.
Optional. Which model to use for recognition requests.
Select the model best suited to your domain to get best
results.

Expand All @@ -600,7 +600,7 @@ class Recognizer(proto.Message):
`Table Of Supported
Models <https://cloud.google.com/speech-to-text/v2/docs/speech-to-text-supported-languages>`__.
language_codes (MutableSequence[str]):
Required. The language of the supplied audio as a
Optional. The language of the supplied audio as a
`BCP-47 <https://www.rfc-editor.org/rfc/bcp/bcp47.txt>`__
language tag.

Expand Down Expand Up @@ -1080,6 +1080,31 @@ class RecognitionConfig(proto.Message):
(linear16, mulaw, alaw).

This field is a member of `oneof`_ ``decoding_config``.
model (str):
Optional. Which model to use for recognition requests.
Select the model best suited to your domain to get best
results.

Guidance for choosing which model to use can be found in the
`Transcription Models
Documentation <https://cloud.google.com/speech-to-text/v2/docs/transcription-model>`__
and the models supported in each region can be found in the
`Table Of Supported
Models <https://cloud.google.com/speech-to-text/v2/docs/speech-to-text-supported-languages>`__.
language_codes (MutableSequence[str]):
Optional. The language of the supplied audio as a
`BCP-47 <https://www.rfc-editor.org/rfc/bcp/bcp47.txt>`__
language tag. Language tags are normalized to BCP-47 before
they are used eg "en-us" becomes "en-US".

Supported languages for each model are listed in the `Table
of Supported
Models <https://cloud.google.com/speech-to-text/v2/docs/speech-to-text-supported-languages>`__.

If additional languages are provided, recognition result
will contain recognition in the most likely language
detected. The recognition result will include the language
tag of the language detected in the audio.
features (google.cloud.speech_v2.types.RecognitionFeatures):
Speech recognition features to enable.
adaptation (google.cloud.speech_v2.types.SpeechAdaptation):
Expand All @@ -1100,6 +1125,14 @@ class RecognitionConfig(proto.Message):
oneof="decoding_config",
message="ExplicitDecodingConfig",
)
model: str = proto.Field(
proto.STRING,
number=9,
)
language_codes: MutableSequence[str] = proto.RepeatedField(
proto.STRING,
number=10,
)
features: "RecognitionFeatures" = proto.Field(
proto.MESSAGE,
number=2,
Expand Down Expand Up @@ -1132,6 +1165,8 @@ class RecognizeRequest(proto.Message):
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an empty
implicit Recognizer.
config (google.cloud.speech_v2.types.RecognitionConfig):
Features and audio metadata to use for the Automatic Speech
Recognition. This field in combination with the
Expand Down Expand Up @@ -1515,17 +1550,23 @@ class StreamingRecognizeRequest(proto.Message):
[StreamingRecognize][google.cloud.speech.v2.Speech.StreamingRecognize]
method. Multiple
[StreamingRecognizeRequest][google.cloud.speech.v2.StreamingRecognizeRequest]
messages are sent. The first message must contain a
messages are sent in one call.

If the [Recognizer][google.cloud.speech.v2.Recognizer] referenced by
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
and optionally a
contains a fully specified request configuration then the stream may
only contain messages with only
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio] set.

Otherwise the first message must contain a
[recognizer][google.cloud.speech.v2.StreamingRecognizeRequest.recognizer]
and a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message and must not contain
message that together fully specify the request configuration and
must not contain
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio]. All
subsequent messages must contain
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio] and
must not contain a
[streaming_config][google.cloud.speech.v2.StreamingRecognizeRequest.streaming_config]
message.
subsequent messages must only have
[audio][google.cloud.speech.v2.StreamingRecognizeRequest.audio] set.

This message has `oneof`_ fields (mutually exclusive fields).
For each oneof, at most one member field can be set at the same time.
Expand All @@ -1536,13 +1577,11 @@ class StreamingRecognizeRequest(proto.Message):

Attributes:
recognizer (str):
Required. Streaming recognition should start with an initial
request having a ``recognizer``. Subsequent requests carry
the audio data to be recognized.

The initial request with configuration can be omitted if the
Recognizer being used has a
[default_recognition_config][google.cloud.speech.v2.Recognizer.default_recognition_config].
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an empty
implicit Recognizer.
streaming_config (google.cloud.speech_v2.types.StreamingRecognitionConfig):
StreamingRecognitionConfig to be used in this
recognition attempt. If provided, it will
Expand Down Expand Up @@ -1582,8 +1621,11 @@ class BatchRecognizeRequest(proto.Message):

Attributes:
recognizer (str):
Required. Resource name of the recognizer to
be used for ASR.
Required. The name of the Recognizer to use during
recognition. The expected format is
``projects/{project}/locations/{location}/recognizers/{recognizer}``.
The {recognizer} segment may be set to ``_`` to use an empty
implicit Recognizer.
config (google.cloud.speech_v2.types.RecognitionConfig):
Features and audio metadata to use for the Automatic Speech
Recognition. This field in combination with the
Expand Down
2 changes: 1 addition & 1 deletion samples/generated_samples/snippet_metadata_google.cloud.speech.v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-speech",
"version": "2.20.1"
"version": "0.1.0"
},
"snippets": [
{
Expand Down
2 changes: 1 addition & 1 deletion samples/generated_samples/snippet_metadata_google.cloud.speech.v1p1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-speech",
"version": "2.20.1"
"version": "0.1.0"
},
"snippets": [
{
Expand Down
Loading