googleapis · danoscarmike · Nov 19, 2020 · May 5, 2017 · May 5, 2017 · May 18, 2017
diff --git a/.coveragerc b/.coveragerc
@@ -14,25 +14,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Generated by synthtool. DO NOT EDIT!
 [run]
 branch = True
-omit =
-  google/cloud/__init__.py
 
 [report]
 fail_under = 100
 show_missing = True
+omit = google/cloud/texttospeech/__init__.py
 exclude_lines =
     # Re-enable the standard pragma
     pragma: NO COVER
     # Ignore debug-only repr
     def __repr__
-    # Ignore abstract methods
-    raise NotImplementedError
-omit =
-  */gapic/*.py
-  */proto/*.py
-  */core/*.py
-  */site-packages/*.py
-  google/cloud/__init__.py
+    # Ignore pkg_resources exceptions.
+    # This is added at the module level as a safeguard for if someone
+    # generates the code and tries to run it without pip installing. This
+    # makes it virtually impossible to test properly.
+    except pkg_resources.DistributionNotFound
diff --git a/README.rst b/README.rst
@@ -56,12 +56,13 @@ dependencies.
 
 Supported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^
-Python >= 3.5
+Python >= 3.6
 
-Deprecated Python Versions
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Python == 2.7. Python 2.7 support will be removed on January 1, 2020.
+Unsupported Python Versions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Python == 2.7.
 
+The last version of this library compatible with Python 2.7 is google-cloud-videointelligence==1.17.0.
 
 Mac/Linux
 ^^^^^^^^^

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -0,0 +1,154 @@
+# 2.0.0 Migration Guide
+
+The 2.0 release of the `google-cloud-videointelligence` client is a significant upgrade based on a [next-gen code generator](https://github.com/googleapis/gapic-generator-python), and includes substantial interface changes. Existing code written for earlier versions of this library will likely require updates to use this version. This document describes the changes that have been made, and what you need to do to update your usage.
+
+If you experience issues or have questions, please file an [issue](https://github.com/googleapis/python-videointelligence/issues).
+
+## Supported Python Versions
+
+> **WARNING**: Breaking change
+
+The 2.0.0 release requires Python 3.6+.
+
+
+## Method Calls
+
+> **WARNING**: Breaking change
+
+Methods expect request objects. We provide a script that will convert most common use cases.
+
+* Install the library
+
+```py
+python3 -m pip install google-cloud-videointelligence
+```
+
+* The script `fixup_keywords.py` is shipped with the library. It expects
+an input directory (with the code to convert) and an empty destination directory.
+
+```sh
+$ fixup_keywords.py --input-directory .samples/ --output-directory samples/
+```
+
+**Before:**
+```py
+from google.cloud import videointelligence
+
+client = videointelligence.VideoIntelligenceServiceClient()
+input_uri = "gs://cloud-samples-data/video/cat.mp4"
+features = [videointelligence.enums.Feature.LABEL_DETECTION]
+operation = client.annotate_video(
+    input_uri=input_uri, features=features
+)
+```
+
+
+**After:**
+```py
+from google.cloud import videointelligence
+
+client = videointelligence.VideoIntelligenceServiceClient()
+input_uri = "gs://cloud-samples-data/video/cat.mp4"
+features = [videointelligence.Feature.LABEL_DETECTION]
+operation = client.annotate_video(request={"input_uri": input_uri, "features": features})
+```
+
+### More Details
+
+In `google-cloud-videointelligence<2.0.0`, parameters required by the API were positional parameters and optional parameters were keyword parameters.
+
+**Before:**
+```py
+    def annotate_video(
+        self,
+        input_uri=None,
+        input_content=None,
+        features=None,
+        video_context=None,
+        output_uri=None,
+        location_id=None,
+        retry=google.api_core.gapic_v1.method.DEFAULT,
+        timeout=google.api_core.gapic_v1.method.DEFAULT,
+        metadata=None,
+    ):
+```
+
+In the 2.0.0 release, all methods have a single positional parameter `request`. Method docstrings indicate whether a parameter is required or optional.
+
+Some methods have additional keyword only parameters. The available parameters depend on the [`google.api.method_signature` annotation](https://github.com/googleapis/googleapis/blob/master/google/cloud/videointelligence/v1/video_intelligence.proto#L51) specified by the API producer.
+
+
+**After:**
+```py
+    def annotate_video(
+        self,
+        request: video_intelligence.AnnotateVideoRequest = None,
+        *,
+        input_uri: str = None,
+        features: Sequence[video_intelligence.Feature] = None,
+        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        timeout: float = None,
+        metadata: Sequence[Tuple[str, str]] = (),
+    ) -> operation.Operation:
+```
+
+> **NOTE:** The `request` parameter and flattened keyword parameters for the API are mutually exclusive.
+> Passing both will result in an error.
+
+
+Both of these calls are valid:
+
+```py
+response = client.annotate_video(
+    request={
+        "input_uri": input_uri,
+        "features": features
+    }
+)
+```
+
+```py
+response = client.annotate_video(
+    input_uri=input_uri
+    features=features
+)
+```
+
+This call is invalid because it mixes `request` with a keyword argument `audio_config`. Executing this code
+will result in an error.
+
+```py
+response = client.annotate_video(
+    request={
+        "input_uri": input_uri
+    },
+    features=features
+)
+```
+
+
+
+## Enums and Types
+
+
+> **WARNING**: Breaking change
+
+The submodules `enums` and `types` have been removed.
+
+**Before:**
+```py
+
+from google.cloud import videointelligence
+
+features = [videointelligence.enums.Feature.TEXT_DETECTION]
+video_context = videointelligence.types.VideoContext()
+```
+
+
+**After:**
+```py
+from google.cloud import videointelligence
+
+features = [videointelligence.Feature.TEXT_DETECTION]
+video_context = videointelligence.VideoContext()
+```
diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md
@@ -0,0 +1 @@
+../UPGRADING.md
diff --git a/docs/gapic/v1/api.rst b/docs/gapic/v1/api.rst
diff --git a/docs/gapic/v1/types.rst b/docs/gapic/v1/types.rst
diff --git a/docs/gapic/v1beta2/api.rst b/docs/gapic/v1beta2/api.rst
diff --git a/docs/gapic/v1p1beta1/api.rst b/docs/gapic/v1p1beta1/api.rst
diff --git a/docs/gapic/v1p1beta1/types.rst b/docs/gapic/v1p1beta1/types.rst
diff --git a/docs/gapic/v1p2beta1/api.rst b/docs/gapic/v1p2beta1/api.rst
diff --git a/docs/gapic/v1p2beta1/types.rst b/docs/gapic/v1p2beta1/types.rst
diff --git a/docs/gapic/v1p3beta1/api.rst b/docs/gapic/v1p3beta1/api.rst
diff --git a/docs/gapic/v1p3beta1/types.rst b/docs/gapic/v1p3beta1/types.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -12,39 +12,50 @@ API. By default, you will get ``v1``, the latest stable version.
 .. toctree::
     :maxdepth: 2
 
-    gapic/v1/api
-    gapic/v1/types
+    videointelligence_v1/services
+    videointelligence_v1/types
 
-A new beta release with additional features over the current stable version,
-spelled ``v1p3beta1``, is provided to allow you to use these new features.
-These are expected to move into the stable release soon; until then, the
+A beta release with additional features over the current stable version,
+spelled ``v1p3beta1``, is also provided.
+These are expected to move into the stable release; until then, the
 usual beta admonishment (changes are possible, etc.) applies.
 
 An API and type reference is provided for this beta:
 
 .. toctree::
     :maxdepth: 2
 
-    gapic/v1p3beta1/api
-    gapic/v1p3beta1/types
+    videointelligence_v1p3beta1/services
+    videointelligence_v1p3beta1/types
 
 The previous beta releases, spelled ``v1p2beta1``, ``v1p1beta1``, and
 ``v1beta2``, are provided to continue to support code previously written
 against them. In order to use ththem, you will want to import from e.g.
 ``google.cloud.videointelligence_v1beta2`` in lieu of
 ``google.cloud.videointelligence_v1``.
 
-An API and type reference is provided the these betas also:
+An API and type reference is provided for these betas also:
 
 .. toctree::
     :maxdepth: 2
 
-    gapic/v1p2beta1/api
-    gapic/v1p2beta1/types
-    gapic/v1p1beta1/api
-    gapic/v1p1beta1/types
-    gapic/v1beta2/api
-    gapic/v1beta2/types
+    videointelligence_v1p2beta1/services
+    videointelligence_v1p2beta1/types
+    videointelligence_v1p1beta1/services
+    videointelligence_v1p1beta1/types
+    videointelligence_v1beta2/services
+    videointelligence_v1beta2/types
+
+
+Migration Guide
+---------------
+
+See the guide below for instructions on migrating to the 2.x release of this library.
+
+.. toctree::
+    :maxdepth: 2
+
+    UPGRADING
 
 
 Changelog

diff --git a/docs/videointelligence_v1/services.rst b/docs/videointelligence_v1/services.rst
@@ -0,0 +1,6 @@
+Services for Google Cloud Videointelligence v1 API
+==================================================
+
+.. automodule:: google.cloud.videointelligence_v1.services.video_intelligence_service
+    :members:
+    :inherited-members:
diff --git a/docs/videointelligence_v1/types.rst b/docs/videointelligence_v1/types.rst
@@ -0,0 +1,6 @@
+Types for Google Cloud Videointelligence v1 API
+===============================================
+
+.. automodule:: google.cloud.videointelligence_v1.types
+    :members:
+    :show-inheritance:
diff --git a/docs/videointelligence_v1beta2/services.rst b/docs/videointelligence_v1beta2/services.rst
@@ -0,0 +1,6 @@
+Services for Google Cloud Videointelligence v1beta2 API
+=======================================================
+
+.. automodule:: google.cloud.videointelligence_v1beta2.services.video_intelligence_service
+    :members:
+    :inherited-members:
diff --git a/docs/gapic/v1beta2/types.rst → docs/videointelligence_v1beta2/types.rst b/docs/gapic/v1beta2/types.rst → docs/videointelligence_v1beta2/types.rst
@@ -1,6 +1,6 @@
-Types for Google Cloud Video Intelligence API Client
+Types for Google Cloud Videointelligence v1beta2 API
 ====================================================
 
 .. automodule:: google.cloud.videointelligence_v1beta2.types
     :members:
-    :noindex:
+    :show-inheritance:
diff --git a/docs/videointelligence_v1p1beta1/services.rst b/docs/videointelligence_v1p1beta1/services.rst
@@ -0,0 +1,6 @@
+Services for Google Cloud Videointelligence v1p1beta1 API
+=========================================================
+
+.. automodule:: google.cloud.videointelligence_v1p1beta1.services.video_intelligence_service
+    :members:
+    :inherited-members:
diff --git a/docs/videointelligence_v1p1beta1/types.rst b/docs/videointelligence_v1p1beta1/types.rst
@@ -0,0 +1,6 @@
+Types for Google Cloud Videointelligence v1p1beta1 API
+======================================================
+
+.. automodule:: google.cloud.videointelligence_v1p1beta1.types
+    :members:
+    :show-inheritance:
diff --git a/docs/videointelligence_v1p2beta1/services.rst b/docs/videointelligence_v1p2beta1/services.rst
@@ -0,0 +1,6 @@
+Services for Google Cloud Videointelligence v1p2beta1 API
+=========================================================
+
+.. automodule:: google.cloud.videointelligence_v1p2beta1.services.video_intelligence_service
+    :members:
+    :inherited-members: