Skip to content

fix(videointelligence): revert #9440; make features a keyword parameter #9810

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.

Sign up for GitHub

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

Merged
busunkim96 merged 2 commits into from
Nov 15, 2019
Merged

fix(videointelligence): revert #9440; make features a keyword parameter #9810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28c88d2
Revert "fix(videointelligence): make `features` a positional paramete…
busunkim96 Nov 14, 2019
5774744
fix: don't revert changes to client config
busunkim96 Nov 14, 2019
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
10 changes: 5 additions & 5 deletions ...intelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ def __init__(
# Service calls
def annotate_video(
self,
features,
input_uri=None,
input_content=None,
features=None,
video_context=None,
output_uri=None,
location_id=None,
Expand All @@ -213,11 +213,11 @@ def annotate_video(
>>>
>>> client = videointelligence_v1.VideoIntelligenceServiceClient()
>>>
>>> input_uri = 'gs://cloud-samples-data/video/cat.mp4'
>>> features_element = enums.Feature.LABEL_DETECTION
>>> features = [features_element]
>>> input_uri = 'gs://cloud-samples-data/video/cat.mp4'
>>>
>>> response = client.annotate_video(features, input_uri=input_uri)
>>> response = client.annotate_video(input_uri=input_uri, features=features)
>>>
>>> def callback(operation_future):
... # Handle result.
Expand All @@ -229,7 +229,6 @@ def annotate_video(
>>> metadata = response.metadata()

Args:
features (list[~google.cloud.videointelligence_v1.types.Feature]): Required. Requested video annotation features.
input_uri (str): Input video location. Currently, only `Google Cloud
Storage <https://cloud.google.com/storage/>`__ URIs are supported, which
must be specified in the following format: ``gs://bucket-id/object-id``
Expand All @@ -242,6 +241,7 @@ def annotate_video(
request as ``input_content``. If set, ``input_content`` should be unset.
input_content (bytes): The video data bytes. If unset, the input video(s) should be specified
via ``input_uri``. If set, ``input_uri`` should be unset.
features (list[~google.cloud.videointelligence_v1.types.Feature]): Required. Requested video annotation features.
video_context (Union[dict, ~google.cloud.videointelligence_v1.types.VideoContext]): Additional video context and/or feature-specific parameters.

If a dict is provided, it must be of the same form as the protobuf
Expand Down Expand Up @@ -288,9 +288,9 @@ def annotate_video(
)

request = video_intelligence_pb2.AnnotateVideoRequest(
features=features,
input_uri=input_uri,
input_content=input_content,
features=features,
video_context=video_context,
output_uri=output_uri,
location_id=location_id,
Expand Down
10 changes: 5 additions & 5 deletions videointelligence/tests/unit/gapic/v1/test_video_intelligence_service_client_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ def test_annotate_video(self):
client = videointelligence_v1.VideoIntelligenceServiceClient()

# Setup Request
input_uri = "gs://cloud-samples-data/video/cat.mp4"
features_element = enums.Feature.LABEL_DETECTION
features = [features_element]
input_uri = "gs://cloud-samples-data/video/cat.mp4"

response = client.annotate_video(features, input_uri=input_uri)
response = client.annotate_video(input_uri=input_uri, features=features)
result = response.result()
assert expected_response == result

assert len(channel.requests) == 1
expected_request = video_intelligence_pb2.AnnotateVideoRequest(
features=features, input_uri=input_uri
input_uri=input_uri, features=features
)
actual_request = channel.requests[0][1]
assert expected_request == actual_request
Expand All @@ -114,10 +114,10 @@ def test_annotate_video_exception(self):
client = videointelligence_v1.VideoIntelligenceServiceClient()

# Setup Request
input_uri = "gs://cloud-samples-data/video/cat.mp4"
features_element = enums.Feature.LABEL_DETECTION
features = [features_element]
input_uri = "gs://cloud-samples-data/video/cat.mp4"

response = client.annotate_video(features, input_uri=input_uri)
response = client.annotate_video(input_uri=input_uri, features=features)
exception = response.exception()
assert exception.errors[0] == error