NGWPC PI-6 Delivery: Replace and Route by taddyb · Pull Request #857 · NOAA-OWP/t-route

taddyb · 2025-07-09T21:39:59Z

Note: The following commit hashes are related to previous NGWPC deliverables

a4eab3d
- PI4 feature integration tests NGWPC/t-route#8
- RTX Code Release (PI-4): T-Route Integration Test additions #849
1ce34c2
- PI4 feature unit test updates NGWPC/t-route#9
- RTX Code Release (PI-4): T-Route Unit Test additions and cleanup #848
b902551
- Pi4 running troute using HF v2.2 NGWPC/t-route#10
- RTX Code Release (PI-4): T-Route RnR Enhancements to PI-3 Deliverables through v2.2 Hydrofabric integration #850

Commits starting at 39e6817 are related to this PI.

Most commits in the history contain PR information related to the changes made

Additions

Added the troute-rnr/ workspace package to the t-route ecosystem to run replace and route from https://github.com/NGWPC/hydrovis/tree/pi_6
Upgraded troute to the pydantic v2: updated troute-config to move to pydantic v2 NGWPC/t-route#12
created a compile-uv.sh script to speed up t-route compilations with UV

Removals

Changes

Testing

Tested through NGWPC demonstrations

Screenshots

Notes

Todos

Checklist

Testing checklist

Target Environment support

Windows
Linux
Browser

Accessibility

Keyboard friendly
Screen reader friendly

Other

* added integration tests * removed api data * removed duplicate test * updated LICENSE

* added t-route unit tests * removing outdated tests * upate LICENSE

* added files for RnR enhancements to the API, test data, docs * removed unneccessary files, updated LICENSE

…ackage (#11) * initial commit * patch: updated functions to make code more testable. Added error handling * pr changes * changing name of variable in main to be consistent * feat: pydantic updates * fix: commited pydantic changes too soon --------- Co-authored-by: Quercus <quercus.hamlin@outlook.com>

* updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed

* updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed

* updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * removed API * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * ensuring merge-conflict is resolved properly and code works

* updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * added tests for the t-route formatting * got restart test working * updated examples * added new test figure * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * removed API * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * ensuring merge-conflict is resolved properly and code works * added tests for the t-route formatting * got restart test working * removed unneccessary csvs

) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * added tests for the t-route formatting * got restart test working * updated examples * adding post_process script for rnr formatting * saving output file * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * removed API * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * ensuring merge-conflict is resolved properly and code works * JIRA 5918: Validate t-route runs with testing (#15) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * added tests for the t-route formatting * got restart test working * updated examples * added new test figure * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added icefabric hooks to get shortest paths on demand * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * moved troute run out of the format file * removed API * updated troute-config to move to pydantic v2 (#12) * updated troute-config to move to pydantic v2 * fixed incorrect pyproject * patch: forgot to upload a change in the data assimilation file * fixed incorrect pyproject * missed model rebuild * added comments for why typing tests were removed * ensuring merge-conflict is resolved properly and code works * added tests for the t-route formatting * got restart test working * removed unneccessary csvs * added legacy rnr code for formatting input flows * adding t-route support from rnr inputs * added tests for the t-route formatting * got restart test working

* added uv version of compiler.sh * removing icefabric from dependencies. Will provide wheels

* added uv version of compiler.sh * removing icefabric from dependencies. Will provide wheels * removed S3/boto3 aws reliance * removed a boto3 reference

* removed redis, fixed copy/paste error * patching post process script and pyyaml imports to ensure code works

…ch are out of CONUS (#20) * patch: solved error for missing reach id * solved num_messages bug

…#22) * updated post_processing to include filtering by time * added a function to format the .nc files after creation to contain RFC metadata * reformatted the post_process file to be what OWP specified

This reverts commit 3c36558.

This reverts commit 97316ce.

This reverts commit 3c36558.

This reverts commit 8477ad8.

hellkite500 · 2025-07-11T14:48:22Z

@@ -0,0 +1,128 @@
+#TODO add options for clean/noclean, make/nomake, cython/nocython


I would suggest keeping a single "compiler" script and simply adding an option to switch between python installer utilities.

hellkite500 · 2025-07-11T15:12:55Z

@@ -0,0 +1,27 @@
+#ifndef REACH_STRUCTS_H


Should this build dir be .gitignoreed?

…ng from dependency conflicts

taddyb and others added 26 commits April 9, 2025 15:11

PI4 feature integration tests (#8)

a4eab3d

* added integration tests * removed api data * removed duplicate test * updated LICENSE

PI4 feature unit test updates (#9)

1ce34c2

* added t-route unit tests * removing outdated tests * upate LICENSE

Pi4 running troute using HF v2.2 (#10)

b902551

* added files for RnR enhancements to the API, test data, docs * removed unneccessary files, updated LICENSE

added uv version of compiler.sh (#17)

e3cdfa6

* added uv version of compiler.sh * removing icefabric from dependencies. Will provide wheels

Patch: remove aws s3 cred references (#18)

2b6e024

* added uv version of compiler.sh * removing icefabric from dependencies. Will provide wheels * removed S3/boto3 aws reliance * removed a boto3 reference

Patch 05162025 (#19)

28e8288

* removed redis, fixed copy/paste error * patching post process script and pyyaml imports to ensure code works

PATCH: remove print from settings

5af0d09

Patch 06052025: Adding clearer error statements, and solving WFOs whi…

9673a1f

…ch are out of CONUS (#20) * patch: solved error for missing reach id * solved num_messages bug

Update main.py (#21)

968cbcb

JIRA 6401: Formatting the output.csv file in based on OWP suggestions (…

fb44ef4

…#22) * updated post_processing to include filtering by time * added a function to format the .nc files after creation to contain RFC metadata * reformatted the post_process file to be what OWP specified

Added a try/catch for t-route (#23)

d70945f

patch: adding prints for error handling to except value erros

fb2a0ce

added finally statement to ensure messages are acknowledged

35f8906

adding valueError to skip units other than kcfs

3c36558

adding try-except format to read_rfc_flows

8477ad8

Revert "adding valueError to skip units other than kcfs"

97316ce

This reverts commit 3c36558.

Revert "Revert "adding valueError to skip units other than kcfs""

d4935a4

This reverts commit 97316ce.

Revert "adding valueError to skip units other than kcfs"

aea3120

This reverts commit 3c36558.

Revert " adding try-except format to read_rfc_flows"

07200af

This reverts commit 8477ad8.

patch: added ValueError handling for incorrect stage

78a44bc

taddyb marked this pull request as ready for review July 10, 2025 15:38

hellkite500 reviewed Jul 11, 2025

View reviewed changes

fix: removed setuptools-scm from config pyproject as builds are faili…

23deac4

…ng from dependency conflicts

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

NGWPC PI-6 Delivery: Replace and Route#857

NGWPC PI-6 Delivery: Replace and Route#857
taddyb wants to merge 27 commits into
NOAA-OWP:masterfrom
NGWPC:pi_6

taddyb commented Jul 9, 2025 •

edited

Loading

Uh oh!

hellkite500 Jul 11, 2025

Uh oh!

hellkite500 Jul 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,128 @@
		#TODO add options for clean/noclean, make/nomake, cython/nocython

Uh oh!

Conversation

taddyb commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additions

Removals

Changes

Testing

Screenshots

Notes

Todos

Checklist

Testing checklist

Target Environment support

Accessibility

Other

Uh oh!

hellkite500 Jul 11, 2025

Choose a reason for hiding this comment

Uh oh!

hellkite500 Jul 11, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

taddyb commented Jul 9, 2025 •

edited

Loading