Merge changes I1dcf7f33,I6f9bf56a,I3487cefb into main

* changes:
  [gaarf-py] Bump gaarf to 1.15.1
  [gaarf-py] Ensure that parallel-threshold is always parsed as int in CLI tools
  Revert "[gaarf-py] Add lazy initialization for GoogleAdsApiClient.ads_service"

py/gaarf/api_clients.py

@@ -38,10 +38,6 @@
   f'google.ads.googleads.{GOOGLE_ADS_API_VERSION}.'
   'services.types.google_ads_service'
 )
-google_ads_service_client = importlib.import_module(
-  f'google.ads.googleads.{GOOGLE_ADS_API_VERSION}.'
-  'services.services.google_ads_service.client'
-)
 
 
 @dataclasses.dataclass(frozen=True)
@@ -285,11 +281,7 @@ def __init__(
       path=path_to_config, config_dict=config_dict, yaml_str=yaml_str
     )
     self.client.use_proto_plus = use_proto_plus
-
-  @property
-  def ads_service(self) -> google_ads_service_client.GoogleAdsServiceClient_:
-    """Service for issuing SearchStream requests."""
-    return self.client.get_service('GoogleAdsService')
+    self.ads_service = self.client.get_service('GoogleAdsService')
 
   @tenacity.retry(
     stop=tenacity.stop_after_attempt(3),

py/gaarf/cli/bq.py

@@ -20,6 +20,7 @@
 
 import argparse
 import functools
+import sys
 from concurrent import futures
 
 from gaarf import bq_executor
@@ -52,7 +53,7 @@ def main():
     '--no-parallel-queries', dest='parallel_queries', action='store_false'
   )
   parser.add_argument(
-    '--parallel-threshold', dest='parallel_threshold', default=None
+    '--parallel-threshold', dest='parallel_threshold', default=None, type=int
   )
   parser.set_defaults(save_config=False)
   parser.set_defaults(dry_run=False)
@@ -68,7 +69,7 @@ def main():
   if main_args.save_config and not main_args.gaarf_config:
     utils.ConfigSaver(main_args.save_config_dest).save(config)
   if main_args.dry_run:
-    exit()
+    sys.exit()
 
   config = utils.initialize_runtime_parameters(config)
   logger.debug('initialized config: %s', config)

py/gaarf/cli/gaarf.py

@@ -20,6 +20,7 @@
 
 import argparse
 import functools
+import sys
 from collections.abc import MutableSequence
 from concurrent import futures
 from pathlib import Path
@@ -75,7 +76,7 @@ def main():
   )
   parser.add_argument('-v', '--version', dest='version', action='store_true')
   parser.add_argument(
-    '--parallel-threshold', dest='parallel_threshold', default=None
+    '--parallel-threshold', dest='parallel_threshold', default=None, type=int
   )
   parser.set_defaults(save_config=False)
   parser.set_defaults(parallel_queries=True)
@@ -89,7 +90,7 @@ def main():
 
     version = pkg_resources.require('google-ads-api-report-fetcher')[0].version
     print(f'gaarf version {version}')
-    exit()
+    sys.exit()
 
   logger = utils.init_logging(
     loglevel=main_args.loglevel.upper(), logger_type=main_args.logger
@@ -117,7 +118,7 @@ def main():
   if main_args.save_config and not main_args.gaarf_config:
     utils.ConfigSaver(main_args.save_config_dest).save(config)
   if main_args.dry_run:
-    exit()
+    sys.exit()
 
   if config.params:
     config = utils.initialize_runtime_parameters(config)
@@ -161,7 +162,7 @@ def main():
       config.account,
       customer_ids_query,
     )
-    exit()
+    sys.exit()
   writer_client = writer.WriterFactory().create_writer(
     config.output, **config.writer_params
   )

py/gaarf/cli/sql.py

@@ -20,6 +20,7 @@
 
 import argparse
 import functools
+import sys
 from concurrent import futures
 
 import sqlalchemy
@@ -51,7 +52,7 @@ def main():
     '--no-parallel-queries', dest='parallel_queries', action='store_false'
   )
   parser.add_argument(
-    '--parallel-threshold', dest='parallel_threshold', default=None
+    '--parallel-threshold', dest='parallel_threshold', default=None, type=int
   )
   parser.set_defaults(save_config=False)
   parser.set_defaults(dry_run=False)
@@ -68,7 +69,7 @@ def main():
   if main_args.save_config and not main_args.gaarf_config:
     utils.ConfigSaver(main_args.save_config_dest).save(config)
   if main_args.dry_run:
-    exit()
+    sys.exit()
 
   config = utils.initialize_runtime_parameters(config)
   logger.debug('initialized config: %s', config)

py/setup.py

@@ -47,7 +47,7 @@
 
 setuptools.setup(
   name='google-ads-api-report-fetcher',
-  version='1.15.0',
+  version='1.15.1',
   python_requires='>3.8',
   description=(
     'Library for fetching reports from Google Ads API '