Include min and max in schema json

Author: softwareengineerprogrammer

src/geophires_x_schema_generator/__init__.py

@@ -2,7 +2,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import Tuple
+from typing import Tuple, Any
 
 # Ruff disabled because imports are order-dependent
 # ruff: noqa: I001
@@ -91,12 +91,15 @@ def generate_json_schema(self) -> dict:
             param = input_params[param_name]
 
             units_val = param['CurrentUnits'] if isinstance(param['CurrentUnits'], str) else None
+            min_val, max_val = _get_min_and_max(param, default_val=None)
             properties[param_name] = {
                 'description': param['ToolTipText'],
                 'type': param['json_parameter_type'],
                 'units': units_val,
                 'category': param['parameter_category'],
                 'default': param['DefaultValue'],
+                'minimum': min_val,
+                'maximum': max_val,
             }
 
             if param['Required']:
@@ -146,27 +149,13 @@ def get_input_params_table(category_params, category_name) -> str:
                 # if param['Required']:
                 #     TODO designate required params
 
-                def get_key(k):
-                    if k in param and str(param[k]) != '':  # noqa
-                        return param[k]  # noqa
-                    else:
-                        return ''
-
-                min_val = get_key('Min')
-                max_val = get_key('Max')
-
-                if 'AllowableRange' in param:
-                    # TODO warn if min/max are defined and at odds with allowable range
-                    min_val = min(param['AllowableRange'])
-                    max_val = max(param['AllowableRange'])
-
-                    # TODO include full AllowableRange in reference (or fully describe if possible using min/max/increment)
+                min_val, max_val = _get_min_and_max(param)
 
                 input_rst += f"""\n       * - {param['Name']}
-         - {get_key('ToolTipText')}
-         - {get_key('PreferredUnits')}
-         - {get_key('json_parameter_type')}
-         - {get_key('DefaultValue')}
+         - {_get_key(param, 'ToolTipText')}
+         - {_get_key(param, 'PreferredUnits')}
+         - {_get_key(param, 'json_parameter_type')}
+         - {_get_key(param, 'DefaultValue')}
          - {min_val}
          - {max_val}"""
 
@@ -219,3 +208,22 @@ def get_key(k):
          - {get_key('json_parameter_type')}"""
 
         return output_rst
+
+
+def _get_key(param: dict[str, Any], k: str, default_val='') -> Any:
+    if k in param and str(param[k]) != '':
+        return param[k]
+    else:
+        return default_val
+
+
+def _get_min_and_max(param: dict[str, Any], default_val='') -> Tuple[float, float]:
+    min_val = _get_key(param, 'Min', default_val=default_val)
+    max_val = _get_key(param, 'Max', default_val=default_val)
+
+    if 'AllowableRange' in param:
+        # TODO warn if min/max are defined and at odds with allowable range
+        min_val = min(param['AllowableRange'])
+        max_val = max(param['AllowableRange'])
+
+    return (min_val, max_val)