From ef33bf3a3b4bcbcf56ddedb8036df6df9ed6d2de Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Fri, 9 Oct 2026 21:19:12 -0700 Subject: [PATCH 1/2] put regex string in own variable --- src/synoptic/json_parsers.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/synoptic/json_parsers.py b/src/synoptic/json_parsers.py index 7076a98..fef693a 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", From ba849e5bb310b7473a1eb5782becdd1515307524 Mon Sep 17 00:00:00 2001 From: Brian Blaylock Date: Fri, 9 Oct 2026 21:20:20 -0700 Subject: [PATCH 2/2] # .replace() leaves unmatched keys untouched (units == variable name); # replace_strict(default=None) gives a null instead. --- src/synoptic/json_parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/synoptic/json_parsers.py b/src/synoptic/json_parsers.py index fef693a..316bfbf 100644 --- a/src/synoptic/json_parsers.py +++ b/src/synoptic/json_parsers.py @@ -71,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") )