diff --git a/appengine/flexible/django_cloudsql/app.yaml b/appengine/flexible/django_cloudsql/app.yaml index a2b23f62b2ce..96c7a992b2db 100644 --- a/appengine/flexible/django_cloudsql/app.yaml +++ b/appengine/flexible/django_cloudsql/app.yaml @@ -9,4 +9,3 @@ beta_settings: runtime_config: python_version: 3 # [END runtime] - diff --git a/appengine/flexible/django_cloudsql/mysite/settings.py b/appengine/flexible/django_cloudsql/mysite/settings.py index 85c689f93b7e..b0ebc6d6368a 100644 --- a/appengine/flexible/django_cloudsql/mysite/settings.py +++ b/appengine/flexible/django_cloudsql/mysite/settings.py @@ -81,7 +81,9 @@ # [START dbconfig] DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', + # If you are using Cloud SQL for MySQL rather than PostgreSQL, set + # 'ENGINE': 'django.db.backends.mysql' instead of the following. + 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'polls', 'USER': '', 'PASSWORD': '', diff --git a/appengine/flexible/django_cloudsql/requirements.txt b/appengine/flexible/django_cloudsql/requirements.txt index 2c620f606367..3fe002b6a67c 100644 --- a/appengine/flexible/django_cloudsql/requirements.txt +++ b/appengine/flexible/django_cloudsql/requirements.txt @@ -2,3 +2,4 @@ Django==1.11 mysqlclient==1.3.10 wheel==0.29.0 gunicorn==19.7.1 +psycopg2==2.7.1 diff --git a/language/cloud-client/requirements.txt b/language/cloud-client/requirements.txt index 9b608a045a77..4a58920cad19 100644 --- a/language/cloud-client/requirements.txt +++ b/language/cloud-client/requirements.txt @@ -1 +1 @@ -google-cloud-language==0.24.0 +google-cloud-language==0.24.1 diff --git a/language/sentiment/requirements.txt b/language/sentiment/requirements.txt index 9b608a045a77..4a58920cad19 100644 --- a/language/sentiment/requirements.txt +++ b/language/sentiment/requirements.txt @@ -1 +1 @@ -google-cloud-language==0.24.0 +google-cloud-language==0.24.1 diff --git a/speech/cloud-client/README.rst b/speech/cloud-client/README.rst index a8a842059b66..cd5892345a47 100644 --- a/speech/cloud-client/README.rst +++ b/speech/cloud-client/README.rst @@ -127,7 +127,7 @@ To run this sample: Example usage: python transcribe_async.py resources/audio.raw - python transcribe_async.py gs://cloud-samples-tests/speech/brooklyn.flac + python transcribe_async.py gs://cloud-samples-tests/speech/brooklyn.raw positional arguments: path File or GCS path for audio file to be recognized @@ -136,6 +136,31 @@ To run this sample: -h, --help show this help message and exit +Transcribe Streaming ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + + +To run this sample: + +.. code-block:: bash + + $ python transcribe_streaming.py + + usage: transcribe_streaming.py [-h] stream + + Google Cloud Speech API sample application using the streaming API. + + Example usage: + python transcribe_streaming.py resources/audio.raw + + positional arguments: + stream File to stream to the API + + optional arguments: + -h, --help show this help message and exit + + The client library diff --git a/speech/cloud-client/README.rst.in b/speech/cloud-client/README.rst.in index c757d47d5d55..7025931873b4 100644 --- a/speech/cloud-client/README.rst.in +++ b/speech/cloud-client/README.rst.in @@ -22,5 +22,8 @@ samples: - name: Transcribe async file: transcribe_async.py show_help: true +- name: Transcribe Streaming + file: transcribe_streaming.py + show_help: true cloud_client_library: true diff --git a/speech/cloud-client/quickstart.py b/speech/cloud-client/quickstart.py index 7a0a798cd280..81966cf8d336 100644 --- a/speech/cloud-client/quickstart.py +++ b/speech/cloud-client/quickstart.py @@ -35,14 +35,14 @@ def run_quickstart(): # Loads the audio into memory with io.open(file_name, 'rb') as audio_file: content = audio_file.read() - audio_sample = speech_client.sample( + sample = speech_client.sample( content, source_uri=None, encoding='LINEAR16', - sample_rate=16000) + sample_rate_hertz=16000) # Detects speech in the audio file - alternatives = speech_client.speech_api.sync_recognize(audio_sample) + alternatives = sample.recognize('en-US') for alternative in alternatives: print('Transcript: {}'.format(alternative.transcript)) diff --git a/speech/cloud-client/requirements.txt b/speech/cloud-client/requirements.txt index 186ea3523769..deb66fcac830 100644 --- a/speech/cloud-client/requirements.txt +++ b/speech/cloud-client/requirements.txt @@ -1 +1 @@ -google-cloud-speech==0.23.0 +google-cloud-speech==0.25.0 diff --git a/speech/cloud-client/transcribe.py b/speech/cloud-client/transcribe.py index fbf57b2019fd..7c138ec963a4 100644 --- a/speech/cloud-client/transcribe.py +++ b/speech/cloud-client/transcribe.py @@ -39,9 +39,9 @@ def transcribe_file(speech_file): content=content, source_uri=None, encoding='LINEAR16', - sample_rate=16000) + sample_rate_hertz=16000) - alternatives = speech_client.speech_api.sync_recognize(audio_sample) + alternatives = audio_sample.recognize('en-US') for alternative in alternatives: print('Transcript: {}'.format(alternative.transcript)) @@ -55,9 +55,9 @@ def transcribe_gcs(gcs_uri): content=None, source_uri=gcs_uri, encoding='FLAC', - sample_rate=16000) + sample_rate_hertz=16000) - alternatives = speech_client.speech_api.sync_recognize(audio_sample) + alternatives = audio_sample.recognize('en-US') for alternative in alternatives: print('Transcript: {}'.format(alternative.transcript)) diff --git a/speech/cloud-client/transcribe_async.py b/speech/cloud-client/transcribe_async.py index d7a8fce05edb..8457871b3d7a 100644 --- a/speech/cloud-client/transcribe_async.py +++ b/speech/cloud-client/transcribe_async.py @@ -19,7 +19,7 @@ Example usage: python transcribe_async.py resources/audio.raw - python transcribe_async.py gs://cloud-samples-tests/speech/brooklyn.flac + python transcribe_async.py gs://cloud-samples-tests/speech/brooklyn.raw """ import argparse @@ -38,9 +38,9 @@ def transcribe_file(speech_file): content, source_uri=None, encoding='LINEAR16', - sample_rate=16000) + sample_rate_hertz=16000) - operation = speech_client.speech_api.async_recognize(audio_sample) + operation = audio_sample.long_running_recognize('en-US') retry_count = 100 while retry_count > 0 and not operation.complete: @@ -67,10 +67,10 @@ def transcribe_gcs(gcs_uri): audio_sample = speech_client.sample( content=None, source_uri=gcs_uri, - encoding='FLAC', - sample_rate=16000) + encoding='LINEAR16', + sample_rate_hertz=16000) - operation = speech_client.speech_api.async_recognize(audio_sample) + operation = audio_sample.long_running_recognize('en-US') retry_count = 100 while retry_count > 0 and not operation.complete: diff --git a/speech/cloud-client/transcribe_async_test.py b/speech/cloud-client/transcribe_async_test.py index 7d66747eb446..8d719753d12a 100644 --- a/speech/cloud-client/transcribe_async_test.py +++ b/speech/cloud-client/transcribe_async_test.py @@ -29,7 +29,7 @@ def test_transcribe(capsys): def test_transcribe_gcs(capsys): transcribe_async.transcribe_gcs( - 'gs://python-docs-samples-tests/speech/audio.flac') + 'gs://python-docs-samples-tests/speech/audio.raw') out, err = capsys.readouterr() assert re.search(r'how old is the Brooklyn Bridge', out, re.DOTALL | re.I) diff --git a/speech/cloud-client/transcribe_streaming.py b/speech/cloud-client/transcribe_streaming.py index 0643af7bbe83..bdf35314d06d 100644 --- a/speech/cloud-client/transcribe_streaming.py +++ b/speech/cloud-client/transcribe_streaming.py @@ -35,8 +35,8 @@ def transcribe_streaming(stream_file): audio_sample = speech_client.sample( stream=audio_file, encoding=speech.encoding.Encoding.LINEAR16, - sample_rate=16000) - alternatives = audio_sample.streaming_recognize() + sample_rate_hertz=16000) + alternatives = audio_sample.streaming_recognize('en-US') for alternative in alternatives: print('Finished: {}'.format(alternative.is_final))