Release 2.0.2

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.1
+current_version = 2.0.2
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>(rc|dev))(?P<build>\d+))?

focus_validator/config_objects/json_loader.py

@@ -129,14 +129,14 @@ def load_json_rules_with_dependencies_and_types(
         focus_dataset: Optional[str] = "",
         filter_rules: Optional[str] = None,
         applicability_criteria_list: Optional[List[str]] = None,
-    ) -> Tuple[ValidationPlan, Dict[str, str]]:
+    ) -> Tuple[ValidationPlan, Dict[str, str], Dict[str, Any]]:
         """
         Load CR JSON, build the dependency graph with RuleDependencyResolver,
         select relevant rules, and return both an execution-ready ValidationPlan
         (parents preserved, topo-ordered nodes + layers) and a column type mapping.
 
         Returns:
-            Tuple of (ValidationPlan, Dict[column_name, pandas_dtype])
+            Tuple of (ValidationPlan, Dict[column_name, pandas_dtype], Dict[model_data])
         """
         model_data = JsonLoader.load_json_rules(json_rule_file)
 
@@ -227,4 +227,4 @@ def load_json_rules_with_dependencies_and_types(
             exec_ctx=None,  # supply a runtime context later if you want gated edges
         )
 
-        return val_plan, column_types
+        return val_plan, column_types, model_data

focus_validator/rules/model-1.2.json → focus_validator/rules/model-1.2.0.1.json

@@ -1,6 +1,6 @@
 {
   "Details": {
-    "ModelVersion": "1.2",
+    "ModelVersion": "1.2.0.1",
     "FOCUSVersion": "1.2"
   },
   "ApplicabilityCriteria": {
@@ -9713,7 +9713,7 @@
         },
         "Condition": {
           "CheckFunction": "CheckNotValue",
-          "CheckCondition": "ResourceId",
+          "ColumnName": "ResourceId",
           "Value": null
         },
         "Dependencies": [
@@ -12674,7 +12674,7 @@
         "MustSatisfy": "CommitmentDiscountStatus MUST be null when CommitmentDiscountId is null.",
         "Keyword": "MUST",
         "Requirement": {
-          "CheckFunction": "CheckNotValue",
+          "CheckFunction": "CheckValue",
           "ColumnName": "CommitmentDiscountStatus",
           "Value": null
         },