chore: add retries to speech tests (GoogleCloudPlatform#9426)

kweinmeister · web-flow · commit bc353baeff08 · 2023-03-31T17:10:14.000Z
Fixes GoogleCloudPlatform#9425 Fixes GoogleCloudPlatform#9424 Fixes GoogleCloudPlatform#9423 Fixes GoogleCloudPlatform#9422 Fixes GoogleCloudPlatform#9421 Fixes GoogleCloudPlatform#9420 Fixes GoogleCloudPlatform#9419 Fixes GoogleCloudPlatform#9418 Fixes GoogleCloudPlatform#9417
diff --git a/speech/snippets/adaptation_v2_custom_class_reference_test.py b/speech/snippets/adaptation_v2_custom_class_reference_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -42,6 +43,7 @@ def delete_custom_class(name):
     client.delete_custom_class(request=request)
 
 
+@Retry()
 def test_adaptation_v2_custom_class_reference(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/adaptation_v2_inline_custom_class_test.py b/speech/snippets/adaptation_v2_inline_custom_class_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -30,6 +31,7 @@ def delete_recognizer(name):
     client.delete_recognizer(request=request)
 
 
+@Retry()
 def test_adaptation_v2_inline_custom_class(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/adaptation_v2_inline_phrase_set_test.py b/speech/snippets/adaptation_v2_inline_phrase_set_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -30,6 +31,7 @@ def delete_recognizer(name):
     client.delete_recognizer(request=request)
 
 
+@Retry()
 def test_adaptation_v2_inline_phrase_set(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/adaptation_v2_phrase_set_reference_test.py b/speech/snippets/adaptation_v2_phrase_set_reference_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -36,6 +37,7 @@ def delete_phrase_set(name):
     client.delete_phrase_set(request=request)
 
 
+@Retry()
 def test_adaptation_v2_phrase_set_reference(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/beta_snippets_test.py b/speech/snippets/beta_snippets_test.py
@@ -14,6 +14,8 @@
 
 import os
 
+from google.api_core.retry import Retry
+
 from beta_snippets import (
     transcribe_file_with_auto_punctuation,
     transcribe_file_with_diarization,
@@ -28,27 +30,31 @@
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def test_transcribe_file_with_enhanced_model(capsys):
     transcribe_file_with_enhanced_model()
     out, _ = capsys.readouterr()
 
     assert "Chrome" in out
 
 
+@Retry()
 def test_transcribe_file_with_metadata(capsys):
     transcribe_file_with_metadata()
     out, _ = capsys.readouterr()
 
     assert "Chrome" in out
 
 
+@Retry()
 def test_transcribe_file_with_auto_punctuation(capsys):
     transcribe_file_with_auto_punctuation()
     out, _ = capsys.readouterr()
 
     assert "First alternative of result " in out
 
 
+@Retry()
 def test_transcribe_diarization(capsys):
     transcribe_file_with_diarization()
     out, err = capsys.readouterr()
@@ -57,13 +63,15 @@ def test_transcribe_diarization(capsys):
     assert "speaker_tag:" in out
 
 
+@Retry()
 def test_transcribe_multichannel_file(capsys):
     transcribe_file_with_multichannel()
     out, err = capsys.readouterr()
 
     assert "OK Google stream stranger things from Netflix to my TV" in out
 
 
+@Retry()
 def test_transcribe_multilanguage_file(capsys):
     transcribe_file_with_multilanguage()
     out, err = capsys.readouterr()
@@ -72,13 +80,15 @@ def test_transcribe_multilanguage_file(capsys):
     assert "Transcript" in out
 
 
+@Retry()
 def test_transcribe_word_level_confidence(capsys):
     transcribe_file_with_word_level_confidence()
     out, err = capsys.readouterr()
 
     assert "OK Google stream stranger things from Netflix to my TV" in out
 
 
+@Retry()
 def test_transcribe_file_with_spoken_punctuation_end_emojis(capsys):
     transcribe_file_with_spoken_punctuation_end_emojis()
     out, err = capsys.readouterr()
diff --git a/speech/snippets/create_recognizer_test.py b/speech/snippets/create_recognizer_test.py
@@ -15,6 +15,7 @@
 import os
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -27,6 +28,7 @@ def delete_recognizer(name):
     client.delete_recognizer(request=request)
 
 
+@Retry()
 def test_create_recognizer(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/multi_region_test.py b/speech/snippets/multi_region_test.py
@@ -13,9 +13,12 @@
 # limitations under the License.
 
 
+from google.api_core.retry import Retry
+
 import multi_region
 
 
+@Retry()
 def test_multi_region(capsys):
     multi_region.sync_recognize_with_multi_region_gcs()
     out, _ = capsys.readouterr()
diff --git a/speech/snippets/profanity_filter_test.py b/speech/snippets/profanity_filter_test.py
@@ -14,9 +14,12 @@
 
 import re
 
+from google.api_core.retry import Retry
+
 import profanity_filter
 
 
+@Retry()
 def test_profanity_filter(capsys):
     profanity_filter.sync_recognize_with_profanity_filter_gcs(
         "gs://cloud-samples-tests/speech/brooklyn.flac"
diff --git a/speech/snippets/quickstart_test.py b/speech/snippets/quickstart_test.py
@@ -13,9 +13,12 @@
 # limitations under the License.
 
 
+from google.api_core.retry import Retry
+
 import quickstart
 
 
+@Retry()
 def test_quickstart(capsys):
     quickstart.run_quickstart()
     out, _ = capsys.readouterr()
diff --git a/speech/snippets/quickstart_v2_test.py b/speech/snippets/quickstart_v2_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -30,6 +31,7 @@ def delete_recognizer(name):
     client.delete_recognizer(request=request)
 
 
+@Retry()
 def test_quickstart_v2(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/requirements-test.txt b/speech/snippets/requirements-test.txt
@@ -1 +1 @@
-pytest==7.2.0
+pytest==7.2.2
diff --git a/speech/snippets/requirements.txt b/speech/snippets/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-speech==2.17.3
-google-cloud-storage==2.7.0
+google-cloud-speech==2.19.0
+google-cloud-storage==2.8.0
diff --git a/speech/snippets/speech_adaptation_beta_test.py b/speech/snippets/speech_adaptation_beta_test.py
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from google.api_core.retry import Retry
+
 import speech_adaptation_beta
 
 
+@Retry()
 def test_adaptation_beta():
     response = speech_adaptation_beta.sample_recognize(
         "gs://cloud-samples-data/speech/brooklyn_bridge.mp3", "Brooklyn Bridge"
diff --git a/speech/snippets/speech_model_adaptation_beta_test.py b/speech/snippets/speech_model_adaptation_beta_test.py
@@ -14,6 +14,7 @@
 
 import uuid
 
+from google.api_core.retry import Retry
 import google.auth
 
 from google.cloud import speech_v1p1beta1 as speech
@@ -29,6 +30,7 @@
 client = speech.AdaptationClient()
 
 
+@Retry()
 def test_model_adaptation_beta(custom_class_id, phrase_set_id, capsys):
     class_id = custom_class_id
     phrase_id = phrase_set_id
diff --git a/speech/snippets/speech_quickstart_beta_test.py b/speech/snippets/speech_quickstart_beta_test.py
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from google.api_core.retry import Retry
+
 import speech_quickstart_beta
 
 
+@Retry()
 def test_quickstart_beta():
     response = speech_quickstart_beta.sample_recognize(
         "gs://cloud-samples-data/speech/brooklyn_bridge.mp3"
diff --git a/speech/snippets/speech_to_storage_beta_test.py b/speech/snippets/speech_to_storage_beta_test.py
@@ -14,6 +14,7 @@
 
 import uuid
 
+from google.api_core.retry import Retry
 from google.cloud import speech_v1p1beta1 as speech
 from google.cloud import storage
 import pytest
@@ -37,6 +38,7 @@
 language_code = "en-US"
 
 
+@Retry()
 def test_export_transcript_to_storage_beta(bucket, capsys):
     results = speech_to_storage_beta.export_transcript_to_storage_beta(
         INPUT_STORAGE_URI,
diff --git a/speech/snippets/transcribe_async_file_test.py b/speech/snippets/transcribe_async_file_test.py
@@ -15,11 +15,14 @@
 import os
 import re
 
+from google.api_core.retry import Retry
+
 import transcribe_async_file
 
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def test_transcribe(capsys):
     transcribe_async_file.transcribe_file(os.path.join(RESOURCES, "audio.raw"))
     out, err = capsys.readouterr()
diff --git a/speech/snippets/transcribe_async_gcs_test.py b/speech/snippets/transcribe_async_gcs_test.py
@@ -15,11 +15,14 @@
 import os
 import re
 
+from google.api_core.retry import Retry
+
 import transcribe_async_gcs
 
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def test_transcribe_gcs(capsys):
     gcs_path = "gs://python-docs-samples-tests/speech/audio.flac"
     transcribe_async_gcs.transcribe_gcs(gcs_path)
diff --git a/speech/snippets/transcribe_auto_punctuation_test.py b/speech/snippets/transcribe_auto_punctuation_test.py
@@ -14,11 +14,14 @@
 
 import os
 
+from google.api_core.retry import Retry
+
 import transcribe_auto_punctuation
 
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def test_transcribe_file_with_auto_punctuation(capsys):
     transcribe_auto_punctuation.transcribe_file_with_auto_punctuation(
         "resources/commercial_mono.wav"
diff --git a/speech/snippets/transcribe_context_classes_test.py b/speech/snippets/transcribe_context_classes_test.py
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from google.api_core.retry import Retry
+
 import transcribe_context_classes
 
 
+@Retry()
 def test_transcribe_context_classes(capsys):
     transcribe_context_classes.transcribe_context_classes(
         "gs://cloud-samples-data/speech/commercial_mono.wav"
diff --git a/speech/snippets/transcribe_enhanced_model_test.py b/speech/snippets/transcribe_enhanced_model_test.py
@@ -14,11 +14,14 @@
 
 import os
 
+from google.api_core.retry import Retry
+
 import transcribe_enhanced_model
 
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def test_transcribe_file_with_enhanced_model(capsys):
     transcribe_enhanced_model.transcribe_file_with_enhanced_model(
         "resources/commercial_mono.wav"
diff --git a/speech/snippets/transcribe_file_v2_test.py b/speech/snippets/transcribe_file_v2_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -24,6 +25,7 @@
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
 
 
+@Retry()
 def delete_recognizer(name):
     client = SpeechClient()
     request = cloud_speech.DeleteRecognizerRequest(name=name)
diff --git a/speech/snippets/transcribe_gcs_v2_test.py b/speech/snippets/transcribe_gcs_v2_test.py
@@ -16,6 +16,7 @@
 import re
 from uuid import uuid4
 
+from google.api_core.retry import Retry
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
 
@@ -28,6 +29,7 @@ def delete_recognizer(name):
     client.delete_recognizer(request=request)
 
 
+@Retry()
 def test_transcribe_gcs_v2(capsys):
     project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
 
diff --git a/speech/snippets/transcribe_model_selection_test.py b/speech/snippets/transcribe_model_selection_test.py
diff --git a/speech/snippets/transcribe_multichannel_test.py b/speech/snippets/transcribe_multichannel_test.py
diff --git a/speech/snippets/transcribe_streaming_test.py b/speech/snippets/transcribe_streaming_test.py
diff --git a/speech/snippets/transcribe_streaming_v2_test.py b/speech/snippets/transcribe_streaming_v2_test.py
diff --git a/speech/snippets/transcribe_streaming_voice_activity_events_test.py b/speech/snippets/transcribe_streaming_voice_activity_events_test.py
diff --git a/speech/snippets/transcribe_streaming_voice_activity_timeouts_test.py b/speech/snippets/transcribe_streaming_voice_activity_timeouts_test.py
diff --git a/speech/snippets/transcribe_test.py b/speech/snippets/transcribe_test.py
diff --git a/speech/snippets/transcribe_word_time_offsets_test.py b/speech/snippets/transcribe_word_time_offsets_test.py
