GridPath v2025.10.2

Merge pull request #1319 from blue-marble/develop

Author: anamileva

db/utilities/common_functions.py

@@ -1359,14 +1359,14 @@ def update_subscenario_id_with_defaults(
     data_columns_str = ", ".join(data_columns)
 
     # Insert default values from the default subscenario ID for all primary
-    # key values that do not existin int he subscenario ID
+    # key values that do not exist in the subscenario ID
     insert_sql = f"""
     INSERT INTO inputs_{table}
     ({subscenario}, {primary_key_columns_wo_subscenario_str}, {data_columns_str})
     SELECT {subscenario_id}, {primary_key_columns_wo_subscenario_str}, {data_columns_str}
     FROM inputs_{table}
      WHERE {subscenario} = {default_subscenario_id}
-        AND {primary_key_columns_wo_subscenario_str} NOT IN (
+        AND ({primary_key_columns_wo_subscenario_str}) NOT IN (
             SELECT {primary_key_columns_wo_subscenario_str}
             FROM inputs_{table}
             WHERE {subscenario} = {subscenario_id}

gridpath/auxiliary/validations.py

@@ -95,7 +95,6 @@ def write_validation_to_database(
     VALUES (?, ?, ?, ?, ?, ?, ?, ?);
     """
     spin_on_database_lock(conn, c, sql, rows)
-    conn.close()
 
     return True
 

gridpath/import_scenario_results.py

@@ -134,19 +134,17 @@ def import_scenario_results_into_database(
                             "results",
                         )
                         if not quiet:
-                            if weather_iteration_str != "":
-                                print(f"--- weather iteration " f"{weather_iteration}")
-                            if hydro_iteration_str != "":
-                                print(f"--- hydro iteration " f"{hydro_iteration}")
-                            if availability_iteration_str != "":
-                                print(
-                                    f"--- availability iteration "
-                                    f"{availability_iteration}"
-                                )
-                            if subproblem_str != "":
-                                print(f"--- subproblem {subproblem_str}")
-                            if stage_str != "":
-                                print(f"--- stage {stage_str}")
+                            current_suproblem = os.path.join(
+                                weather_iteration_str,
+                                hydro_iteration_str,
+                                availability_iteration_str,
+                                subproblem_str,
+                                stage_str,
+                            )
+                            if current_suproblem.endswith("/"):
+                                current_suproblem = current_suproblem[:-1]
+
+                            print(f"--- subproblem: {current_suproblem}")
 
                         # Import termination condition data
                         c = db.cursor()

gridpath/project/operations/fix_commitment.py

@@ -22,6 +22,7 @@
 import os.path
 from pandas import read_csv
 from pyomo.environ import Set, Param, NonNegativeReals, Expression
+import warnings
 
 
 from gridpath.auxiliary.auxiliary import (
@@ -373,13 +374,23 @@ def export_pass_through_inputs(
             fixed_commitment_file, delimiter="\t", lineterminator="\n"
         )
         for g, tmp in m.FNL_COMMIT_PRJ_OPR_TMPS:
+            commitment_value = m.Commitment[g, tmp].expr.value
+            if commitment_value < 0:
+                warnings.warn(
+                    f"Commitment for ({g}, {tmp}) is "
+                    f"{commitment_value}; changing to 0 in "
+                    f"pass-through inputs to avoid data type error "
+                    f"when loading into next stage. This is "
+                    f"expected due to solver optimality tolerances."
+                )
+                commitment_value = 0
             fixed_commitment_writer.writerow(
                 [
                     g,
                     tmp,
                     stage,
                     final_commitment_stage_dict[g],
-                    m.Commitment[g, tmp].expr.value,
+                    commitment_value,
                 ]
             )
 

gridpath/run_scenario.py

@@ -292,8 +292,12 @@ def run_optimization_for_subproblem_stage(
                 hydro_iteration_directory,
                 availability_iteration_directory,
                 subproblem_directory,
+                stage_directory,
             )
-            print(f"--- subproblem {current_suproblem}")
+            if current_suproblem.endswith("/"):
+                current_suproblem = current_suproblem[:-1]
+
+            print(f"--- subproblem: {current_suproblem}")
 
         # We're expecting subproblem and stage to be strings downstream from here
         subproblem_directory = str(subproblem_directory)

requirements.txt

@@ -1,15 +1,15 @@
 alabaster==0.7.16
-asttokens==3.0.0
+asttokens==3.0.1
 attrs==25.4.0
 babel==2.17.0
-black==25.9.0
+black==25.11.0
 bokeh==3.8.0
-certifi==2025.10.5
-charset-normalizer==3.4.3
-click==8.3.0
+certifi==2025.11.12
+charset-normalizer==3.4.4
+click==8.3.1
 contourpy==1.3.3
-coverage==6.5.0
-coveralls==3.3.1
+coverage==7.12.0
+coveralls==4.0.2
 decorator==5.2.1
 df2img==0.2.21
 dill==0.3.8
@@ -18,35 +18,35 @@ docutils==0.20.1
 duckdb==1.4.0
 executing==2.2.1
 fastjsonschema==2.21.2
-GridPath==2025.10.1
-gurobipy==12.0.3
-highspy==1.11.0
+GridPath==2025.10.2
+gurobipy==13.0.0
+highspy==1.12.0
 idna==3.11
 imagesize==1.4.1
-ipython==9.6.0
+ipython==9.7.0
 ipython_pygments_lexers==1.1.1
 jedi==0.19.2
 Jinja2==3.1.6
 jsonschema==4.25.1
 jsonschema-specifications==2025.9.1
-jupyter_core==5.8.1
+jupyter_core==5.9.1
 kaleido==0.2.1
 MarkupSafe==3.0.3
-matplotlib-inline==0.1.7
+matplotlib-inline==0.2.1
 mypy_extensions==1.1.0
-narwhals==2.8.0
+narwhals==2.12.0
 nbformat==5.10.4
 networkx==3.5
 nose==1.3.7
-numpy==2.3.3
+numpy==2.3.5
 packaging==25.0
 pandas==2.3.2
 parso==0.8.5
 pathspec==0.12.1
 pexpect==4.9.0
-pillow==11.3.0
+pillow==12.0.0
 platformdirs==4.5.0
-plotly==6.3.1
+plotly==6.5.0
 ply==3.11
 prompt_toolkit==3.0.52
 pscript==0.8.0
@@ -55,13 +55,13 @@ pure_eval==0.2.3
 Pygments==2.19.2
 pyomo==6.9.4
 python-dateutil==2.9.0.post0
-pytokens==0.1.10
+pytokens==0.3.0
 pytz==2025.2
 PyUtilib==6.0.0
 PyYAML==6.0.3
 referencing==0.37.0
 requests==2.32.5
-rpds-py==0.27.1
+rpds-py==0.29.0
 six==1.17.0
 snowballstemmer==3.0.1
 Sphinx==7.2.6
@@ -78,4 +78,4 @@ traitlets==5.14.3
 tzdata==2025.2
 urllib3==2.5.0
 wcwidth==0.2.14
-xyzservices==2025.4.0
+xyzservices==2025.11.0

version.py

@@ -1 +1 @@
-__version__ = "v2025.10.1"
+__version__ = "v2025.10.2"