wqMerge branch 'development' into alex_nvme

Author: alexandraBara

nodescraper/cli/cli.py

@@ -437,7 +437,10 @@ def main(arg_input: Optional[list[str]] = None):
 
         if parsed_args.reference_config:
             ref_config = generate_reference_config(results, plugin_reg, logger)
-            path = os.path.join(os.getcwd(), "reference_config.json")
+            if log_path:
+                path = os.path.join(log_path, "reference_config.json")
+            else:
+                path = os.path.join(os.getcwd(), "reference_config.json")
             try:
                 with open(path, "w") as f:
                     json.dump(

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