Skip to content

fix: update shef infile importer to handle nwo infiles #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Enovotny merged 1 commit into from
May 13, 2026
Merged

fix: update shef infile importer to handle nwo infiles #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions cwmscli/commands/shef/import_infile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,17 +388,23 @@ def _contextual_parse(
current_send_code = "ZZZ"
current_shef_loc: Optional[str] = None
location_map: dict[str, str] = {} # cwms_location_name -> shef_id
version_send_codes: dict[str, str] = {} # cwms_version -> send_code

for raw in text.splitlines():
s = raw.strip()
if not s or s.startswith("#"):
continue

# TS * = SEND_CODE
m = re.match(r"^TS\s+\*\s*=\s*(\S+)\s*$", s, re.IGNORECASE)
# TS * = SEND_CODE or TS VersionName = SEND_CODE
m = re.match(r"^TS\s+(\S+)\s*=\s*(\S+)\s*$", s, re.IGNORECASE)
if m:
current_send_code = m.group(1)
log.debug("Send code → %s", current_send_code)
ts_key, ts_val = m.group(1), m.group(2)
if ts_key == "*":
current_send_code = ts_val
log.debug("Send code → %s", ts_val)
else:
version_send_codes[ts_key] = ts_val
log.debug("Version send code: %s → %s", ts_key, ts_val)
continue

# PE pattern = CODE[;units=UNIT] (positional — update mappings in place)
Expand Down Expand Up @@ -458,6 +464,7 @@ def _contextual_parse(
cwms_location = cwms_parts[0]
cwms_parameter = cwms_parts[1]
cwms_duration = cwms_parts[4]
cwms_version = cwms_parts[5]

# Resolve SHEF location
# 1. Exact match in location_map
Expand Down Expand Up @@ -491,10 +498,12 @@ def _contextual_parse(
shef_loc = mapped_value
if not shef_loc:
shef_loc = current_shef_loc

if not shef_loc:
log.warning("No SHEF location found for TSID: %s — skipping.", tsid_str)
continue
shef_loc = cwms_location
log.debug(
"No LOCATION mapping for %s — using CWMS location as SHEF ID",
cwms_location,
)

# Resolve PE code (first matching rule wins)
pe_code = _resolve_pe_code(cwms_parameter, pe_mappings)
Expand All @@ -511,12 +520,13 @@ def _contextual_parse(
if not units and pe_code in pe_units:
units = pe_units[pe_code]

send_code = version_send_codes.get(cwms_version, current_send_code)
entry = {
"tsid": tsid_str,
"shef_loc": shef_loc,
"pe_code": pe_code,
"duration": str(duration_value),
"send_code": current_send_code,
"send_code": send_code,
}
if units:
entry["units"] = units
Expand Down
Loading