feat(videointelligence): add person detection and face detection (#5)

googleapis · Feb 13, 2020 · 9ba4b42 · 9ba4b42
1 parent d0ead3f
commit 9ba4b42
Show file tree

Hide file tree

Showing 47 changed files with 1,372 additions and 571 deletions.
diff --git a/packages/google-cloud-videointelligence/google/__init__.py b/packages/google-cloud-videointelligence/google/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/packages/google-cloud-videointelligence/google/cloud/__init__.py b/packages/google-cloud-videointelligence/google/cloud/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/__init__.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,12 +16,23 @@
 
 
 from __future__ import absolute_import
+import sys
+import warnings
 
 from google.cloud.videointelligence_v1 import types
 from google.cloud.videointelligence_v1.gapic import enums
 from google.cloud.videointelligence_v1.gapic import video_intelligence_service_client
 
 
+if sys.version_info[:2] == (2, 7):
+    message = (
+        "A future version of this library will drop support for Python 2.7."
+        "More details about Python 2 support for Google Cloud Client Libraries"
+        "can be found at https://cloud.google.com/python/docs/python2-sunset/"
+    )
+    warnings.warn(message, DeprecationWarning)
+
+
 class VideoIntelligenceServiceClient(
     video_intelligence_service_client.VideoIntelligenceServiceClient
 ):

diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/enums.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/gapic/enums.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.../cloud/videointelligence_v1/gapic/transports/video_intelligence_service_grpc_transport.py b/.../cloud/videointelligence_v1/gapic/transports/video_intelligence_service_grpc_transport.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...intelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py b/...intelligence/google/cloud/videointelligence_v1/gapic/video_intelligence_service_client.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -213,9 +213,9 @@ 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(input_uri=input_uri, features=features)
             >>>
@@ -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/...cloud-videointelligence/google/cloud/videointelligence_v1/proto/video_intelligence_pb2.py b/...cloud-videointelligence/google/cloud/videointelligence_v1/proto/video_intelligence_pb2.py
diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/types.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1/types.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1beta2/__init__.py b/packages/google-cloud-videointelligence/google/cloud/videointelligence_v1beta2/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 
 from __future__ import absolute_import
+import sys
+import warnings
 
 from google.cloud.videointelligence_v1beta2 import types
 from google.cloud.videointelligence_v1beta2.gapic import enums
@@ -24,6 +26,15 @@
 )
 
 
+if sys.version_info[:2] == (2, 7):
+    message = (
+        "A future version of this library will drop support for Python 2.7."
+        "More details about Python 2 support for Google Cloud Client Libraries"
+        "can be found at https://cloud.google.com/python/docs/python2-sunset/"
+    )
+    warnings.warn(message, DeprecationWarning)
+
+
 class VideoIntelligenceServiceClient(
     video_intelligence_service_client.VideoIntelligenceServiceClient
 ):

diff --git a/...ages/google-cloud-videointelligence/google/cloud/videointelligence_v1beta2/gapic/enums.py b/...ages/google-cloud-videointelligence/google/cloud/videointelligence_v1beta2/gapic/enums.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...d/videointelligence_v1beta2/gapic/transports/video_intelligence_service_grpc_transport.py b/...d/videointelligence_v1beta2/gapic/transports/video_intelligence_service_grpc_transport.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...ligence/google/cloud/videointelligence_v1beta2/gapic/video_intelligence_service_client.py b/...ligence/google/cloud/videointelligence_v1beta2/gapic/video_intelligence_service_client.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -241,19 +241,19 @@ 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_v1beta2.types.Feature]): Requested video annotation features.
+            features (list[~google.cloud.videointelligence_v1beta2.types.Feature]): Required. Requested video annotation features.
             video_context (Union[dict, ~google.cloud.videointelligence_v1beta2.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
                 message :class:`~google.cloud.videointelligence_v1beta2.types.VideoContext`
-            output_uri (str): Optional location where the output (in JSON format) should be stored.
+            output_uri (str): Optional. Location where the output (in JSON format) should be stored.
                 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``
                 (other URI formats return ``google.rpc.Code.INVALID_ARGUMENT``). For
                 more information, see `Request
                 URIs <https://cloud.google.com/storage/docs/reference-uris>`__.
-            location_id (str): Optional cloud region where annotation should take place. Supported
+            location_id (str): Optional. Cloud region where annotation should take place. Supported
                 cloud regions: ``us-east1``, ``us-west1``, ``europe-west1``,
                 ``asia-east1``. If no region is specified, a region will be determined
                 based on video file location.