Skip to content

GEOPY-2731 - #213

Merged
domfournier merged 17 commits into
feature/uijsonfrom
GEOPY-2731
Jul 24, 2026
Merged

GEOPY-2731#213
domfournier merged 17 commits into
feature/uijsonfrom
GEOPY-2731

Conversation

@domfournier

Copy link
Copy Markdown
Contributor

No description provided.

Copilot AI review requested due to automatic review settings July 16, 2026 18:37
@domfournier domfournier changed the title Geopy 2731 GEOPY-2731 Jul 16, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR migrates geoapps-utils away from geoh5py.ui_json.InputFile toward the newer geoh5py.ui_json.UIJson API, updating the core driver startup flow, UIJson/group execution utilities, parameter sweep generation/driver logic, and the test suite to match the new serialization and file-writing behavior.

Changes:

  • Replace InputFile usage with UIJson in runtime code paths (Driver.start, run_uijson_group, ui.json copying, param sweep generation/execution).
  • Remove the legacy BaseParams implementation and update tests to validate the new UIJson-based behavior.
  • Update the base UI JSON template and adjust dependency pinning/lock files for the updated geoh5py API.

Reviewed changes

Copilot reviewed 28 out of 28 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
tests/uijson_run_test.py Refactors tests to use a shared uijson_path fixture and new output naming.
tests/param_sweeps/generate_test.py Updates test to serialize via options.ui_json.
tests/param_sweeps/driver_test.py Updates test to serialize via options.ui_json.
tests/dataclass_test.py Adjusts assertions and updates writing via params.ui_json.write(...).
tests/conftest.py Introduces uijson_path fixture and updates test driver/options scaffolding.
tests/base_test.py Aligns tests to UIJson serialization and new default-ui-json behavior.
pyproject.toml Switches geoh5py dependency rev to feature/uijson.
geoapps_utils/run.py Updates out-group execution and ui.json copying to use UIJson.
geoapps_utils/param_sweeps/generate.py Reworks sweep-file generation around UIJson + base template.
geoapps_utils/param_sweeps/driver.py Updates sweep driver to read/write UIJson and close workspace before copying.
geoapps_utils/driver/params.py Removes legacy BaseParams implementation.
geoapps_utils/base.py Updates Driver and Options to use UIJson as the primary representation.
geoapps_utils-assets/uijson/base.ui.json Expands out_group into a full form object.
environments/py-3.14-win-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.14-win-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.14-linux-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.14-linux-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.13-win-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.13-win-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.13-linux-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.13-linux-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.12-win-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.12-win-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.12-linux-64.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.
environments/py-3.12-linux-64-dev.conda.lock.yml Refreshes locked dependency set for new geoh5py rev.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/run.py
Comment thread tests/uijson_run_test.py Outdated
Comment thread pyproject.toml
# Conflicts:
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	environments/py-3.13-linux-64-dev.conda.lock.yml
#	environments/py-3.13-linux-64.conda.lock.yml
#	environments/py-3.13-win-64-dev.conda.lock.yml
#	environments/py-3.13-win-64.conda.lock.yml
#	environments/py-3.14-linux-64-dev.conda.lock.yml
#	environments/py-3.14-linux-64.conda.lock.yml
#	environments/py-3.14-win-64-dev.conda.lock.yml
#	environments/py-3.14-win-64.conda.lock.yml
#	geoapps_utils/driver/params.py
#	py-3.12.conda-lock.yml
#	py-3.13.conda-lock.yml
#	py-3.14.conda-lock.yml
#	pyproject.toml
#	tests/base_test.py
#	tests/dataclass_test.py
@codecov

codecov Bot commented Jul 16, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 73.23944% with 19 lines in your changes missing coverage. Please review.
✅ Project coverage is 84.60%. Comparing base (b6cd145) to head (789c123).
⚠️ Report is 5 commits behind head on feature/uijson.

Files with missing lines Patch % Lines
geoapps_utils/base.py 65.30% 13 Missing and 4 partials ⚠️
geoapps_utils/run.py 90.90% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           feature/uijson     #213   +/-   ##
===============================================
  Coverage           84.60%   84.60%           
===============================================
  Files                  18       18           
  Lines                 942      942           
  Branches              122      122           
===============================================
  Hits                  797      797           
  Misses                109      109           
  Partials               36       36           
Files with missing lines Coverage Δ
geoapps_utils/run.py 88.34% <90.90%> (ø)
geoapps_utils/base.py 77.22% <65.30%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@benk-mira benk-mira left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we generally replace input_file and ifile with uijson


file_path = Path(worker_uijson).resolve(strict=True)
ifile = InputFile.read_ui_json(file_path)
ifile = UIJson.read(file_path)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is dead code at this point, right? We don't expose the generate sweep file in any of the uijsons anymore and we wrote plate-sweep with new mechanics. Is DC2D still using this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well the mechanics are still valid - don't need/want to pull code here.

Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py Outdated
Comment thread geoapps_utils/base.py
Comment thread geoapps_utils/base.py Fixed
@domfournier
domfournier changed the base branch from develop to feature/uijson July 21, 2026 15:27
# Conflicts:
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	environments/py-3.13-linux-64-dev.conda.lock.yml
#	environments/py-3.13-linux-64.conda.lock.yml
#	environments/py-3.13-win-64-dev.conda.lock.yml
#	environments/py-3.13-win-64.conda.lock.yml
#	environments/py-3.14-linux-64-dev.conda.lock.yml
#	environments/py-3.14-linux-64.conda.lock.yml
#	environments/py-3.14-win-64-dev.conda.lock.yml
#	environments/py-3.14-win-64.conda.lock.yml
#	py-3.12.conda-lock.yml
#	py-3.13.conda-lock.yml
#	py-3.14.conda-lock.yml
#	pyproject.toml
@domfournier
domfournier merged commit 89cd6f5 into feature/uijson Jul 24, 2026
17 of 18 checks passed
@domfournier
domfournier deleted the GEOPY-2731 branch July 24, 2026 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants