Added function to find capacity column, replacing constant.

configs/offshore_fy22.json

@@ -0,0 +1,4 @@
+{
+    "project_name": "Testing Offshore- FY22",
+    "directory": "~/review_datasets/testing_offshore_fy22"
+}

configs/standard_scenarios_fy24.json

@@ -0,0 +1,4 @@
+{
+    "project_name": "Standard Scenarios - FY24",
+    "directory": "~/review_datasets/standard_scenarios_fy24"
+}

configs/temp_ice_test.json

@@ -0,0 +1,4 @@
+{
+    "project_name": "Bespoke Temp/Icing Cutoff Test",
+    "directory": "~/review_datasets/temp_ice_test"
+}

configs/transport_tests.json

@@ -0,0 +1,4 @@
+{
+    "project_name": "Transport Tests- FY24",
+    "directory": "~/review_datasets/transport"
+}

environment_unpinned.yml

@@ -0,0 +1,38 @@
+name: review
+channels:
+    - conda-forge
+    - nrel
+dependencies:
+    - addfips
+    - colorama
+    - dash
+    - flask
+    - flask-caching
+    - cartopy
+    - geopandas
+    - h5py
+    - numpy
+    - pandas
+    - pandarallel
+    - pint
+    - plotly
+    - pyproj
+    - pytest
+    - python-dotenv
+    - requests
+    - scipy
+    - setuptools
+    - tqdm
+    - werkzeug
+    - shapely
+    - geoplot
+    - openpyxl
+    - xlrd
+    - pip
+    - pip:
+        - dash_bootstrap_components
+        - pygeopkg
+        - pyarrow
+        - scikit-learn
+        - us
+        - plotext

reView/components/divs/toptions.py

@@ -12,8 +12,11 @@
     TABLET_STYLE_CLOSED,
 )
 from reView.utils.config import Config
+from reView.utils.functions import get_project_defaults
 
 
+DEFAULT_PROJECT = get_project_defaults()["rev"]
+
 TOP_TABS = html.Div(
     id="options_tab",
     children=[
@@ -154,6 +157,7 @@
                             html.H5("Project"),
                             dcc.Dropdown(
                                 id="project",
+                                value=DEFAULT_PROJECT,
                                 options=[
                                     # pylint: disable=not-an-iterable
                                     {"label": project, "value": project}

reView/components/map.py

@@ -324,7 +324,7 @@ def __repr__(self):
 
     def figure(self, point_size, reverse_color=False):
         """Build scatter plot figure."""
-        self.df["text"] = self.hover_text
+        self.df.loc[:, "text"] = self.hover_text
         if self.df.empty:
             figure = go.Figure()
             figure.update_layout(
@@ -410,7 +410,6 @@ def figure(self, point_size, reverse_color=False):
 
         # Update the layout
         layout = self.layout
-        # layout["mapbox"]["center"]
         figure.update_layout(**layout)
         figure.update_traces(
             unselected={"marker": {"opacity": 1}},
@@ -423,25 +422,26 @@ def figure(self, point_size, reverse_color=False):
     def hover_text(self):
         """Return hover text column."""
         # Convert NaNs to strings for international projects
+        df = self.df.copy()
         if "state" in self.df:
-            if self.df["state"].isnull().all():
-                self.df["state"] = ""
+            if df["state"].isnull().all():
+                df.loc[:, "state"] = ""
             else:
-                self.df["state"][self.df["state"].isnull()] = "N/A"
-                self.df["state"][self.df["state"] != "nan"] = \
-                    self.df["state"] + ":"
+                df.loc[df["state"].isnull(), "state"] = "N/A"
+                df.loc[df["state"] != "nan", "state"] = \
+                    df["state"] + ":"
         else:
-            self.df["state"] = ""
+            df.loc[:, "state"] = ""
 
-        if "county" in self.df:
-            if self.df["county"].isnull().all():
-                self.df["county"] = ""
+        if "county" in df:
+            if df["county"].isnull().all():
+                df.loc[:, "county"] = ""
             else:
-                self.df["county"][self.df["county"].isnull()] = "N/A"
-                self.df["county"][self.df["county"] != "nan"] = \
-                    self.df["county"] + " County, "
+                df.loc[df["county"].isnull(), "county"] = "N/A"
+                df.loc[df["county"] != "nan", "county"] = \
+                    df["county"] + " County, "
         else:
-            self.df["county"] = ""
+            df.loc[:, "county"] = ""
 
         # Include demand data fro hydrogen runs
         if self.demand_data is not None:
@@ -456,56 +456,56 @@ def hover_text(self):
         elif self.units == "category":
             try:
                 text = (
-                    self.df["county"]
-                    + self.df["state"]
+                    df["county"]
+                    + df["state"]
                     + "<br>   "
-                    + self.df[self.color_var].astype(str)
+                    + df[self.color_var].astype(str)
                     + " "
                     + self.units
                 )
             except KeyError:
                 text = (
-                    round(self.df[self.color_var], 2).astype(str)
+                    round(df[self.color_var], 2).astype(str)
                     + " "
                     + self.units
                 )
         else:
             extra_str = ""
-            if "hydrogen_annual_kg" in self.df:
+            if "hydrogen_annual_kg" in df:
                 extra_str += (
                     "<br>    H2 Supply:    "
-                    + self.df["hydrogen_annual_kg"].apply(lambda x: f"{x:,}")
+                    + df["hydrogen_annual_kg"].apply(lambda x: f"{x:,}")
                     + " kg    "
                 )
-            if "dist_to_selected_load" in self.df:
+            if "dist_to_selected_load" in df:
                 extra_str += (
                     "<br>    Dist to load:    "
-                    + self.df["dist_to_selected_load"].apply(
+                    + df["dist_to_selected_load"].apply(
                         lambda x: f"{x:,.2f}"
                     )
                     + " km    "
                 )
 
             try:
                 text = (
-                    self.df["county"]
-                    + self.df["state"]
+                    df["county"]
+                    + df["state"]
                     + extra_str
                     + f"<br>    {convert_to_title(self.color_var)}:   "
-                    + self.df[self.color_var].round(2).astype(str)
+                    + df[self.color_var].round(2).astype(str)
                     + " "
                     + self.units
                 )
             except KeyError:
                 text = (
                     extra_str
                     + f"<br>    {convert_to_title(self.color_var)}:   "
-                    + self.df[self.color_var].round(2).astype(str)
+                    + df[self.color_var].round(2).astype(str)
                     + " "
                     + self.units
                 )
 
-        return text
+        return text.values
 
     @property
     def layout(self):

reView/index.py

@@ -24,7 +24,6 @@ def main():
         host=APP_HOST,
         port=APP_PORT,
         debug=False,
-        dev_tools_hot_reload=True
     )
 
 

reView/pages/rev/controller/callbacks.py

@@ -321,6 +321,17 @@ def files_to_dropdown(files):
     return scenario_options
 
 
+def find_capacity(project):
+    """Find a useable capacity string from a list of column names."""
+    config = Config(project)
+    file = config.files[next(iter(config.files))]
+    columns = read_file(file, nrows=0).columns
+    capcols = [col for col in columns if "capacity" in col]
+    if len(capcols) == 0:
+        raise KeyError("No capacity column found!")
+    return capcols[0]
+
+
 @calls.log
 def options_chart_type(project, y_var=None):
     """Add characterization plot option, if necessary."""
@@ -500,7 +511,10 @@ def dropdown_composite_plot_options(scenario_options, project):
 
     logger.debug("Setting minimizing plot options")
     config = Config(project)
-    path = choose_scenario(scenario_options, config)
+    try:
+        path = choose_scenario(scenario_options, config)
+    except KeyError:
+        raise PreventUpdate
     plot_options = [{"label": "Scenario", "value": "scenario"}]
 
     if path and os.path.exists(path):
@@ -571,7 +585,10 @@ def dropdown_composite_targets(scenario_options, project):
 
     logger.debug("Setting minimizing target options")
     config = Config(project)
-    path = choose_scenario(scenario_options, config)
+    try:
+        path = choose_scenario(scenario_options, config)
+    except KeyError:
+        raise PreventUpdate
 
     target_options = []
     if path and os.path.exists(path):
@@ -776,7 +793,7 @@ def dropdown_variables(
     if old_variable in values:
         value = old_variable
     else:
-        value = "capacity"
+        value = find_capacity(project)
 
     return (
         variable_options,
@@ -815,7 +832,7 @@ def dropdown_x_variables(
         variable_options = get_variable_options(
             project, scenario_a, scenario_b, b_div
         )
-        val = "capacity"
+        val = find_capacity(project)
 
     if not variable_options:
         variable_options = [{"label": "None", "value": "None"}]
@@ -837,6 +854,8 @@ def dropdown_time_variables(_, scenario_a, old_variable):
     logger.debug("Setting timeseries variable options")
 
     # Get the 2D (timeseries) datasets and create an option list
+    if not scenario_a.endswith(".h5"):
+        raise PreventUpdate
     with h5py.File(scenario_a) as ds:
         dsets = list(ds)
         shapes = [len(ds[dset].shape) for dset in dsets]
@@ -1576,6 +1595,10 @@ def retrieve_signal(
     config = Config(project)
     trigger = callback_trigger()
 
+    # If no x is specified
+    if not x:
+        x = find_capacity(project)
+
     # Set default scenario data set
     if scenario_a == "placeholder":
         files = list(config.files.values())
@@ -1613,9 +1636,6 @@ def retrieve_signal(
         else:
             y = composite_plot_value
 
-        if not x:
-            x = "capacity"
-
         signal = {
             "filters": [],
             "mask": "off",

reView/pages/rev/controller/element_builders.py

@@ -110,7 +110,7 @@ def binned(self, x_var, y_var, bins=100):
             main_df,
             x="xbin",
             y="yagg",  # Plot all y's so we can share selections with map
-            custom_data=["sc_point_gid", "capacity"],
+            custom_data=["sc_point_gid", self.capacity_col(main_df)],
             labels={x_var: xtitle, y_var: ytitle},
             color=self.GROUP,
             color_discrete_sequence=px.colors.qualitative.Safe,
@@ -195,6 +195,11 @@ def fix_key(key):
 
         return self._update_fig_layout(fig, y_var)
 
+    @property
+    def capacity(self):
+        """Find the most appropriate cpacity column."""
+
+
     def char_hist(self, x_var):
         """Make a histogram of the characterization column."""
         main_df = list(self.datasets.values())[0]

setup.py

@@ -78,7 +78,7 @@
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.9"
         "Framework :: Dash",
     ],
     test_suite="tests",