tidY

Author: sambles

ods_tools/oed/settings.py

@@ -436,7 +436,8 @@ def validate(self, setting_data, raise_error=True):
 
 class AnalysisSettingHandler(SettingHandler):
     default_analysis_setting_schema_json = 'analysis_settings_schema.json'
-    extra_checks = ['unique_summary_ids']
+    extra_checks = ['unique_summary_ids', 'deprecated_ktools_outputs']
+   # extra_checks = ['unique_summary_ids']
     default_analysis_compatibility_profile = {
         "module_supplier_id": {
             "from_ver": "1.23.0",
@@ -500,20 +501,17 @@ def make(cls,
         return handler
 
 
-    def validate(self, setting_data, raise_error=True):
-        self.check_deprecated_ktools_outputs(setting_data, raise_error=True)
-        super(AnalysisSettingHandler, self).validate(setting_data, raise_error)
-
-
     def check_deprecated_ktools_outputs(self, setting_data, raise_error=False):
         """
-        Check for deprecated options in analysis settings JSON and print warnings.
-
+        Check for deprecated options in analysis settings JSON.
         Args:
             setting_data: Dictionary containing the analysis settings
+            raise_error: If True, raises an error; otherwise returns warnings
+        Returns:
+            dict: Exception messages organized by summary type. Will be empty if
+            there are no deprecated options.
         """
-        import ipdb; ipdb.set_trace()
-        warnings = []
+        exception_msgs = {}
         deprecated_summary_fields = [
             'summarycalc',
             'eltcalc',
@@ -524,29 +522,35 @@ def check_deprecated_ktools_outputs(self, setting_data, raise_error=False):
             'lec_output'
         ]
 
-
         for summary_type in ['gul_summaries', 'il_summaries', 'ri_summaries']:
             if summary_type in setting_data:
                 summaries = setting_data[summary_type]
-
                 if not isinstance(summaries, list):
                     continue
 
+                warning_msgs = []
                 for idx, summary in enumerate(summaries):
                     summary_id = summary.get('id', f'index {idx}')
-
                     # Check for deprecated summary-level fields
                     for field in deprecated_summary_fields:
                         if field in summary and summary[field]:
-                            warnings.append(
+                            msg = (
+                                f"id {summary_id}: '{field}' has no effect in oasis 2.5.x and newer"
+                            )
+                            warning_msgs.append(msg)
+
+
+
+                            settings_logger.warn(
                                 f" Deprecated option set in {summary_type} (summary ID: {summary_id}) - "
                                 f"'{field}' has no effect in (oasis 2.5.x and newer)."
                             )
 
-        for w in warnings:
-            settings_logger.warn(w)
-
+                if warning_msgs:
+                    exception_msgs[summary_type] = warning_msgs
 
+        #return exception_msgs
+        return {}
 
 
     def check_unique_summary_ids(self, setting_data):