Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 74368e25e3bc7f296b5e75d62111e2e2fe76bb281b8ce76523ee238f01e372c7
# input_hash: 8f70d81d47096021c15198e0a9db361184aabf56db353452c7852e436c5065f2

channels:
- conda-forge
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -100,7 +100,7 @@ dependencies:
- yaml=0.2.5=h280c20c_3
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 74368e25e3bc7f296b5e75d62111e2e2fe76bb281b8ce76523ee238f01e372c7
# input_hash: 8f70d81d47096021c15198e0a9db361184aabf56db353452c7852e436c5065f2

channels:
- conda-forge
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -88,7 +88,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 6edc8c2f6d302b4271667ea90878bf83a9f922e21ecfb73c480998517a49dec7
# input_hash: e2b9ff57aeb438c3e98a4060909ac33160218c068978035942766c5e088bc885

channels:
- conda-forge
Expand Down Expand Up @@ -46,7 +46,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -95,7 +95,7 @@ dependencies:
- yaml=0.2.5=h6a83c73_3
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 6edc8c2f6d302b4271667ea90878bf83a9f922e21ecfb73c480998517a49dec7
# input_hash: e2b9ff57aeb438c3e98a4060909ac33160218c068978035942766c5e088bc885

channels:
- conda-forge
Expand Down Expand Up @@ -42,7 +42,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -83,7 +83,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=h0e40799_0
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 2467c021e67c6ed79cb5c2602cf372ee016ac4ab319342fc1c2b0d3f606586e9
# input_hash: 98d03015fec33c4d2c8f1b7b10a1172ca3bc4381cf747261cbe925e62cd71eca

channels:
- conda-forge
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -100,7 +100,7 @@ dependencies:
- yaml=0.2.5=h280c20c_3
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 2467c021e67c6ed79cb5c2602cf372ee016ac4ab319342fc1c2b0d3f606586e9
# input_hash: 98d03015fec33c4d2c8f1b7b10a1172ca3bc4381cf747261cbe925e62cd71eca

channels:
- conda-forge
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -88,7 +88,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: a11d50f0f2ccc80642736d72d5cedd0262e46f9d0ce19283394d7bb8861b05e9
# input_hash: 3b5cba17bc125c1710296cce63d69f8f1e830c9f5c025eaad24646f040fb967d

channels:
- conda-forge
Expand Down Expand Up @@ -46,7 +46,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -95,7 +95,7 @@ dependencies:
- yaml=0.2.5=h6a83c73_3
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: a11d50f0f2ccc80642736d72d5cedd0262e46f9d0ce19283394d7bb8861b05e9
# input_hash: 3b5cba17bc125c1710296cce63d69f8f1e830c9f5c025eaad24646f040fb967d

channels:
- conda-forge
Expand Down Expand Up @@ -42,7 +42,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -83,7 +83,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=h0e40799_0
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: c037c60e4a5f0cf9a5e61ff2f264e541fe93097019fa23937727bee9560931f8
# input_hash: b98a45216385660ceb23e80d763cf44bb1e1806d2d80cf5f33d1168e9136aab7

channels:
- conda-forge
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -100,7 +100,7 @@ dependencies:
- yaml=0.2.5=h280c20c_3
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: c037c60e4a5f0cf9a5e61ff2f264e541fe93097019fa23937727bee9560931f8
# input_hash: b98a45216385660ceb23e80d763cf44bb1e1806d2d80cf5f33d1168e9136aab7

channels:
- conda-forge
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies:
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_5
- libstdcxx-ng=15.1.0=h4852527_5
- libtiff=4.7.0=h8261f1e_6
- libtiff=4.7.1=h8261f1e_0
- libuuid=2.41.1=he9a06e4_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
Expand Down Expand Up @@ -88,7 +88,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: ae90824004a23a39b3f36248bb2afec12708951659391c009439ee746e22fc4f
# input_hash: 419359b0e2eefb802674bbaba5588b034df7ac8e2b6dbaf23f658a96dec2c8f9

channels:
- conda-forge
Expand Down Expand Up @@ -46,7 +46,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -95,7 +95,7 @@ dependencies:
- yaml=0.2.5=h6a83c73_3
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: ae90824004a23a39b3f36248bb2afec12708951659391c009439ee746e22fc4f
# input_hash: 419359b0e2eefb802674bbaba5588b034df7ac8e2b6dbaf23f658a96dec2c8f9

channels:
- conda-forge
Expand Down Expand Up @@ -42,7 +42,7 @@ dependencies:
- libpng=1.6.50=h7351971_1
- libsqlite=3.50.4=hf5d6505_0
- libssh2=1.11.1=h9aa295b_0
- libtiff=4.7.0=h550210a_6
- libtiff=4.7.1=h550210a_0
- libwebp-base=1.6.0=h4d5522a_0
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
- libxcb=1.17.0=h0e4246c_0
Expand Down Expand Up @@ -83,7 +83,7 @@ dependencies:
- xorg-libxdmcp=1.1.5=h0e40799_0
- zstd=1.5.7=hbeecb71_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@0e6cacf4d90e18bc18b4247c839761b54a392ac6

variables:
KMP_WARNINGS: 0
26 changes: 23 additions & 3 deletions geoapps_utils/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,36 @@ def run(self):
"""Run the application."""

@classmethod
def start(cls, filepath: str | Path, mode="r+", **kwargs) -> Driver:
def read_ui_json(cls, filepath: str | Path, **kwargs) -> InputFile:
"""
Run application specified by 'filepath' ui.json file.
Read a ui.json file and return an InputFile object.

:param filepath: Path to valid ui.json file for the application driver.
:param kwargs: Additional keyword arguments for InputFile read_ui_json.

:return: InputFile object.
"""
logger.info("Loading input file . . .")
filepath = Path(filepath).resolve()
ifile = InputFile.read_ui_json(filepath, validations=cls._validations, **kwargs)
return InputFile.read_ui_json(filepath, validations=cls._validations, **kwargs)

@classmethod
def start(cls, filepath: str | Path | InputFile, mode="r+", **kwargs) -> Driver:
"""
Run application specified by 'filepath' ui.json file.

:param filepath: Path to valid ui.json file for the application driver.
:param kwargs: Additional keyword arguments for InputFile read_ui_json.
"""

ifile = (
cls.read_ui_json(filepath, **kwargs)
if isinstance(filepath, str | Path)
else filepath
)

if not isinstance(ifile, InputFile):
raise TypeError("Input file must be a string path or an InputFile object.")

with ifile.geoh5.open(mode=mode):
try:
Expand Down
Loading
Loading