Skip to content
Permalink
Browse files
feat: add speaker_tag to WordInfo (#40)
* [CHANGE ME] Re-generated  to pick up changes in the API or client library generator.

* fix: allow proto interface changes
  • Loading branch information
yoshi-automation authored and chingor13 committed Nov 12, 2019
1 parent 604855f commit 3ccf3fe57e5edef83f11efb13f4d44305b810f26
Showing with 793 additions and 135 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE/bug_report.md
  2. +1 −1 .kokoro/continuous/propose_release.sh
  3. +1 −1 .kokoro/release/bump_snapshot.sh
  4. +0 −3 .kokoro/release/drop.cfg
  5. +0 −4 .kokoro/release/promote.cfg
  6. +1 −1 .kokoro/release/publish_javadoc.sh
  7. +1 −1 google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java
  8. +1 −1 google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java
  9. +19 −0 proto-google-cloud-speech-v1/clirr-ignored-differences.xml
  10. +16 −24 proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfig.java
  11. +4 −6 ...e-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfigOrBuilder.java
  12. +82 −81 proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
  13. +95 −0 proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
  14. +15 −0 proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfoOrBuilder.java
  15. +10 −6 proto-google-cloud-speech-v1/src/main/proto/google/cloud/speech/v1/cloud_speech.proto
  16. +28 −0 samples/src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_async.test.yaml
  17. +28 −0 samples/src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_async_gcs.test.yaml
  18. +37 −0 .../com/google/cloud/examples/speech/v1/test/speech_transcribe_async_word_time_offsets_gcs.test.yaml
  19. +29 −0 ...src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_enhanced_model.test.yaml
  20. +52 −0 ...rc/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_model_selection.test.yaml
  21. +52 −0 ...ain/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_model_selection_gcs.test.yaml
  22. +31 −0 ...s/src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_multichannel.test.yaml
  23. +32 −0 ...c/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_multichannel_gcs.test.yaml
  24. +28 −0 samples/src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_sync.test.yaml
  25. +28 −0 samples/src/main/java/com/google/cloud/examples/speech/v1/test/speech_transcribe_sync_gcs.test.yaml
  26. +11 −0 ...es/src/main/java/com/google/cloud/examples/speech/v1p1beta1/test/speech_adaptation_beta.test.yaml
  27. +11 −0 .../main/java/com/google/cloud/examples/speech/v1p1beta1/test/speech_contexts_classes_beta.test.yaml
  28. +11 −0 ...es/src/main/java/com/google/cloud/examples/speech/v1p1beta1/test/speech_quickstart_beta.test.yaml
  29. +28 −0 ...com/google/cloud/examples/speech/v1p1beta1/test/speech_transcribe_auto_punctuation_beta.test.yaml
  30. +40 −0 ...java/com/google/cloud/examples/speech/v1p1beta1/test/speech_transcribe_diarization_beta.test.yaml
  31. +33 −0 ...va/com/google/cloud/examples/speech/v1p1beta1/test/speech_transcribe_multilanguage_beta.test.yaml
  32. +27 −0 ...google/cloud/examples/speech/v1p1beta1/test/speech_transcribe_recognition_metadata_beta.test.yaml
  33. +35 −0 ...oogle/cloud/examples/speech/v1p1beta1/test/speech_transcribe_word_level_confidence_beta.test.yaml
  34. +5 −5 synth.metadata
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
General, Core, and Other are also allowed as types
2. OS type and version:
3. Java version:
4. google-cloud-speect version(s):
4. google-cloud-speech version(s):

#### Steps to reproduce

@@ -22,7 +22,7 @@ if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; th
# Groom the release PR as new commits are merged.
npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
--repo-url=googleapis/java-speech \
--package-name="google-cloud-speect" \
--package-name="google-cloud-speech" \
--api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
--proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
--release-type=java-yoshi
@@ -22,7 +22,7 @@ if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; th
# Groom the snapshot release PR immediately after publishing a release
npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
--repo-url=googleapis/java-speech \
--package-name="google-cloud-speect" \
--package-name="google-cloud-speech" \
--api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
--proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
--snapshot \
@@ -4,6 +4,3 @@ env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/java-speech/.kokoro/release/drop.sh"
}

