ngiab-data-preprocess 4.2.0__py3-none-any.whl → 4.2.2__py3-none-any.whl

map_app/static/css/toggle.css

@@ -34,24 +34,27 @@
     background-color: white;
     border-radius: 18px;
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-    transition: transform 0.3s ease, box-shadow 0.3s ease;
+    transition:
+        transform 0.3s ease,
+        box-shadow 0.3s ease;
     display: flex;
     justify-content: center;
     align-items: center;
     font-size: 14px;
     font-weight: bold;
-    color: #4CAF50; /* Default color for the selected text */
+    color: #4caf50; /* Default color for the selected text */
 }
 
 /* Toggle Text (NWM and AORC labels) */
 .toggle-text {
     position: absolute;
     top: 50%;
+    min-width: 40px;
+    text-align: center;
     transform: translateY(-50%);
     font-size: 14px;
     font-weight: bold;
     color: #888; /* Grey color for non-selected text */
-    transition: color 0.3s ease;
 }
 
 .toggle-text-left {
@@ -70,7 +73,7 @@
 .toggle-input:checked + .toggle-label .toggle-handle {
     transform: translateX(56px);
     box-shadow: 0 0 10px rgba(0, 123, 255, 0.8); /* Blue glow effect */
-    color: #007BFF; /* Blue color for the selected text */
+    color: #007bff; /* Blue color for the selected text */
 }
 
 .toggle-input:checked + .toggle-label .toggle-text-left {
@@ -79,4 +82,4 @@
 
 .toggle-input:checked + .toggle-label .toggle-text-right {
     color: #888; /* Grey color for non-selected text */
-}
+}

map_app/static/js/main.js

@@ -12,16 +12,28 @@ var colorDict = {
 
 // A function that creates a cli command from the interface
 function create_cli_command() {
+    const cliPrefix = document.getElementById('cli-prefix');
+    cliPrefix.style.opacity = 1;
     var selected_basins = $('#selected-basins').text();
     var start_time = document.getElementById('start-time').value.split('T')[0];
     var end_time = document.getElementById('end-time').value.split('T')[0];
-    var command = `python -m ngiab_data_cli -i ${selected_basins} --subset --start ${start_time} --end ${end_time} --forcings --realization --run`;
-    var command_all = `python -m ngiab_data_cli -i ${selected_basins} --start ${start_time} --end ${end_time} --all`;
+    var command = `-i ${selected_basins} --subset --start ${start_time} --end ${end_time} --forcings --realization --run`;
+    var command_all = `-i ${selected_basins} --start ${start_time} --end ${end_time} --all`;
     if (selected_basins != "None - get clicking!") {
         $('#cli-command').text(command);
     }
 }
 
+function updateCommandPrefix(){
+  const toggleInput = document.getElementById('runcmd-toggle');
+  const cliPrefix = document.getElementById('cli-prefix');
+  const uvxText = "uvx --from ngiab_data_preprocess cli"
+  const pythonText = "python -m ngiab_data_cli"
+  // Set initial handle text based on the default state using data attribute
+  cliPrefix.textContent = toggleInput.checked ? pythonText : uvxText;
+}
+document.getElementById("runcmd-toggle").addEventListener('change', updateCommandPrefix);
+
 // These functions are exported by data_processing.js
 document.getElementById('map').addEventListener('click', create_cli_command);
 document.getElementById('start-time').addEventListener('change', create_cli_command);
@@ -34,9 +46,9 @@ maplibregl.addProtocol("pmtiles", protocol.tile);
 
 // select light-style if the browser is in light mode
 // select dark-style if the browser is in dark mode
-var style = 'static/resources/light-style.json';
+var style = 'https://communityhydrofabric.s3.us-east-1.amazonaws.com/map/styles/light-style.json';
 if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-    style = 'static/resources/dark-style.json';
+  style = 'https://communityhydrofabric.s3.us-east-1.amazonaws.com/map/styles/dark-style.json';
 }
 var map = new maplibregl.Map({
     container: 'map', // container id
@@ -48,7 +60,7 @@ function update_map(cat_id, e) {
     $('#selected-basins').text(cat_id)
     map.setFilter('selected-catchments', ['any', ['in', 'divide_id', cat_id]]);
     map.setFilter('upstream-catchments', ['any', ['in', 'divide_id', ""]])
-    
+
     fetch('/get_upstream_catids', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -57,7 +69,7 @@ function update_map(cat_id, e) {
     .then(response => response.json())
     .then(data => {
         map.setFilter('upstream-catchments', ['any', ['in', 'divide_id', ...data]]);
-        if (data.length === 0) { 
+        if (data.length === 0) {
             new maplibregl.Popup()
             .setLngLat(e.lngLat)
             .setHTML('No upstreams')
@@ -66,7 +78,7 @@ function update_map(cat_id, e) {
     });
 }
 map.on('click', 'catchments', (e) => {
-    cat_id = e.features[0].properties.divide_id;    
+    cat_id = e.features[0].properties.divide_id;
     update_map(cat_id, e);
 });
 
@@ -101,26 +113,38 @@ map.on('mouseleave', 'conus_gages', () => {
 });
 
 map.on('click', 'conus_gages', (e) => {
-    //  https://waterdata.usgs.gov/monitoring-location/02465000 
+    //  https://waterdata.usgs.gov/monitoring-location/02465000
     window.open("https://waterdata.usgs.gov/monitoring-location/" + e.features[0].properties.hl_link, '_blank');
 }
 );
 show = false;
 
 // TOGGLE BUTTON LOGIC
-const toggleInput = document.querySelector('.toggle-input');
-const toggleHandle = document.querySelector('.toggle-handle');
-
-// Set initial text based on the default state
-toggleHandle.textContent = toggleInput.checked ? 'AORC' : 'NWM';
+function initializeToggleSwitches() {
+    // Find all toggle switches
+    const toggleSwitches = document.querySelectorAll('.toggle-switch');
+    // Process each toggle switch
+    toggleSwitches.forEach(toggleSwitch => {
+        const toggleInput = toggleSwitch.querySelector('.toggle-input');
+        const toggleHandle = toggleSwitch.querySelector('.toggle-handle');
+        const leftText = toggleSwitch.querySelector('.toggle-text-left').textContent;
+        const rightText = toggleSwitch.querySelector('.toggle-text-right').textContent;
+        // Set initial handle text based on the default state using data attribute
+        toggleHandle.textContent = toggleInput.checked ? rightText : leftText;
+        // Add event listener
+        toggleInput.addEventListener('change', function() {
+            setTimeout(() => {
+                if (this.checked) {
+                    toggleHandle.textContent = rightText;
+                } else {
+                    toggleHandle.textContent = leftText;
+                }
+            }, 180);
+        });
+    });
+}
+document.addEventListener('DOMContentLoaded', initializeToggleSwitches);
 
-toggleInput.addEventListener('change', function() {
-    if (this.checked) {
-        toggleHandle.textContent = 'AORC'; // Update handle text to AORC
-    } else {
-        toggleHandle.textContent = 'NWM'; // Update handle text to NWM
-    }
-});
 
 show = false;
 const toggleButton = document.querySelector('#toggle-button');
@@ -135,4 +159,3 @@ toggleButton.addEventListener('click', () => {
         show = true;
     }
 });
-

map_app/templates/index.html

@@ -17,15 +17,23 @@
 
 <body>
     <header>
-        <h1>Select catchments by clicking!</h1>        
+        <h1>Select catchments by clicking!</h1>
     </header>
 
     <main>
         <section id="map-container">
-            <div id="map"><button id="toggle-button">Show gages</button></div>  
-                      
+            <div id="map"><button id="toggle-button">Show gages</button></div>
+
             <div class="command-container">
                 <div class="command-header">
+                        <div class="toggle-switch">
+                            <input type="checkbox" id="runcmd-toggle" class="toggle-input">
+                            <label for="runcmd-toggle" class="toggle-label">
+                                <span class="toggle-text toggle-text-left">UVX</span>
+                                <span class="toggle-text toggle-text-right">Pip</span>
+                                <span class="toggle-handle"></span>
+                            </label>
+                        </div>
                     <span>Command</span>
                     <button id="copy-to-clip" class="copy-button" aria-label="Copy to clipboard">
                         <svg class="copy-icon" viewBox="0 0 16 16" width="16" height="16">
@@ -35,22 +43,27 @@
                         <span class="copy-text">Copy</span>
                     </button>
                 </div>
-                <div id="cli-command" class="command-content"></div>
+                <div id="command-builder">
+                    <div id="cli-prefix" class="command-content">uvx --from ngiab_data_preprocess cli </div>
+                    <div id="cli-command" class="command-content"></div>
+                </div>
             </div>
             <script>
                 document.getElementById('copy-to-clip').addEventListener('click', async function() {
+                    const commandPrefix = document.getElementById('cli-prefix').textContent;
                     const commandText = document.getElementById('cli-command').textContent;
+                    const full_command = commandPrefix + commandText;
                     const button = this;
-                    
+
                     try {
-                        await navigator.clipboard.writeText(commandText);
-                        
+                        await navigator.clipboard.writeText(full_command);
+
                         // Update button state
                         button.classList.add('copied');
                         const copyText = button.querySelector('.copy-text');
                         const originalText = copyText.textContent;
                         copyText.textContent = 'Copied!';
-                        
+
                         // Reset button state after 2 seconds
                         setTimeout(() => {
                             button.classList.remove('copied');
@@ -62,7 +75,7 @@
                 });
             </script>
             <h2>For selection by gage id please use the cli.</h2>
-        </section> 
+        </section>
         <section id="basins-container">
             <h2>Selected Basins</h2>
             <div id="selected-basins">None - get clicking!</div>

map_app/views.py

@@ -3,22 +3,22 @@ import logging
 from datetime import datetime
 from pathlib import Path
 
+import geopandas as gpd
 from data_processing.create_realization import create_realization
+from data_processing.dataset_utils import save_and_clip_dataset
+from data_processing.datasets import load_aorc_zarr, load_v3_retrospective_zarr
 from data_processing.file_paths import file_paths
 from data_processing.forcings import create_forcings
-from data_processing.datasets import load_aorc_zarr, load_v3_retrospective_zarr
-from data_processing.dataset_utils import save_and_clip_dataset
 from data_processing.graph_utils import get_upstream_cats, get_upstream_ids
 from data_processing.subset import subset
 from flask import Blueprint, jsonify, render_template, request
 
-import geopandas as gpd
-
 main = Blueprint("main", __name__)
 intra_module_db = {}
 
 logger = logging.getLogger(__name__)
 
+
 @main.route("/")
 def index():
     return render_template("index.html")
@@ -86,8 +86,8 @@ def get_forcings():
     app = intra_module_db["app"]
     debug_enabled = app.debug
     app.debug = False
-    logger.info(f"get_forcings() disabled debug mode at {datetime.now()}")
-    print(f"forcing_dir: {output_folder}")
+    logger.debug(f"get_forcings() disabled debug mode at {datetime.now()}")
+    logger.debug(f"forcing_dir: {output_folder}")
     try:
         if data_source == "aorc":
             data = load_aorc_zarr(start_time.year, end_time.year)
@@ -138,5 +138,5 @@ def get_logs():
                 if len(reversed_lines) > 100:
                     break
             return jsonify({"logs": reversed_lines}), 200
-    except Exception as e:
+    except Exception:
         return jsonify({"error": "unable to fetch logs"})

{ngiab_data_preprocess-4.2.0.dist-info → ngiab_data_preprocess-4.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.2.0
+Version: 4.2.2
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess
@@ -23,8 +23,6 @@ Requires-Dist: zarr==2.17.1
 Requires-Dist: netCDF4>=1.6.5
 Requires-Dist: dask==2024.4.1
 Requires-Dist: dask[distributed]==2024.4.1
-Requires-Dist: black==24.3.0
-Requires-Dist: isort==5.13.2
 Requires-Dist: h5netcdf==1.3.0
 Requires-Dist: exactextract==0.2.0
 Requires-Dist: numpy>=1.26.4

{ngiab_data_preprocess-4.2.0.dist-info → ngiab_data_preprocess-4.2.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-data_processing/create_realization.py,sha256=AxUDVSORjwd6IAImZpgDr8GRHKSUQF8emQi1ikfIno4,14899
+data_processing/create_realization.py,sha256=BqGtJSfl-XlsCQOIxonQcZKxLddz_LE18x6At4qCiRo,14948
 data_processing/dataset_utils.py,sha256=4qmRmK3qMWPkiWZHXhXv3c-ISbtOwr7QhciEl2ok6Ao,7314
 data_processing/datasets.py,sha256=BB_X0IvGnUrjBmj-wryn6-Nv5cd0Lje3zly3p896eU4,4822
 data_processing/file_paths.py,sha256=Cp3BxbO6sD50464ciTshjb3Z0vTvL0ZeSbOJgNdOqQ0,4698
-data_processing/forcings.py,sha256=6Q9fSXa67OrXg_r9li0K9widsclN2DQUp1-oUH2tZwo,19208
-data_processing/gpkg_utils.py,sha256=j-j6TkCwlkOzM5ATMHi44raYS-xrJMzk5V0XQZ_0dzQ,20220
+data_processing/forcings.py,sha256=bHVXEUpSTzw3iBdw6_jww0Wk_HksZseWdFJ0oF-Ri-E,18910
+data_processing/gpkg_utils.py,sha256=fr0X62HawnSXzWRHcC_9aFrnoKv5atz4XkalydxCSko,20538
 data_processing/graph_utils.py,sha256=I9IFkU08SkXb8pfVASTvkm7T8BYt-92CaNj7TV6wJFE,8244
 data_processing/s3fs_utils.py,sha256=WoqqwxkHpv0Qq4I5f5-gUZBCFtVQ68ehXbdOjWRKTDQ,2752
-data_processing/subset.py,sha256=GbvfAaSJTfEvYOAZ6K0OgFA81xG_Y5UxiGDxukxO9gE,2558
+data_processing/subset.py,sha256=ns-WIHzshi74CFetmGsYvd72QgNtQFwl6Avc9rIYpf4,2604
 data_sources/cfe-nowpm-realization-template.json,sha256=8an6q1drWD8wU1ocvdPab-GvZDvlQ-0di_-NommH3QI,3528
 data_sources/cfe-template.ini,sha256=6e5-usqjWtm3MWVvtm8CTeZTJJMxO1ZswkOXq0L9mnc,2033
 data_sources/em-catchment-template.yml,sha256=M08ixazEUHYI2PNavtI0xPZeSzcQ9bg2g0XzNT-8_u4,292
@@ -20,25 +20,23 @@ data_sources/template.sql,sha256=ZnFqAqleEq9wgmAhNO90Wue_L9k0JAn8KF99DYtcxgs,104
 data_sources/triggers.sql,sha256=G0d_175eNsamKAFhsbphPATvzMPuPL_iCleIhlToduQ,14906
 map_app/__init__.py,sha256=OarJao9X98kcbLyiwewN4ObWNAYkKDichcxbuWywTsA,818
 map_app/__main__.py,sha256=D9uuAcsOUyfgYqGXQwsmNLo3n3BQ8pnziCAQWQnV4RU,1617
-map_app/views.py,sha256=L4ng9lqpLuWglTxk3iZ2NzfP1ASGpPwQTojKN2d8YzE,5119
+map_app/views.py,sha256=0T-tvAzyfD1ttEQsZ84iAc2ELVN_KS056_YxiyHQ_DE,5122
 map_app/static/css/console.css,sha256=xN6G2MMFyKc9YW9HEVpUUTUjx2o2nokBR4nCX5c18UM,803
-map_app/static/css/main.css,sha256=Vm_I4HnFDa2IvpWeuhN72DxtOOHHN2LUZvN0REQwZyU,6050
-map_app/static/css/toggle.css,sha256=cWsWqeuzQVc0b55kZ8alHaMWzoAJwaklbNWuR-PyN38,1884
+map_app/static/css/main.css,sha256=UkctdgBijejzpjhLVwOBx2LxdPAY625_yTIe90fKpv0,6188
+map_app/static/css/toggle.css,sha256=Ep6tXT7gCrPRRITuEMpXyisuiTQgiLIEKFFTWRmC82o,1913
 map_app/static/js/console.js,sha256=BnG0pED5B9d563sLWshDNt_q-SyoTY48sETvVoOVJkU,1377
 map_app/static/js/data_processing.js,sha256=X6NSuggOGNIJUF-LEyGGYJjtiA5J29xmkXgFFmfBw18,6711
-map_app/static/js/main.js,sha256=oLO2mwfVpjyabNXTcCh3nvDbz3XlOJejS610rSMvYKM,5588
-map_app/static/resources/dark-style.json,sha256=iD9RXryjL-NLbJTbODoAkmx3jhXCUqTJ7lXMCxzqsoY,418578
-map_app/static/resources/light-style.json,sha256=DaE52qKpAkjiWSKY_z7LxreqA2rW4ZyQkhUWE5VIo3Y,418612
+map_app/static/js/main.js,sha256=dM0fCzNg-nV3wEqZFQ_wEam0Sm8RqHOv2GgRYg97pQQ,6875
 map_app/static/resources/loading.gif,sha256=ggdkZf1AD7rSwIpSJwfiIqANgmVV1WHlxGuKxQKv7uY,72191
 map_app/static/resources/screenshot.jpg,sha256=Ia358aX-OHM9BP4B8lX05cLnguF2fHUIimno9bnFLYw,253730
-map_app/templates/index.html,sha256=ITRzQEYn15sFN4qRACjaNj5muhalOeP9n_IwcdsIlUs,6631
+map_app/templates/index.html,sha256=82zRdoPar5qfgdwFiVkuXeIQC4okt9iDgCPeNxKdX9I,7403
 ngiab_data_cli/__main__.py,sha256=V-g0dwa000e5Qye7PBMTtHTK7Cl7as3JS0UoAR0QrZ4,10503
 ngiab_data_cli/arguments.py,sha256=7ptImy8tLM1XvjfDr13tZszkjGVtenXo0KqllJeE3Mw,4372
 ngiab_data_cli/custom_logging.py,sha256=iS2XozaxudcxQj17qAsrCgbVK9LJAYAPmarJuVWJo1k,1280
 ngiab_data_cli/forcing_cli.py,sha256=lkcqWDk5H8IPyGv0DwLIZMQldqTUXpfwSX0C_RIuIJ8,3890
-ngiab_data_preprocess-4.2.0.dist-info/licenses/LICENSE,sha256=6dMSprwwnsRzEm02mEDbKHD9dUbL8bPIt9Vhrhb0Ulk,1081
-ngiab_data_preprocess-4.2.0.dist-info/METADATA,sha256=Y2NVmd92S38QMwKXEkLvLKyWQ2IGy25okHV8sDy6c2c,10310
-ngiab_data_preprocess-4.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ngiab_data_preprocess-4.2.0.dist-info/entry_points.txt,sha256=spwlhKEJ3ZnNETQsJGeTjD7Vwy8O_zGHb9GdX8ACCtw,128
-ngiab_data_preprocess-4.2.0.dist-info/top_level.txt,sha256=CjhYAUZrdveR2fOK6rxffU09VIN2IuPD7hk4V3l3pV0,52
-ngiab_data_preprocess-4.2.0.dist-info/RECORD,,
+ngiab_data_preprocess-4.2.2.dist-info/licenses/LICENSE,sha256=6dMSprwwnsRzEm02mEDbKHD9dUbL8bPIt9Vhrhb0Ulk,1081
+ngiab_data_preprocess-4.2.2.dist-info/METADATA,sha256=qzh_j7XnKUvF6Zq4sx3idNEp1MneIpAL8ci06lfZDLw,10252
+ngiab_data_preprocess-4.2.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+ngiab_data_preprocess-4.2.2.dist-info/entry_points.txt,sha256=spwlhKEJ3ZnNETQsJGeTjD7Vwy8O_zGHb9GdX8ACCtw,128
+ngiab_data_preprocess-4.2.2.dist-info/top_level.txt,sha256=CjhYAUZrdveR2fOK6rxffU09VIN2IuPD7hk4V3l3pV0,52
+ngiab_data_preprocess-4.2.2.dist-info/RECORD,,

{ngiab_data_preprocess-4.2.0.dist-info → ngiab_data_preprocess-4.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any