googleapis · landrito · Aug 22, 2017 · May 23, 2017 · May 25, 2017 · May 30, 2017
diff --git a/dlp/README.rst b/dlp/README.rst
@@ -1,7 +1,7 @@
 Python Client for DLP API (`Alpha`_)
 ==================================================================================================
 
-Idiomatic Python client for `DLP API`_
+`DLP API`_: The Google Data Loss Prevention API provides methods for detection of privacy-sensitive fragments in text, images, and Google Cloud Platform storage repositories.
 
 - `Client Library Documentation`_
 - `Product Documentation`_
@@ -17,11 +17,11 @@ Quick Start
 In order to use this library, you first need to go through the following steps:
 
 1. `Select or create a Cloud Platform project.`_
-2. `Enable the monitoring api.`_
+2. `Enable the DLP API.`_
 3. `Setup Authentication.`_
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-.. _Enable the dlp api.:  https://cloud.google.com/dlp
+.. _Enable the DLP API.:  https://cloud.google.com/dlp
 .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
 
 Installation
@@ -59,6 +59,26 @@ Windows
     <your-env>\Scripts\activate
     <your-env>\Scripts\pip.exe install gapic-google-cloud-dlp-v2beta1
 
+Preview
+~~~~~~~
+
+DlpServiceClient
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. code:: py
+
+  from google.cloud import dlp
+  client = dlp.DlpServiceClient()
+  name = 'EMAIL_ADDRESS'
+  info_types_element = {'name': name}
+  info_types = [info_types_element]
+  inspect_config = {'info_types': info_types}
+  type_ = 'text/plain'
+  value = 'My email is example@example.com.'
+  items_element = {'type': type_, 'value': value}
+  items = [items_element]
+  response = client.inspect_content(inspect_config, items)
+
 Next Steps
 ~~~~~~~~~~
 
@@ -70,4 +90,4 @@ Next Steps
    APIs that we cover.
 
 .. _DLP API Product documentation:  https://cloud.google.com/dlp
-.. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
+.. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
diff --git a/dlp/docs/apis.rst b/dlp/docs/apis.rst
@@ -7,7 +7,7 @@ APIs
 .. autosummary::
    :toctree:
 
-   google.cloud.gapic.privacy.dlp.v2beta1.dlp_service_client
+   google.cloud.dlp_v2beta1.gapic.dlp_service_client
 
 
 API types
@@ -16,4 +16,6 @@ API types
 .. autosummary::
    :toctree:
 
-   google.cloud.gapic.privacy.dlp.v2beta1.enums
+   google.cloud.dlp_v2beta1.__init__
+   google.cloud.dlp_v2beta1.gapic.enums
+   google.cloud.dlp_v2beta1.types
diff --git a/dlp/docs/index.rst b/dlp/docs/index.rst
@@ -20,7 +20,7 @@ APIs
 
 .. autosummary::
 
-   google.cloud.gapic.privacy.dlp.v2beta1.dlp_service_client
+   google.cloud.dlp_v2beta1.gapic.dlp_service_client
 
 
 Contents

diff --git a/dlp/google/cloud/dlp.py b/dlp/google/cloud/dlp.py
@@ -16,7 +16,9 @@
 
 from google.cloud.dlp_v2beta1 import enums
 from google.cloud.dlp_v2beta1 import types
-from google.cloud.dlp_v2beta1 import DlpServiceClient
+from google.cloud.dlp_v2beta1 import (
+    DlpServiceClient,
+)
 
 
 __all__ = (

diff --git a/dlp/google/cloud/dlp_v2beta1/__init__.py b/dlp/google/cloud/dlp_v2beta1/__init__.py
@@ -14,15 +14,17 @@
 
 from __future__ import absolute_import
 
-from google.cloud.gapic.privacy.dlp.v2beta1.dlp_service_client import DlpServiceClient
-from google.cloud.gapic.privacy.dlp.v2beta1 import enums
-
 from google.cloud.dlp_v2beta1 import types
+from google.cloud.dlp_v2beta1.gapic import dlp_service_client
+from google.cloud.dlp_v2beta1.gapic import enums
+
 
+class DlpServiceClient(dlp_service_client.DlpServiceClient):
+    __doc__ = dlp_service_client.DlpServiceClient.__doc__
+    enums = enums
 
 
 __all__ = (
     'enums',
     'types',
-    'DlpServiceClient',
-)
+    'DlpServiceClient', )
diff --git a/...oud/gapic/privacy/dlp/v2beta1/__init__.py → ...oogle/cloud/dlp_v2beta1/gapic/__init__.py b/...oud/gapic/privacy/dlp/v2beta1/__init__.py → ...oogle/cloud/dlp_v2beta1/gapic/__init__.py
diff --git a/...privacy/dlp/v2beta1/dlp_service_client.py → ...d/dlp_v2beta1/gapic/dlp_service_client.py b/...privacy/dlp/v2beta1/dlp_service_client.py → ...d/dlp_v2beta1/gapic/dlp_service_client.py
diff --git a/...lp/v2beta1/dlp_service_client_config.json → ...eta1/gapic/dlp_service_client_config.json b/...lp/v2beta1/dlp_service_client_config.json → ...eta1/gapic/dlp_service_client_config.json
@@ -6,9 +6,7 @@
           "DEADLINE_EXCEEDED",
           "UNAVAILABLE"
         ],