# Download staging properties file.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-speech"
@@ -4,7 +4,3 @@ env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/java-speech/.kokoro/release/promote.sh"
}

# Download staging properties file.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-speech"

@@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader
# compile all packages
mvn clean install -B -DskipTests=true

NAME=google-cloud-speect
NAME=google-cloud-speech
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)

# build the docs
@@ -53,7 +53,7 @@ public static void executeNoCatch() throws Exception {
.setSampleRateHertz(sampleRateHertz)
.setEncoding(encoding)
.build();
String uri = "gs://gapic-toolkit/hello.flac";
String uri = "gs://cloud-samples-data/speech/brooklyn_bridge.flac";
RecognitionAudio audio = RecognitionAudio.newBuilder().setUri(uri).build();

RecognizeResponse response = client.recognize(config, audio);
@@ -53,7 +53,7 @@ public static void executeNoCatch() throws Exception {
.setSampleRateHertz(sampleRateHertz)
.setEncoding(encoding)
.build();
String uri = "gs://gapic-toolkit/hello.flac";
String uri = "gs://cloud-samples-data/speech/brooklyn_bridge.flac";
RecognitionAudio audio = RecognitionAudio.newBuilder().setUri(uri).build();

RecognizeResponse response = client.recognize(config, audio);
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/speech/v1/*OrBuilder</className>
<method>* get*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/speech/v1/*OrBuilder</className>
<method>boolean contains*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/speech/v1/*OrBuilder</className>
<method>boolean has*(*)</method>
</difference>
</differences>
@@ -174,15 +174,13 @@ public int getMaxSpeakerCount() {
*
*
* <pre>
* A distinct integer value is assigned for every speaker within
* the audio. This field specifies which one of those speakers was detected to
* have spoken this word. Value ranges from '1' to diarization_speaker_count.
* speaker_tag is set if enable_speaker_diarization = 'true' and only in the
* top alternative.
* Unused.
* </pre>
*
* <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
* <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
* </code>
*/
@java.lang.Deprecated
public int getSpeakerTag() {
return speakerTag_;
}
@@ -704,31 +702,27 @@ public Builder clearMaxSpeakerCount() {
*
*
* <pre>
* A distinct integer value is assigned for every speaker within
* the audio. This field specifies which one of those speakers was detected to
* have spoken this word. Value ranges from '1' to diarization_speaker_count.
* speaker_tag is set if enable_speaker_diarization = 'true' and only in the
* top alternative.
* Unused.
* </pre>
*
* <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
* <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
* </code>
*/
@java.lang.Deprecated
public int getSpeakerTag() {
return speakerTag_;
}
/**
*
*
* <pre>
* A distinct integer value is assigned for every speaker within
* the audio. This field specifies which one of those speakers was detected to
* have spoken this word. Value ranges from '1' to diarization_speaker_count.
* speaker_tag is set if enable_speaker_diarization = 'true' and only in the
* top alternative.
* Unused.
* </pre>
*
* <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
* <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
* </code>
*/
@java.lang.Deprecated
public Builder setSpeakerTag(int value) {

speakerTag_ = value;
@@ -739,15 +733,13 @@ public Builder setSpeakerTag(int value) {
*
*
* <pre>
* A distinct integer value is assigned for every speaker within
* the audio. This field specifies which one of those speakers was detected to
* have spoken this word. Value ranges from '1' to diarization_speaker_count.
* speaker_tag is set if enable_speaker_diarization = 'true' and only in the
* top alternative.
* Unused.
* </pre>
*
* <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
* <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
* </code>
*/
@java.lang.Deprecated
public Builder clearSpeakerTag() {

speakerTag_ = 0;
@@ -66,14 +66,12 @@
*
*
* <pre>
* A distinct integer value is assigned for every speaker within
* the audio. This field specifies which one of those speakers was detected to
* have spoken this word. Value ranges from '1' to diarization_speaker_count.
* speaker_tag is set if enable_speaker_diarization = 'true' and only in the
* top alternative.
* Unused.
* </pre>
*
* <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
* <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
* </code>
*/
@java.lang.Deprecated
int getSpeakerTag();
}

0 comments on commit 3ccf3fe

Please sign in to comment.