speech: remove v1beta1 client
v1beta1 is deprecated - please switch to the GA apiv1 client.
This change is mutually exclusive with https://github.com/google/go-genproto/pull/81
Change-Id: Ifb9c8a9c1fa317f1de22877d41f13466f9d3f875
Reviewed-on: https://code-review.googlesource.com/30490
Reviewed-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
diff --git a/regen-gapic.sh b/regen-gapic.sh
index 0c23ea7..4a292dd 100755
--- a/regen-gapic.sh
+++ b/regen-gapic.sh
@@ -34,7 +34,6 @@
google/cloud/oslogin/artman_oslogin_v1beta.yaml
google/cloud/redis/artman_redis_v1beta1.yaml
google/cloud/speech/artman_speech_v1.yaml
-google/cloud/speech/artman_speech_v1beta1.yaml
google/cloud/speech/artman_speech_v1p1beta1.yaml
google/cloud/tasks/artman_cloudtasks.yaml
google/cloud/texttospeech/artman_texttospeech_v1.yaml
diff --git a/speech/apiv1beta1/SyncRecognize_smoke_test.go b/speech/apiv1beta1/SyncRecognize_smoke_test.go
deleted file mode 100644
index 8277d7f..0000000
--- a/speech/apiv1beta1/SyncRecognize_smoke_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// AUTO-GENERATED CODE. DO NOT EDIT.
-
-package speech
-
-import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1beta1"
-)
-
-import (
- "fmt"
- "strconv"
- "testing"
- "time"
-
- "cloud.google.com/go/internal/testutil"
- "golang.org/x/net/context"
- "google.golang.org/api/iterator"
- "google.golang.org/api/option"
-)
-
-var _ = fmt.Sprintf
-var _ = iterator.Done
-var _ = strconv.FormatUint
-var _ = time.Now
-
-func TestSpeechSmoke(t *testing.T) {
- if testing.Short() {
- t.Skip("skipping smoke test in short mode")
- }
- ctx := context.Background()
- ts := testutil.TokenSource(ctx, DefaultAuthScopes()...)
- if ts == nil {
- t.Skip("Integration tests skipped. See CONTRIBUTING.md for details")
- }
-
- projectId := testutil.ProjID()
- _ = projectId
-
- c, err := NewClient(ctx, option.WithTokenSource(ts))
- if err != nil {
- t.Fatal(err)
- }
-
- var languageCode string = "en-US"
- var sampleRate int32 = 44100
- var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
- var config = &speechpb.RecognitionConfig{
- LanguageCode: languageCode,
- SampleRate: sampleRate,
- Encoding: encoding,
- }
- var uri string = "gs://gapic-toolkit/hello.flac"
- var audio = &speechpb.RecognitionAudio{
- AudioSource: &speechpb.RecognitionAudio_Uri{
- Uri: uri,
- },
- }
- var request = &speechpb.SyncRecognizeRequest{
- Config: config,
- Audio: audio,
- }
-
- if _, err := c.SyncRecognize(ctx, request); err != nil {
- t.Error(err)
- }
-}
diff --git a/speech/apiv1beta1/doc.go b/speech/apiv1beta1/doc.go
deleted file mode 100644
index f136941..0000000
--- a/speech/apiv1beta1/doc.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// AUTO-GENERATED CODE. DO NOT EDIT.
-
-// Package speech is an auto-generated package for the
-// Google Cloud Speech API.
-//
-// NOTE: This package is in alpha. It is not stable, and is likely to change.
-//
-// Google Cloud Speech API.
-package speech // import "cloud.google.com/go/speech/apiv1beta1"
-
-import (
- "golang.org/x/net/context"
- "google.golang.org/grpc/metadata"
-)
-
-func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
- out, _ := metadata.FromOutgoingContext(ctx)
- out = out.Copy()
- for _, md := range mds {
- for k, v := range md {
- out[k] = append(out[k], v...)
- }
- }
- return metadata.NewOutgoingContext(ctx, out)
-}
-
-// DefaultAuthScopes reports the default set of authentication scopes to use with this package.
-func DefaultAuthScopes() []string {
- return []string{
- "https://www.googleapis.com/auth/cloud-platform",
- }
-}
diff --git a/speech/apiv1beta1/mock_test.go b/speech/apiv1beta1/mock_test.go
deleted file mode 100644
index 627e907..0000000
--- a/speech/apiv1beta1/mock_test.go
+++ /dev/null
@@ -1,400 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// AUTO-GENERATED CODE. DO NOT EDIT.
-
-package speech
-
-import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
- "flag"
- "fmt"
- "io"
- "log"
- "net"
- "os"
- "strings"
- "testing"
-
- "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/ptypes"
- "golang.org/x/net/context"
- "google.golang.org/api/option"
- status "google.golang.org/genproto/googleapis/rpc/status"
- "google.golang.org/grpc"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/metadata"
- gstatus "google.golang.org/grpc/status"
-)
-
-var _ = io.EOF
-var _ = ptypes.MarshalAny
-var _ status.Status
-
-type mockSpeechServer struct {
- // Embed for forward compatibility.
- // Tests will keep working if more methods are added
- // in the future.
- speechpb.SpeechServer
-
- reqs []proto.Message
-
- // If set, all calls return this error.
- err error
-
- // responses to return if err == nil
- resps []proto.Message
-}
-
-func (s *mockSpeechServer) SyncRecognize(ctx context.Context, req *speechpb.SyncRecognizeRequest) (*speechpb.SyncRecognizeResponse, error) {
- md, _ := metadata.FromIncomingContext(ctx)
- if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
- return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
- }
- s.reqs = append(s.reqs, req)
- if s.err != nil {
- return nil, s.err
- }
- return s.resps[0].(*speechpb.SyncRecognizeResponse), nil
-}
-
-func (s *mockSpeechServer) AsyncRecognize(ctx context.Context, req *speechpb.AsyncRecognizeRequest) (*longrunningpb.Operation, error) {
- md, _ := metadata.FromIncomingContext(ctx)
- if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
- return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
- }
- s.reqs = append(s.reqs, req)
- if s.err != nil {
- return nil, s.err
- }
- return s.resps[0].(*longrunningpb.Operation), nil
-}
-
-func (s *mockSpeechServer) StreamingRecognize(stream speechpb.Speech_StreamingRecognizeServer) error {
- md, _ := metadata.FromIncomingContext(stream.Context())
- if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
- return fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
- }
- for {
- if req, err := stream.Recv(); err == io.EOF {
- break
- } else if err != nil {
- return err
- } else {
- s.reqs = append(s.reqs, req)
- }
- }
- if s.err != nil {
- return s.err
- }
- for _, v := range s.resps {
- if err := stream.Send(v.(*speechpb.StreamingRecognizeResponse)); err != nil {
- return err
- }
- }
- return nil
-}
-
-// clientOpt is the option tests should use to connect to the test server.
-// It is initialized by TestMain.
-var clientOpt option.ClientOption
-
-var (
- mockSpeech mockSpeechServer
-)
-
-func TestMain(m *testing.M) {
- flag.Parse()
-
- serv := grpc.NewServer()
- speechpb.RegisterSpeechServer(serv, &mockSpeech)
-
- lis, err := net.Listen("tcp", "localhost:0")
- if err != nil {
- log.Fatal(err)
- }
- go serv.Serve(lis)
-
- conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure())
- if err != nil {
- log.Fatal(err)
- }
- clientOpt = option.WithGRPCConn(conn)
-
- os.Exit(m.Run())
-}
-
-func TestSpeechSyncRecognize(t *testing.T) {
- var expectedResponse *speechpb.SyncRecognizeResponse = &speechpb.SyncRecognizeResponse{}
-
- mockSpeech.err = nil
- mockSpeech.reqs = nil
-
- mockSpeech.resps = append(mockSpeech.resps[:0], expectedResponse)
-
- var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
- var sampleRate int32 = 44100
- var config = &speechpb.RecognitionConfig{
- Encoding: encoding,
- SampleRate: sampleRate,
- }
- var uri string = "gs://bucket_name/file_name.flac"
- var audio = &speechpb.RecognitionAudio{
- AudioSource: &speechpb.RecognitionAudio_Uri{
- Uri: uri,
- },
- }
- var request = &speechpb.SyncRecognizeRequest{
- Config: config,
- Audio: audio,
- }
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- resp, err := c.SyncRecognize(context.Background(), request)
-
- if err != nil {
- t.Fatal(err)
- }
-
- if want, got := request, mockSpeech.reqs[0]; !proto.Equal(want, got) {
- t.Errorf("wrong request %q, want %q", got, want)
- }
-
- if want, got := expectedResponse, resp; !proto.Equal(want, got) {
- t.Errorf("wrong response %q, want %q)", got, want)
- }
-}
-
-func TestSpeechSyncRecognizeError(t *testing.T) {
- errCode := codes.PermissionDenied
- mockSpeech.err = gstatus.Error(errCode, "test error")
-
- var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
- var sampleRate int32 = 44100
- var config = &speechpb.RecognitionConfig{
- Encoding: encoding,
- SampleRate: sampleRate,
- }
- var uri string = "gs://bucket_name/file_name.flac"
- var audio = &speechpb.RecognitionAudio{
- AudioSource: &speechpb.RecognitionAudio_Uri{
- Uri: uri,
- },
- }
- var request = &speechpb.SyncRecognizeRequest{
- Config: config,
- Audio: audio,
- }
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- resp, err := c.SyncRecognize(context.Background(), request)
-
- if st, ok := gstatus.FromError(err); !ok {
- t.Errorf("got error %v, expected grpc error", err)
- } else if c := st.Code(); c != errCode {
- t.Errorf("got error code %q, want %q", c, errCode)
- }
- _ = resp
-}
-func TestSpeechAsyncRecognize(t *testing.T) {
- var expectedResponse *speechpb.AsyncRecognizeResponse = &speechpb.AsyncRecognizeResponse{}
-
- mockSpeech.err = nil
- mockSpeech.reqs = nil
-
- any, err := ptypes.MarshalAny(expectedResponse)
- if err != nil {
- t.Fatal(err)
- }
- mockSpeech.resps = append(mockSpeech.resps[:0], &longrunningpb.Operation{
- Name: "longrunning-test",
- Done: true,
- Result: &longrunningpb.Operation_Response{Response: any},
- })
-
- var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
- var sampleRate int32 = 44100
- var config = &speechpb.RecognitionConfig{
- Encoding: encoding,
- SampleRate: sampleRate,
- }
- var uri string = "gs://bucket_name/file_name.flac"
- var audio = &speechpb.RecognitionAudio{
- AudioSource: &speechpb.RecognitionAudio_Uri{
- Uri: uri,
- },
- }
- var request = &speechpb.AsyncRecognizeRequest{
- Config: config,
- Audio: audio,
- }
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- respLRO, err := c.AsyncRecognize(context.Background(), request)
- if err != nil {
- t.Fatal(err)
- }
- resp, err := respLRO.Wait(context.Background())
-
- if err != nil {
- t.Fatal(err)
- }
-
- if want, got := request, mockSpeech.reqs[0]; !proto.Equal(want, got) {
- t.Errorf("wrong request %q, want %q", got, want)
- }
-
- if want, got := expectedResponse, resp; !proto.Equal(want, got) {
- t.Errorf("wrong response %q, want %q)", got, want)
- }
-}
-
-func TestSpeechAsyncRecognizeError(t *testing.T) {
- errCode := codes.PermissionDenied
- mockSpeech.err = nil
- mockSpeech.resps = append(mockSpeech.resps[:0], &longrunningpb.Operation{
- Name: "longrunning-test",
- Done: true,
- Result: &longrunningpb.Operation_Error{
- Error: &status.Status{
- Code: int32(errCode),
- Message: "test error",
- },
- },
- })
-
- var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
- var sampleRate int32 = 44100
- var config = &speechpb.RecognitionConfig{
- Encoding: encoding,
- SampleRate: sampleRate,
- }
- var uri string = "gs://bucket_name/file_name.flac"
- var audio = &speechpb.RecognitionAudio{
- AudioSource: &speechpb.RecognitionAudio_Uri{
- Uri: uri,
- },
- }
- var request = &speechpb.AsyncRecognizeRequest{
- Config: config,
- Audio: audio,
- }
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- respLRO, err := c.AsyncRecognize(context.Background(), request)
- if err != nil {
- t.Fatal(err)
- }
- resp, err := respLRO.Wait(context.Background())
-
- if st, ok := gstatus.FromError(err); !ok {
- t.Errorf("got error %v, expected grpc error", err)
- } else if c := st.Code(); c != errCode {
- t.Errorf("got error code %q, want %q", c, errCode)
- }
- _ = resp
-}
-func TestSpeechStreamingRecognize(t *testing.T) {
- var resultIndex int32 = 520358448
- var expectedResponse = &speechpb.StreamingRecognizeResponse{
- ResultIndex: resultIndex,
- }
-
- mockSpeech.err = nil
- mockSpeech.reqs = nil
-
- mockSpeech.resps = append(mockSpeech.resps[:0], expectedResponse)
-
- var request *speechpb.StreamingRecognizeRequest = &speechpb.StreamingRecognizeRequest{}
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- stream, err := c.StreamingRecognize(context.Background())
- if err != nil {
- t.Fatal(err)
- }
- if err := stream.Send(request); err != nil {
- t.Fatal(err)
- }
- if err := stream.CloseSend(); err != nil {
- t.Fatal(err)
- }
- resp, err := stream.Recv()
-
- if err != nil {
- t.Fatal(err)
- }
-
- if want, got := request, mockSpeech.reqs[0]; !proto.Equal(want, got) {
- t.Errorf("wrong request %q, want %q", got, want)
- }
-
- if want, got := expectedResponse, resp; !proto.Equal(want, got) {
- t.Errorf("wrong response %q, want %q)", got, want)
- }
-}
-
-func TestSpeechStreamingRecognizeError(t *testing.T) {
- errCode := codes.PermissionDenied
- mockSpeech.err = gstatus.Error(errCode, "test error")
-
- var request *speechpb.StreamingRecognizeRequest = &speechpb.StreamingRecognizeRequest{}
-
- c, err := NewClient(context.Background(), clientOpt)
- if err != nil {
- t.Fatal(err)
- }
-
- stream, err := c.StreamingRecognize(context.Background())
- if err != nil {
- t.Fatal(err)
- }
- if err := stream.Send(request); err != nil {
- t.Fatal(err)
- }
- if err := stream.CloseSend(); err != nil {
- t.Fatal(err)
- }
- resp, err := stream.Recv()
-
- if st, ok := gstatus.FromError(err); !ok {
- t.Errorf("got error %v, expected grpc error", err)
- } else if c := st.Code(); c != errCode {
- t.Errorf("got error code %q, want %q", c, errCode)
- }
- _ = resp
-}
diff --git a/speech/apiv1beta1/speech_client.go b/speech/apiv1beta1/speech_client.go
deleted file mode 100644
index e5c7b90..0000000
--- a/speech/apiv1beta1/speech_client.go
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// AUTO-GENERATED CODE. DO NOT EDIT.
-
-package speech
-
-import (
- "time"
-
- "cloud.google.com/go/internal/version"
- "cloud.google.com/go/longrunning"
- lroauto "cloud.google.com/go/longrunning/autogen"
- gax "github.com/googleapis/gax-go"
- "golang.org/x/net/context"
- "google.golang.org/api/option"
- "google.golang.org/api/transport"
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- "google.golang.org/grpc"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/metadata"
-)
-
-// CallOptions contains the retry settings for each method of Client.
-type CallOptions struct {
- SyncRecognize []gax.CallOption
- AsyncRecognize []gax.CallOption
- StreamingRecognize []gax.CallOption
-}
-
-func defaultClientOptions() []option.ClientOption {
- return []option.ClientOption{
- option.WithEndpoint("speech.googleapis.com:443"),
- option.WithScopes(DefaultAuthScopes()...),
- }
-}
-
-func defaultCallOptions() *CallOptions {
- retry := map[[2]string][]gax.CallOption{
- {"default", "idempotent"}: {
- gax.WithRetry(func() gax.Retryer {
- return gax.OnCodes([]codes.Code{
- codes.DeadlineExceeded,
- codes.Unavailable,
- }, gax.Backoff{
- Initial: 100 * time.Millisecond,
- Max: 60000 * time.Millisecond,
- Multiplier: 1.3,
- })
- }),
- },
- }
- return &CallOptions{
- SyncRecognize: retry[[2]string{"default", "idempotent"}],
- AsyncRecognize: retry[[2]string{"default", "idempotent"}],
- StreamingRecognize: retry[[2]string{"default", "non_idempotent"}],
- }
-}
-
-// Client is a client for interacting with Google Cloud Speech API.
-//
-// Methods, except Close, may be called concurrently. However, fields must not be modified concurrently with method calls.
-type Client struct {
- // The connection to the service.
- conn *grpc.ClientConn
-
- // The gRPC API client.
- client speechpb.SpeechClient
-
- // LROClient is used internally to handle longrunning operations.
- // It is exposed so that its CallOptions can be modified if required.
- // Users should not Close this client.
- LROClient *lroauto.OperationsClient
-
- // The call options for this service.
- CallOptions *CallOptions
-
- // The x-goog-* metadata to be sent with each request.
- xGoogMetadata metadata.MD
-}
-
-// NewClient creates a new speech client.
-//
-// Service that implements Google Cloud Speech API.
-func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error) {
- conn, err := transport.DialGRPC(ctx, append(defaultClientOptions(), opts...)...)
- if err != nil {
- return nil, err
- }
- c := &Client{
- conn: conn,
- CallOptions: defaultCallOptions(),
-
- client: speechpb.NewSpeechClient(conn),
- }
- c.setGoogleClientInfo()
-
- c.LROClient, err = lroauto.NewOperationsClient(ctx, option.WithGRPCConn(conn))
- if err != nil {
- // This error "should not happen", since we are just reusing old connection
- // and never actually need to dial.
- // If this does happen, we could leak conn. However, we cannot close conn:
- // If the user invoked the function with option.WithGRPCConn,
- // we would close a connection that's still in use.
- // TODO(pongad): investigate error conditions.
- return nil, err
- }
- return c, nil
-}
-
-// Connection returns the client's connection to the API service.
-func (c *Client) Connection() *grpc.ClientConn {
- return c.conn
-}
-
-// Close closes the connection to the API service. The user should invoke this when
-// the client is no longer required.
-func (c *Client) Close() error {
- return c.conn.Close()
-}
-
-// setGoogleClientInfo sets the name and version of the application in
-// the `x-goog-api-client` header passed on each request. Intended for
-// use by Google-written clients.
-func (c *Client) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", version.Go()}, keyval...)
- kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", grpc.Version)
- c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
-}
-
-// SyncRecognize performs synchronous speech recognition: receive results after all audio
-// has been sent and processed.
-func (c *Client) SyncRecognize(ctx context.Context, req *speechpb.SyncRecognizeRequest, opts ...gax.CallOption) (*speechpb.SyncRecognizeResponse, error) {
- ctx = insertMetadata(ctx, c.xGoogMetadata)
- opts = append(c.CallOptions.SyncRecognize[0:len(c.CallOptions.SyncRecognize):len(c.CallOptions.SyncRecognize)], opts...)
- var resp *speechpb.SyncRecognizeResponse
- err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
- var err error
- resp, err = c.client.SyncRecognize(ctx, req, settings.GRPC...)
- return err
- }, opts...)
- if err != nil {
- return nil, err
- }
- return resp, nil
-}
-
-// AsyncRecognize performs asynchronous speech recognition: receive results via the
-// [google.longrunning.Operations]
-// (/speech/reference/rest/v1beta1/operations#Operation)
-// interface. Returns either an
-// Operation.error or an Operation.response which contains
-// an AsyncRecognizeResponse message.
-func (c *Client) AsyncRecognize(ctx context.Context, req *speechpb.AsyncRecognizeRequest, opts ...gax.CallOption) (*AsyncRecognizeOperation, error) {
- ctx = insertMetadata(ctx, c.xGoogMetadata)
- opts = append(c.CallOptions.AsyncRecognize[0:len(c.CallOptions.AsyncRecognize):len(c.CallOptions.AsyncRecognize)], opts...)
- var resp *longrunningpb.Operation
- err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
- var err error
- resp, err = c.client.AsyncRecognize(ctx, req, settings.GRPC...)
- return err
- }, opts...)
- if err != nil {
- return nil, err
- }
- return &AsyncRecognizeOperation{
- lro: longrunning.InternalNewOperation(c.LROClient, resp),
- }, nil
-}
-
-// StreamingRecognize performs bidirectional streaming speech recognition: receive results while
-// sending audio. This method is only available via the gRPC API (not REST).
-func (c *Client) StreamingRecognize(ctx context.Context, opts ...gax.CallOption) (speechpb.Speech_StreamingRecognizeClient, error) {
- ctx = insertMetadata(ctx, c.xGoogMetadata)
- opts = append(c.CallOptions.StreamingRecognize[0:len(c.CallOptions.StreamingRecognize):len(c.CallOptions.StreamingRecognize)], opts...)
- var resp speechpb.Speech_StreamingRecognizeClient
- err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
- var err error
- resp, err = c.client.StreamingRecognize(ctx, settings.GRPC...)
- return err
- }, opts...)
- if err != nil {
- return nil, err
- }
- return resp, nil
-}
-
-// AsyncRecognizeOperation manages a long-running operation from AsyncRecognize.
-type AsyncRecognizeOperation struct {
- lro *longrunning.Operation
-}
-
-// AsyncRecognizeOperation returns a new AsyncRecognizeOperation from a given name.
-// The name must be that of a previously created AsyncRecognizeOperation, possibly from a different process.
-func (c *Client) AsyncRecognizeOperation(name string) *AsyncRecognizeOperation {
- return &AsyncRecognizeOperation{
- lro: longrunning.InternalNewOperation(c.LROClient, &longrunningpb.Operation{Name: name}),
- }
-}
-
-// Wait blocks until the long-running operation is completed, returning the response and any errors encountered.
-//
-// See documentation of Poll for error-handling information.
-func (op *AsyncRecognizeOperation) Wait(ctx context.Context, opts ...gax.CallOption) (*speechpb.AsyncRecognizeResponse, error) {
- var resp speechpb.AsyncRecognizeResponse
- if err := op.lro.WaitWithInterval(ctx, &resp, 45000*time.Millisecond, opts...); err != nil {
- return nil, err
- }
- return &resp, nil
-}
-
-// Poll fetches the latest state of the long-running operation.
-//
-// Poll also fetches the latest metadata, which can be retrieved by Metadata.
-//
-// If Poll fails, the error is returned and op is unmodified. If Poll succeeds and
-// the operation has completed with failure, the error is returned and op.Done will return true.
-// If Poll succeeds and the operation has completed successfully,
-// op.Done will return true, and the response of the operation is returned.
-// If Poll succeeds and the operation has not completed, the returned response and error are both nil.
-func (op *AsyncRecognizeOperation) Poll(ctx context.Context, opts ...gax.CallOption) (*speechpb.AsyncRecognizeResponse, error) {
- var resp speechpb.AsyncRecognizeResponse
- if err := op.lro.Poll(ctx, &resp, opts...); err != nil {
- return nil, err
- }
- if !op.Done() {
- return nil, nil
- }
- return &resp, nil
-}
-
-// Metadata returns metadata associated with the long-running operation.
-// Metadata itself does not contact the server, but Poll does.
-// To get the latest metadata, call this method after a successful call to Poll.
-// If the metadata is not available, the returned metadata and error are both nil.
-func (op *AsyncRecognizeOperation) Metadata() (*speechpb.AsyncRecognizeMetadata, error) {
- var meta speechpb.AsyncRecognizeMetadata
- if err := op.lro.Metadata(&meta); err == longrunning.ErrNoMetadata {
- return nil, nil
- } else if err != nil {
- return nil, err
- }
- return &meta, nil
-}
-
-// Done reports whether the long-running operation has completed.
-func (op *AsyncRecognizeOperation) Done() bool {
- return op.lro.Done()
-}
-
-// Name returns the name of the long-running operation.
-// The name is assigned by the server and is unique within the service from which the operation is created.
-func (op *AsyncRecognizeOperation) Name() string {
- return op.lro.Name()
-}
diff --git a/speech/apiv1beta1/speech_client_example_test.go b/speech/apiv1beta1/speech_client_example_test.go
deleted file mode 100644
index 8627565..0000000
--- a/speech/apiv1beta1/speech_client_example_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// AUTO-GENERATED CODE. DO NOT EDIT.
-
-package speech_test
-
-import (
- "io"
-
- "cloud.google.com/go/speech/apiv1beta1"
- "golang.org/x/net/context"
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1beta1"
-)
-
-func ExampleNewClient() {
- ctx := context.Background()
- c, err := speech.NewClient(ctx)
- if err != nil {
- // TODO: Handle error.
- }
- // TODO: Use client.
- _ = c
-}
-
-func ExampleClient_SyncRecognize() {
- ctx := context.Background()
- c, err := speech.NewClient(ctx)
- if err != nil {
- // TODO: Handle error.
- }
-
- req := &speechpb.SyncRecognizeRequest{
- // TODO: Fill request struct fields.
- }
- resp, err := c.SyncRecognize(ctx, req)
- if err != nil {
- // TODO: Handle error.
- }
- // TODO: Use resp.
- _ = resp
-}
-
-func ExampleClient_AsyncRecognize() {
- ctx := context.Background()
- c, err := speech.NewClient(ctx)
- if err != nil {
- // TODO: Handle error.
- }
-
- req := &speechpb.AsyncRecognizeRequest{
- // TODO: Fill request struct fields.
- }
- op, err := c.AsyncRecognize(ctx, req)
- if err != nil {
- // TODO: Handle error.
- }
-
- resp, err := op.Wait(ctx)
- if err != nil {
- // TODO: Handle error.
- }
- // TODO: Use resp.
- _ = resp
-}
-
-func ExampleClient_StreamingRecognize() {
- ctx := context.Background()
- c, err := speech.NewClient(ctx)
- if err != nil {
- // TODO: Handle error.
- }
- stream, err := c.StreamingRecognize(ctx)
- if err != nil {
- // TODO: Handle error.
- }
- go func() {
- reqs := []*speechpb.StreamingRecognizeRequest{
- // TODO: Create requests.
- }
- for _, req := range reqs {
- if err := stream.Send(req); err != nil {
- // TODO: Handle error.
- }
- }
- stream.CloseSend()
- }()
- for {
- resp, err := stream.Recv()
- if err == io.EOF {
- break
- }
- if err != nil {
- // TODO: handle error.
- }
- // TODO: Use resp.
- _ = resp
- }
-}
