Skip to content

Commit ecffe28

Browse files
committed
addressed reviews
1 parent 0a8d8ab commit ecffe28

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

nodescraper/pluginexecutor.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,12 @@ def run_queue(self) -> list[PluginResult]:
165165
plugin_inst = plugin_class(**init_payload)
166166

167167
run_payload = copy.deepcopy(plugin_args)
168-
169168
run_args = TypeUtils.get_func_arg_types(plugin_class.run, plugin_class)
170169

171170
for arg in run_args.keys():
172171
if arg == "preserve_connection" and issubclass(plugin_class, DataPlugin):
173172
run_payload[arg] = True
174-
elif arg in self.plugin_config.global_args:
175-
run_payload[arg] = self.plugin_config.global_args[arg]
173+
176174
try:
177175
global_run_args = self.apply_global_args_to_plugin(
178176
plugin_inst, plugin_class, self.plugin_config.global_args
@@ -239,17 +237,10 @@ def apply_global_args_to_plugin(
239237
"""
240238

241239
run_args = {}
242-
simple_keys = [
243-
"collection",
244-
"analysis",
245-
"max_event_priority_level",
246-
"system_interaction_level",
247-
"preserve_connection",
248-
"data",
249-
]
250-
251-
for key in simple_keys:
252-
if key in global_args:
240+
for key in global_args:
241+
if key in ["collection_args", "analysis_args"] and isinstance(plugin_inst, DataPlugin):
242+
continue
243+
else:
253244
run_args[key] = global_args[key]
254245

255246
if "collection_args" in global_args and hasattr(plugin_class, "COLLECTOR_ARGS"):

0 commit comments

Comments
 (0)