From 4982c8a94ccaa1924af449ec8bc524c6d4faaf8b Mon Sep 17 00:00:00 2001 From: Alex Bara Date: Wed, 30 Jul 2025 15:02:47 -0500 Subject: [PATCH] fixing deprecated _fields_ --- nodescraper/pluginexecutor.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nodescraper/pluginexecutor.py b/nodescraper/pluginexecutor.py index 178e9bce..ed5374d7 100644 --- a/nodescraper/pluginexecutor.py +++ b/nodescraper/pluginexecutor.py @@ -243,16 +243,26 @@ def apply_global_args_to_plugin( else: run_args[key] = global_args[key] - if "collection_args" in global_args and hasattr(plugin_class, "COLLECTOR_ARGS"): - plugin_fields = set(plugin_class.COLLECTOR_ARGS.__fields__.keys()) + if ( + "collection_args" in global_args + and hasattr(plugin_class, "COLLECTOR_ARGS") + and plugin_class.COLLECTOR_ARGS is not None + ): + + plugin_fields = set(plugin_class.COLLECTOR_ARGS.model_fields.keys()) filtered = { k: v for k, v in global_args["collection_args"].items() if k in plugin_fields } if filtered: run_args["collection_args"] = filtered - if "analysis_args" in global_args and hasattr(plugin_class, "ANALYZER_ARGS"): - plugin_fields = set(plugin_class.ANALYZER_ARGS.__fields__.keys()) + if ( + "analysis_args" in global_args + and hasattr(plugin_class, "ANALYZER_ARGS") + and plugin_class.ANALYZER_ARGS is not None + ): + + plugin_fields = set(plugin_class.ANALYZER_ARGS.model_fields.keys()) filtered = {k: v for k, v in global_args["analysis_args"].items() if k in plugin_fields} if filtered: run_args["analysis_args"] = filtered