Changes for release v2_2 with performance improvements (#194)

Author: wihl

.gitignore

@@ -1,6 +1,7 @@
 *.idea
 *.pyc
 *.iml
+.python-version
 
 # Distribution / packaging
 .Python

ChangeLog

@@ -1,3 +1,8 @@
+* 4.1.0:
+- Performance improvements
+- Updated dependencies for more recent versions
+- Bumped Python version to 3.7+
+
 * 4.0.0:
 - Removing support for Python 2
 

README.rst

@@ -15,7 +15,7 @@ Features
 
 Requirements
 ------------
-* Python 3.6.7+
+* Python 3.7+
         - **NOTE:** Python 2 support has ceased as of v4.0. See this `blog post`_ for more detail.
 * `pip`_
 

google/ads/google_ads/__init__.py

@@ -20,4 +20,4 @@
 import google.ads.google_ads.util
 
 
-VERSION = '3.3.0'
+VERSION = '4.1.0'

google/ads/google_ads/client.py

@@ -13,12 +13,11 @@
 # limitations under the License.
 """A client and common configurations for the Google Ads API."""
 
-from grpc import intercept_channel
+import grpc
 from importlib import import_module
 import logging.config
 
-from google.ads.google_ads import config
-from google.ads.google_ads import oauth2
+from google.ads.google_ads import config, oauth2, util
 from google.ads.google_ads.interceptors import MetadataInterceptor, \
     ExceptionInterceptor, LoggingInterceptor
 
@@ -35,6 +34,15 @@
     ('grpc.max_metadata_size', 16 * 1024 * 1024),
     ('grpc.max_receive_message_length', 64 * 1024 * 1024)]
 
+
+unary_stream_single_threading_option = util.get_nested_attr(
+    grpc, 'experimental.ChannelOptions.SingleThreadedUnaryStream', None)
+
+if unary_stream_single_threading_option:
+    _GRPC_CHANNEL_OPTIONS.append(
+        (unary_stream_single_threading_option, 1))
+
+
 class GoogleAdsClient(object):
     """Google Ads client used to configure settings and fetch services."""
 
@@ -69,7 +77,7 @@ def _get_api_services_by_version(cls, version):
             A module containing all services and types for the a API version.
         """
         try:
-            version_module = import_module('google.ads.google_ads.%s' % version)
+            version_module = import_module(f'google.ads.google_ads.{version}')
         except ImportError:
             raise ValueError('Specified Google Ads API version "{}" does not '
                              'exist. Valid API versions are: "{}"'.format(
@@ -167,12 +175,16 @@ def get_type(cls, name, version=_DEFAULT_VERSION):
             AttributeError: If the type for the specified name doesn't exist
                 in the given version.
         """
+        if name.lower().endswith('pb2'):
+            raise ValueError(f'Specified type "{name}" must be a class,'
+                             f' not a module')
+        
         try:
             type_classes = cls._get_api_services_by_version(version).types
             message_class = getattr(type_classes, name)
         except AttributeError:
-            raise ValueError('Specified type "{}" does not exist in Google Ads '
-                             'API %s.'.format(name, version))
+            raise ValueError(f'Specified type "{name}" does not exist in Google Ads '
+                             f'API {version}')
         return message_class()
 
     def __init__(self, credentials, developer_token, endpoint=None,
@@ -242,10 +254,10 @@ def get_service(self, name, version=_DEFAULT_VERSION, interceptors=[]):
             LoggingInterceptor(_logger, endpoint),
             ExceptionInterceptor(version)]
 
-        channel = intercept_channel(
+        channel = grpc.intercept_channel(
             channel,
             *interceptors)
 
         service_transport = service_transport_class(channel=channel)
 
-        return service_client(transport=service_transport)
+        return service_client(transport=service_transport)

google/ads/google_ads/util.py

@@ -13,6 +13,12 @@
 # limitations under the License.
 """Common utilities for the Google Ads API client library."""
 
+import functools
+import re
+
+# This regex matches characters preceded by start of line or an underscore.
+_RE_FIND_CHARS_TO_UPPERCASE = re.compile(r'(?:_|^)([a-z])')
+
 
 class ResourceName:
 
@@ -41,3 +47,59 @@ def format_composite(cls, *arg):
         """
         return cls._COMPOSITE_DELIMITER.join(arg)
 
+
+def get_nested_attr(obj, attr, *args):
+    """Gets the value of a nested attribute from an object.
+
+    Args:
+      obj: an object to retrieve an attribute value from.
+      attr: a string of the attribute separated by dots.
+
+    Returns:
+      The object attribute value or the given *args if the attr isn't present.
+    """
+    def _getattr(obj, attr):
+        return getattr(obj, attr, *args)
+
+    return functools.reduce(_getattr, [obj] + attr.split('.'))
+
+
+def convert_upper_case_to_snake_case(string):
+    """Converts a string from UpperCase to snake_case.
+
+    Primarily used to translate module names when retrieving them from version
+    modules' __init__.py files.
+
+    Args:
+        string: an arbitrary string to convert.
+    """
+    new_string = ''
+    index = 0
+
+    for char in string:
+        if index == 0:
+            new_string += char.lower()
+        elif char.isupper():
+            new_string += f'_{char.lower()}'
+        else:
+            new_string += char
+
+        index += 1
+
+    return new_string
+
+
+def convert_snake_case_to_upper_case(string):
+    """Converts a string from snake_case to UpperCase.
+
+    Primarily used to translate module names when retrieving them from version
+    modules' __init__.py files.
+
+    Args:
+        string: an arbitrary string to convert.
+    """
+    def converter(match):
+        """Convert a string to strip underscores then uppercase it."""
+        return match.group().replace('_', '').upper()
+
+    return _RE_FIND_CHARS_TO_UPPERCASE.sub(converter, string)