From 24affd2ea6f97b2d7351f79622d34fb609fe351a Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Thu, 14 Nov 2019 16:11:51 -0800
Subject: [PATCH] fix(videointelligence): revert #9440; make `features` a
 keyword parameter (#9810)

* Makes `features` a keyword parameter to annotate_video

This reverts part of commit 853d6125082589fe3bf8a3f5b347507de73589da.
---
 .../gapic/video_intelligence_service_client.py         | 10 +++++-----
 .../v1/test_video_intelligence_service_client_v1.py    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py
index 86210ceaad2e..f872f349fde8 100644
--- a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py
+++ b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py
@@ -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,
@@ -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.
@@ -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``
@@ -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
@@ -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,
diff --git a/packages/google-cloud-videointelligence/tests/unit/gapic/v1/test_video_intelligence_service_client_v1.py b/packages/google-cloud-videointelligence/tests/unit/gapic/v1/test_video_intelligence_service_client_v1.py
index d34b37cf76b1..fca6c1e165bd 100644
--- a/packages/google-cloud-videointelligence/tests/unit/gapic/v1/test_video_intelligence_service_client_v1.py
+++ b/packages/google-cloud-videointelligence/tests/unit/gapic/v1/test_video_intelligence_service_client_v1.py
@@ -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
@@ -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