[gaarf-py] Ensure that parallel-threshold is always parsed as int in …

…CLI tools Change-Id: I6f9bf56a8d94597a02be4a8463b5b28c63412335
google · Sep 12, 2024 · 1221053 · 1221053
1 parent 062168c
commit 1221053
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/py/gaarf/cli/bq.py b/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)

diff --git a/py/gaarf/cli/gaarf.py b/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
   )

diff --git a/py/gaarf/cli/sql.py b/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)