Skip to content

Commit b9b632d

Browse files
[gaarf-py] Ensure that parallel-threshold is always parsed as int in CLI tools
Change-Id: I6f9bf56a8d94597a02be4a8463b5b28c63412335
1 parent fdbf7f5 commit b9b632d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

py/gaarf/cli/bq.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import argparse
2222
import functools
23+
import sys
2324
from concurrent import futures
2425

2526
from gaarf import bq_executor
@@ -52,7 +53,7 @@ def main():
5253
'--no-parallel-queries', dest='parallel_queries', action='store_false'
5354
)
5455
parser.add_argument(
55-
'--parallel-threshold', dest='parallel_threshold', default=None
56+
'--parallel-threshold', dest='parallel_threshold', default=None, type=int
5657
)
5758
parser.set_defaults(save_config=False)
5859
parser.set_defaults(dry_run=False)
@@ -68,7 +69,7 @@ def main():
6869
if main_args.save_config and not main_args.gaarf_config:
6970
utils.ConfigSaver(main_args.save_config_dest).save(config)
7071
if main_args.dry_run:
71-
exit()
72+
sys.exit()
7273

7374
config = utils.initialize_runtime_parameters(config)
7475
logger.debug('initialized config: %s', config)

py/gaarf/cli/gaarf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import argparse
2222
import functools
23+
import sys
2324
from collections.abc import MutableSequence
2425
from concurrent import futures
2526
from pathlib import Path
@@ -75,7 +76,7 @@ def main():
7576
)
7677
parser.add_argument('-v', '--version', dest='version', action='store_true')
7778
parser.add_argument(
78-
'--parallel-threshold', dest='parallel_threshold', default=None
79+
'--parallel-threshold', dest='parallel_threshold', default=None, type=int
7980
)
8081
parser.set_defaults(save_config=False)
8182
parser.set_defaults(parallel_queries=True)
@@ -89,7 +90,7 @@ def main():
8990

9091
version = pkg_resources.require('google-ads-api-report-fetcher')[0].version
9192
print(f'gaarf version {version}')
92-
exit()
93+
sys.exit()
9394

9495
logger = utils.init_logging(
9596
loglevel=main_args.loglevel.upper(), logger_type=main_args.logger
@@ -117,7 +118,7 @@ def main():
117118
if main_args.save_config and not main_args.gaarf_config:
118119
utils.ConfigSaver(main_args.save_config_dest).save(config)
119120
if main_args.dry_run:
120-
exit()
121+
sys.exit()
121122

122123
if config.params:
123124
config = utils.initialize_runtime_parameters(config)
@@ -161,7 +162,7 @@ def main():
161162
config.account,
162163
customer_ids_query,
163164
)
164-
exit()
165+
sys.exit()
165166
writer_client = writer.WriterFactory().create_writer(
166167
config.output, **config.writer_params
167168
)

py/gaarf/cli/sql.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import argparse
2222
import functools
23+
import sys
2324
from concurrent import futures
2425

2526
import sqlalchemy
@@ -51,7 +52,7 @@ def main():
5152
'--no-parallel-queries', dest='parallel_queries', action='store_false'
5253
)
5354
parser.add_argument(
54-
'--parallel-threshold', dest='parallel_threshold', default=None
55+
'--parallel-threshold', dest='parallel_threshold', default=None, type=int
5556
)
5657
parser.set_defaults(save_config=False)
5758
parser.set_defaults(dry_run=False)
@@ -68,7 +69,7 @@ def main():
6869
if main_args.save_config and not main_args.gaarf_config:
6970
utils.ConfigSaver(main_args.save_config_dest).save(config)
7071
if main_args.dry_run:
71-
exit()
72+
sys.exit()
7273

7374
config = utils.initialize_runtime_parameters(config)
7475
logger.debug('initialized config: %s', config)

0 commit comments

Comments
 (0)