Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Videointelligence: Add V1 video segment / feature fields; remove send/recv msg size limit (via synth). #8975

Merged
merged 1 commit into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google LLC.
// Copyright 2019 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -18,6 +18,7 @@ syntax = "proto3";
package google.cloud.videointelligence.v1;

import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/longrunning/operations.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
Expand All @@ -33,6 +34,10 @@ option ruby_package = "Google::Cloud::VideoIntelligence::V1";

// Service that implements Google Cloud Video Intelligence API.
service VideoIntelligenceService {
option (google.api.default_host) = "videointelligence.googleapis.com";
option (google.api.oauth_scopes) =
"https://www.googleapis.com/auth/cloud-platform";

// Performs asynchronous video annotation. Progress and results can be
// retrieved through the `google.longrunning.Operations` interface.
// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
Expand Down Expand Up @@ -331,11 +336,14 @@ message VideoAnnotationResults {
// [Google Cloud Storage](https://cloud.google.com/storage/).
string input_uri = 1;

// Label annotations on video level or user specified segment level.
// Video segment on which the annotation is run.
VideoSegment segment = 10;

// Topical label annotations on video level or user specified segment level.
// There is exactly one element for each unique label.
repeated LabelAnnotation segment_label_annotations = 2;

// Label annotations on shot level.
// Topical label annotations on shot level.
// There is exactly one element for each unique label.
repeated LabelAnnotation shot_label_annotations = 3;

Expand Down Expand Up @@ -391,6 +399,14 @@ message VideoAnnotationProgress {

// Time of the most recent update.
google.protobuf.Timestamp update_time = 4;

// Specifies which feature is being tracked if the request contains more than
// one features.
Feature feature = 5;

// Specifies which segment is being tracked if the request contains more than
// one segments.
VideoSegment segment = 6;
}

// Video annotation progress. Included in the `metadata`
Expand Down Expand Up @@ -491,15 +507,17 @@ message SpeechRecognitionAlternative {
// Transcript text representing the words that the user spoke.
string transcript = 1;

// The confidence estimate between 0.0 and 1.0. A higher number
// Output only. The confidence estimate between 0.0 and 1.0. A higher number
// indicates an estimated greater likelihood that the recognized words are
// correct. This field is typically provided only for the top hypothesis, and
// only for `is_final=true` results. Clients should not rely on the
// `confidence` field as it is not guaranteed to be accurate or consistent.
// correct. This field is set only for the top alternative.
// This field is not guaranteed to be accurate and users should not rely on it
// to be always provided.
// The default of 0.0 is a sentinel value indicating `confidence` was not set.
float confidence = 2;

// A list of word-specific information for each recognized word.
// Output only. A list of word-specific information for each recognized word.
// Note: When `enable_speaker_diarization` is true, you will see all the words
// from the beginning of the audio.
repeated WordInfo words = 3;
}

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ def streaming_annotate_video(
requests (iterator[dict|google.cloud.videointelligence_v1p3beta1.proto.video_intelligence_pb2.StreamingAnnotateVideoRequest]): The input objects. If a dict is provided, it must be of the
same form as the protobuf message :class:`~google.cloud.videointelligence_v1p3beta1.types.StreamingAnnotateVideoRequest`
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def __init__(

# Create the channel.
if channel is None:
channel = self.create_channel(address=address, credentials=credentials)
channel = self.create_channel(
address=address,
credentials=credentials,
options={
"grpc.max_send_message_length": -1,
"grpc.max_receive_message_length": -1,
}.items(),
)

self._channel = channel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def annotate_video(
``asia-east1``. If no region is specified, a region will be determined
based on video file location.
retry (Optional[google.api_core.retry.Retry]): A retry object used
to retry requests. If ``None`` is specified, requests will not
be retried.
to retry requests. If ``None`` is specified, requests will
be retried using a default configuration.
timeout (Optional[float]): The amount of time, in seconds, to wait
for the request to complete. Note that if ``retry`` is
specified, the timeout applies to each individual attempt.
Expand Down
10 changes: 5 additions & 5 deletions videointelligence/synth.metadata
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"updateTime": "2019-07-03T12:45:26.994022Z",
"updateTime": "2019-08-06T12:47:43.610252Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.29.3",
"dockerImage": "googleapis/artman@sha256:8900f94a81adaab0238965aa8a7b3648791f4f3a95ee65adc6a56cfcc3753101"
"version": "0.32.1",
"dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "69916b6ffbb7717fa009033351777d0c9909fb79",
"internalRef": "256241904"
"sha": "e699b0cba64ffddfae39633417180f1f65875896",
"internalRef": "261759677"
}
},
{
Expand Down