Merge pull request #1390 from Sage-Bionetworks/develop-allow-na-if-at…

…tribute-not-required-FDS-1352 Allow non-entry if Required=False
Sage-Bionetworks · Apr 5, 2024 · ccadaaa · ccadaaa
2 parents f91c4ed + 6fecab4
commit ccadaaa
Show file tree

Hide file tree

Showing 12 changed files with 2,073 additions and 220 deletions.
diff --git a/schematic/models/GE_Helpers.py b/schematic/models/GE_Helpers.py
@@ -140,7 +140,7 @@ def build_expectation_suite(
             "str": "expect_column_values_to_be_of_type",
             "num": "expect_column_values_to_be_in_type_list",
             "date": "expect_column_values_to_be_dateutil_parseable",
-            "recommended": "expect_column_values_to_not_match_regex_list",
+            "recommended": "expect_column_values_to_not_be_null",
             "protectAges": "expect_column_values_to_be_between",
             "unique": "expect_column_values_to_be_unique",
             "inRange": "expect_column_values_to_be_between",
@@ -255,7 +255,6 @@ def build_expectation_suite(
 
                     elif base_rule == ("recommended"):
                         args["mostly"] = 0.0000000001
-                        args["regex_list"] = ["^$"]
                         meta = {
                             "notes": {
                                 "format": "markdown",

diff --git a/schematic/models/metadata.py b/schematic/models/metadata.py
@@ -233,6 +233,7 @@ def validateModelManifest(
         manifest = load_df(
             manifestPath,
             preserve_raw_input=False,
+            allow_na_values=True,
             **load_args,
         )  # read manifest csv file as is from manifest path