-        "non_idempotent": [
-          "UNAVAILABLE"
-        ]
+        "non_idempotent": []
       },
       "retry_params": {
         "default": {

diff --git a/.../cloud/gapic/privacy/dlp/v2beta1/enums.py → dlp/google/cloud/dlp_v2beta1/gapic/enums.py b/.../cloud/gapic/privacy/dlp/v2beta1/enums.py → dlp/google/cloud/dlp_v2beta1/gapic/enums.py
@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2017, Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,7 @@ class Likelihood(object):
     based on the number of elements they contain which imply a match.
 
     Attributes:
-      LIKELIHOOD_UNSPECIFIED (int): Default value; information with all likelihoods will be included.
+      LIKELIHOOD_UNSPECIFIED (int): Default value; information with all likelihoods is included.
       VERY_UNLIKELY (int): Few matching elements.
       UNLIKELY (int)
       POSSIBLE (int): Some matching elements.

diff --git a/dlp/google/cloud/dlp_v2beta1/types.py b/dlp/google/cloud/dlp_v2beta1/types.py
@@ -15,16 +15,36 @@
 from __future__ import absolute_import
 import sys
 
-from google.cloud.proto.privacy.dlp.v2beta1 import dlp_pb2
-from google.cloud.proto.privacy.dlp.v2beta1 import storage_pb2
 from google.gax.utils.messages import get_messages
 
+from google.api import http_pb2
+from google.cloud.proto.privacy.dlp.v2beta1 import dlp_pb2
+from google.cloud.proto.privacy.dlp.v2beta1 import storage_pb2
+from google.longrunning import operations_pb2
+from google.protobuf import any_pb2
+from google.protobuf import descriptor_pb2
+from google.protobuf import empty_pb2
+from google.protobuf import timestamp_pb2
+from google.rpc import status_pb2
+from google.type import date_pb2
+from google.type import timeofday_pb2
 
 names = []
-for pb2_module in (dlp_pb2, storage_pb2):
-    for name, message in get_messages(pb2_module).items():
+for module in (
+        http_pb2,
+        dlp_pb2,
+        storage_pb2,
+        operations_pb2,
+        any_pb2,
+        descriptor_pb2,
+        empty_pb2,
+        timestamp_pb2,
+        status_pb2,
+        date_pb2,
+        timeofday_pb2, ):
+    for name, message in get_messages(module).items():
+        message.__module__ = 'google.cloud.dlp_v2beta1.types'
         setattr(sys.modules[__name__], name, message)
         names.append(name)
 
-
 __all__ = tuple(sorted(names))
diff --git a/dlp/google/cloud/gapic/__init__.py b/dlp/google/cloud/gapic/__init__.py
diff --git a/dlp/google/cloud/gapic/privacy/__init__.py b/dlp/google/cloud/gapic/privacy/__init__.py
diff --git a/dlp/google/cloud/gapic/privacy/dlp/__init__.py b/dlp/google/cloud/gapic/privacy/dlp/__init__.py
diff --git a/dlp/google/cloud/proto/privacy/dlp/v2beta1/dlp_pb2.py b/dlp/google/cloud/proto/privacy/dlp/v2beta1/dlp_pb2.py
diff --git a/dlp/google/cloud/proto/privacy/dlp/v2beta1/dlp_pb2_grpc.py b/dlp/google/cloud/proto/privacy/dlp/v2beta1/dlp_pb2_grpc.py
@@ -1,8 +1,8 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-import google.cloud.proto.privacy.dlp.v2beta1.dlp_pb2 as google_dot_cloud_dot_proto_dot_privacy_dot_dlp_dot_v2beta1_dot_dlp__pb2
-import google.longrunning.operations_pb2 as google_dot_longrunning_dot_operations__pb2
+from google.cloud.proto.privacy.dlp.v2beta1 import dlp_pb2 as google_dot_cloud_dot_proto_dot_privacy_dot_dlp_dot_v2beta1_dot_dlp__pb2
+from google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__pb2
 
 
 class DlpServiceStub(object):
@@ -62,23 +62,24 @@ class DlpServiceServicer(object):
   """
 
   def InspectContent(self, request, context):
-    """Find potentially sensitive info in a list of strings.
+    """Finds potentially sensitive info in a list of strings.
     This method has limits on input size, processing time, and output size.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def RedactContent(self, request, context):
-    """Redact potentially sensitive info from a list of strings.
+    """Redacts potentially sensitive info from a list of strings.
     This method has limits on input size, processing time, and output size.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def CreateInspectOperation(self, request, context):
-    """Schedule a job scanning content in a Google Cloud Platform data repository.
+    """Schedules a job scanning content in a Google Cloud Platform data
+    repository.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')