Skip to content

Commit cf0702e

Browse files
authored
Better support for True/False Data Toolkit script arguments (#1197)
1 parent 5023d6d commit cf0702e

File tree

4 files changed

+318
-301
lines changed

4 files changed

+318
-301
lines changed

data_toolkit/run_data_toolkit.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,23 @@ def main(args=None):
173173
settings_dict = {}
174174
for index, row in settings_df.iterrows():
175175
if row["script"] not in settings_dict.keys():
176-
settings_dict[row["script"]] = [(row["setting"], row["value"])]
176+
settings_dict[row["script"]] = [
177+
(
178+
row["setting"],
179+
row["value"],
180+
row["script_true_false_arg"],
181+
row["reverse_default_behavior"],
182+
)
183+
]
177184
else:
178-
settings_dict[row["script"]].append((row["setting"], row["value"]))
185+
settings_dict[row["script"]].append(
186+
(
187+
row["setting"],
188+
row["value"],
189+
row["script_true_false_arg"],
190+
row["reverse_default_behavior"],
191+
)
192+
)
179193

180194
for script_name in settings_dict.keys():
181195
skip = determine_skip(
@@ -186,14 +200,15 @@ def main(args=None):
186200
if not skip:
187201
settings_list = []
188202
for setting in settings_dict[script_name]:
189-
if "overwrite" not in setting[0]:
203+
if pd.isna(setting[2]) or setting[2] == 0:
190204
settings_list.append(f"--{setting[0]}")
191205
settings_list.append(setting[1])
192206
else:
193-
settings_list.append(f"--{setting[0]}" if int(setting[1]) else "")
207+
settings_list.append(f"--{setting[0]}" if int(setting[3]) else "")
194208

195209
settings_list.append("--quiet" if parsed_args.quiet else "")
196210

211+
print(script_name, settings_list)
197212
# Run the script's main function with the requested arguments
198213
getattr(globals()[script_name], "main")(settings_list)
199214

0 commit comments

Comments
 (0)