diff --git a/src/synoptic/json_parsers.py b/src/synoptic/json_parsers.py index 7076a98..316bfbf 100644 --- a/src/synoptic/json_parsers.py +++ b/src/synoptic/json_parsers.py @@ -50,12 +50,9 @@ def parse_raw_variable_column( A mapping of the variable names to unit, as provided by `SynopticAPI().UNITS`. """ + VAR_RE = r"^(?.+?)_(?:value|set)_(?\d+)(?d?)$" return ( - df.with_columns( - pl.col("variable").str.extract_groups( - r"(?.+)_(?:value|set)_(?\d)(?d?)" - ) - ) + df.with_columns(pl.col("variable").str.extract_groups(VAR_RE)) .unnest("variable") .with_columns( pl.col("is_derived") == "d", @@ -74,7 +71,7 @@ def attach_units(df, units_dict): `SynopticAPI().UNITS`. """ return df.with_columns( - pl.col("variable").replace(units_dict).alias("units"), + pl.col("variable").replace_strict(units_dict, default=None).alias("units") )