Merge pull request #67 from MichaelPesce/1.0rc0

1.0.0 rc0
project-pareto · Jul 8, 2024 · b650587 · b650587
2 parents b321a40 + f59d0e4
commit b650587
Show file tree

Hide file tree

Showing 24 changed files with 664 additions and 252 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: App build
 on:
   push:
     branches:
-      - "jan-release"
+      - "1.0rc0"
 
 defaults:
   run:
@@ -30,22 +30,33 @@ jobs:
         run: |
           dotnet tool install --global AzureSignTool
 
+      - name: Add project pareto version to .env file
+        working-directory: ./electron/ui
+        run: |
+            echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env
+
       - name: Install Electron JS dependencies
         run: |
           npm --prefix electron clean-install
       - name: Install frontend JS dependencies
         run: |
           npm --prefix electron/ui clean-install
+
       - name: Get idaes extensions
         run: idaes get-extensions
 
-      - name: Install Pareto locally
+      # - name: Install correct tag of pareto
+      #   working-directory: ../
+      #   run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout tags/1.0.0 -b 1.0.0 && pip install --progress-bar off .
+
+      - name: Install correct branch of pareto
         working-directory: ../
-        run: git clone https://github.com/MichaelPesce/project-pareto.git && cd project-pareto && pip install --progress-bar off .
+        run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
 
-      - name: Install numpy 1.24.3
+      - name: Install build requirements
+        working-directory: ./backend
         run: |
-          pip uninstall -y numpy && pip install numpy==1.24.3
+          pip install -r requirements-build.txt
 
       - name: Build Backend
         run: npm --prefix electron run build-backend
@@ -58,12 +69,12 @@ jobs:
 
       - name: Sign Windows Distribution
         run: |
-          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-24.01.24-win64.exe
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-24.07.01-win64.exe
 
       - name: Upload artifact for windows build
         uses: actions/upload-artifact@v4
         if: always()
         with:
             name: windows-pareto-dist
             path: |
-              electron/dist/ParetoUI-24.01.24-win64.exe
+              electron/dist/ParetoUI-24.07.01-win64.exe
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,6 +38,17 @@ jobs:
           miniforge-version: latest
           activate-environment: pareto-ui-env
 
+      - name: Add project pareto version to .env file
+        working-directory: ./electron/ui
+        run: |
+            echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env
+
+      # - name: Install pint
+      #   run: pip install pint==0.23
+
+      - name: get idaes extensions
+        run: idaes get-extensions
+
       - name: Install correct branch of pareto
         working-directory: ../
         run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
@@ -50,9 +61,6 @@ jobs:
         run: |
           npm --prefix electron/ui clean-install
 
-      - name: get idaes extensions
-        run: idaes get-extensions
-
       - name: run component tests
         run: npm --prefix electron/ui test
 

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ pip uninstall -y numpy pandas
 ### 3. Install osx/arm64 versions of numpy and pandas
 
 ```sh
-conda install -y -c conda-forge/osx-arm64 numpy pandas=1.4.0
+conda install -y -c conda-forge/osx-arm64 numpy pandas=2.0.3
 ```
 
 ### 4. Install the IDAES solver dependencies

diff --git a/backend/app/internal/get_data.py b/backend/app/internal/get_data.py
@@ -40,7 +40,7 @@ def _read_data(_fname, _set_list, _parameter_list):
         header=0,
         index_col=None,
         usecols="A",
-        squeeze=True,
+        # squeeze=True,
         dtype="string",
         keep_default_na=False,
     )
@@ -59,7 +59,7 @@ def _read_data(_fname, _set_list, _parameter_list):
         header=1,
         index_col=None,
         usecols=None,
-        squeeze=True,
+        # squeeze=True,
         keep_default_na=False,
     )
     # A parameter can be defined in column format or table format.

diff --git a/backend/app/internal/pareto_stategic_model.py b/backend/app/internal/pareto_stategic_model.py
@@ -22,7 +22,11 @@
     PipelineCost,
     PipelineCapacity,
     Hydraulics,
-    WaterQuality
+    WaterQuality,
+    RemovalEfficiencyMethod,
+    InfrastructureTiming,
+    SubsurfaceRisk,
+    DesalinationModel
 )
 from pyomo.opt import TerminationCondition
 from pareto.utilities.get_data import get_data
@@ -49,18 +53,23 @@ def run_strategic_model(input_file, output_file, id, modelParameters, overrideVa
     [df_sets, df_parameters] = get_data(input_file, set_list, parameter_list)
 
     _log.info(f"creating model")
-    strategic_model = create_model(
-        df_sets,
-        df_parameters,
-        default={
+    default={
             "objective": Objectives[modelParameters["objective"]],
-            "pipeline_cost": PipelineCost[modelParameters["pipelineCost"]],
-            "pipeline_capacity": PipelineCapacity.input,
-            "node_capacity": True,
-            "water_quality": WaterQuality[modelParameters["waterQuality"]],
+            "pipeline_cost": PipelineCost[modelParameters["pipeline_cost"]],
+            "pipeline_capacity": PipelineCapacity[modelParameters["pipeline_capacity"]],
+            "node_capacity": modelParameters["node_capacity"],
+            "water_quality": WaterQuality[modelParameters["water_quality"]],
             "hydraulics": Hydraulics[modelParameters["hydraulics"]],
+            "removal_efficiency_method": RemovalEfficiencyMethod[modelParameters["removal_efficiency_method"]],
+            "infrastructure_timing": InfrastructureTiming[modelParameters["infrastructure_timing"]],
+            "subsurface_risk": SubsurfaceRisk[modelParameters["subsurface_risk"]],
+            "desalination_model": DesalinationModel[modelParameters["desalination_model"]],
             # "build_units": BuildUnits[modelParameters["build_units"]]
-        },
+    }
+    strategic_model = create_model(
+        df_sets,
+        df_parameters,
+        default=default
     )
 
     scenario = scenario_handler.get_scenario(int(id))

diff --git a/backend/app/internal/scenario_handler.py b/backend/app/internal/scenario_handler.py
@@ -35,7 +35,7 @@
 class ScenarioHandler:
     """Manage the saved scenarios."""
 
-    VERSION = 2
+    VERSION = 3
     SCENARIO_DB_FILE = f"scenarios.json"
     LOCKED = False
 
@@ -231,7 +231,7 @@ def upload_excelsheet(self, output_path, scenarioName, filename, kmz_data=None):
 
         # convert pandas series into lists
         for key in df_sets:
-            df_sets[key] = df_sets[key].tolist()
+            df_sets[key] = df_sets[key].values.tolist()
 
         # create scenario object
         current_day = datetime.date.today()
@@ -249,7 +249,7 @@ def upload_excelsheet(self, output_path, scenarioName, filename, kmz_data=None):
                 {
                     "objective":"cost", 
                     "runtime": 900, 
-                    "pipelineCostCalculation": "distance_based", 
+                    "pipeline_cost": "distance_based", 
                     "waterQuality": "false", 
                     "hydraulics": "false",
                     "solver": "cbc",
@@ -321,7 +321,7 @@ def replace_excelsheet(self, output_path, id):
 
         # convert pandas series into lists
         for key in df_sets:
-            df_sets[key] = df_sets[key].tolist()
+            df_sets[key] = df_sets[key].values.tolist()
 
         scenario = self.get_scenario(id)
         scenario["results"]["status"] = "Draft"

diff --git a/backend/app/main.py b/backend/app/main.py
@@ -41,20 +41,20 @@
 
 def getPort():
     port = 50011
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    foundOpenPort = False
-    while not foundOpenPort:
-        try:
-            s.bind(("127.0.0.1", port))
-            _log.info(f"found open port: {port}")
-            foundOpenPort = True
-        except socket.error as e:
-            if e.errno == errno.EADDRINUSE:
-                _log.info(f"Port {port} is already in use")
-            else:
-                _log.error(f"Error while trying to connect to port {port}: {e}")
-            port += 1
-    s.close()
+    # s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    # foundOpenPort = False
+    # while not foundOpenPort:
+    #     try:
+    #         s.bind(("127.0.0.1", port))
+    #         _log.info(f"found open port: {port}")
+    #         foundOpenPort = True
+    #     except socket.error as e:
+    #         if e.errno == errno.EADDRINUSE:
+    #             _log.info(f"Port {port} is already in use")
+    #         else:
+    #             _log.error(f"Error while trying to connect to port {port}: {e}")
+    #         port += 1
+    # s.close()
     return port
 
 if __name__ == '__main__':

diff --git a/backend/app/main.spec b/backend/app/main.spec
@@ -7,30 +7,28 @@ block_cipher = None
 
 idaes_path = str(Path.home() / ".idaes")
 
-if sys.platform == 'darwin':
+if sys.platform == 'darwin': 
     extra_data = [
-        (f'{idaes_path}/bin/ipopt_sens', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/cubic_roots.so', 'extensions/.idaes/bin/'), 
+        (f'{idaes_path}/bin/ipopt_sens', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/cubic_roots.dylib', 'extensions/.idaes/bin/'),
         (f'{idaes_path}/bin/libstdc++.6.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/version_lib.txt', 'extensions/.idaes/bin/'), 
-        (f'{idaes_path}/bin/libsipopt.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libadolc.2.dylib', 'extensions/.idaes/bin/'), 
-        (f'{idaes_path}/bin/general_helmholtz_external.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libadolc.dylib', 'extensions/.idaes/bin/'), 
-        (f'{idaes_path}/bin/libipopt.3.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libadolc.la', 'extensions/.idaes/bin/'), 
+        (f'{idaes_path}/bin/libsipopt.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libquadmath.0.dylib', 'extensions/.idaes/bin/'), 
+        (f'{idaes_path}/bin/general_helmholtz_external.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libipopt.3.dylib', 'extensions/.idaes/bin/'),
         (f'{idaes_path}/bin/ipopt', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/couenne', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/libipopt.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/cbc', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/libgfortran.5.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libpynumero_ASL.dylib', 'extensions/.idaes/bin/'), 
-        (f'{idaes_path}/bin/functions.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/iapws95_external.so', 'extensions/.idaes/bin/'), 
+        (f'{idaes_path}/bin/functions.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/bonmin', 'extensions/.idaes/bin/'),
         (f'{idaes_path}/bin/license_lib.txt', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/k_aug', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/version_solvers.txt', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/ipopt_l1', 'extensions/.idaes/bin/'), 
-        (f'{idaes_path}/bin/bonmin', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/swco2_external.so', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/libsipopt.3.dylib', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/license.txt', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/ipopt_sens_l1', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libgcc_s.1.1.dylib', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/clp', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libgomp.1.dylib', 'extensions/.idaes/bin/'), 
         (f'{idaes_path}/bin/dot_sens', 'extensions/.idaes/bin/')]
 elif sys.platform == 'linux':
     extra_data = [
-    (f'{idaes_path}/bin/ipopt_sens', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/cubic_roots.so', 'extensions/.idaes/bin/'), 
+    (f'{idaes_path}/bin/ipopt_sens', 'extensions/.idaes/bin/'), 
     (f'{idaes_path}/bin/libadolc.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/version_lib.txt', 'extensions/.idaes/bin/'), 
     (f'{idaes_path}/bin/libadolc.so.2', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libadolc.so.2.2.0', 'extensions/.idaes/bin/'), 
-    (f'{idaes_path}/bin/general_helmholtz_external.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libipopt.so', 'extensions/.idaes/bin/'), 
+     (f'{idaes_path}/bin/libipopt.so', 'extensions/.idaes/bin/'), 
     (f'{idaes_path}/bin/libpynumero_ASL.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/libadolc.la', 'extensions/.idaes/bin/'), 
     (f'{idaes_path}/bin/ipopt', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/couenne', 'extensions/.idaes/bin/'), 
     (f'{idaes_path}/bin/libsipopt.so', 'extensions/.idaes/bin/'), (f'{idaes_path}/bin/cbc', 'extensions/.idaes/bin/'), 
@@ -59,7 +57,8 @@ a = Analysis(
     'pint', 
     'numbers', 
     'pyutilib', 
-    'pyomo'],
+    'pyomo',
+    'pkg_resources.extern'],
     hookspath=['extra-hooks'],
     hooksconfig={},
     runtime_hooks=[],

diff --git a/backend/app/routers/scenarios.py b/backend/app/routers/scenarios.py
@@ -162,19 +162,24 @@ async def run_model(request: Request, background_tasks: BackgroundTasks):
     try:
         excel_path = "{}/{}.xlsx".format(scenario_handler.excelsheets_path,data['scenario']['id'])
         output_path = "{}/{}.xlsx".format(scenario_handler.outputs_path,data['scenario']['id'])
+        optimizationSettings = data['scenario']['optimization']
         modelParameters = {
-            "objective": data['scenario']['optimization']['objective'],
-            "runtime": data['scenario']['optimization']['runtime'],
-            "pipelineCost": data['scenario']['optimization']['pipelineCostCalculation'],
-            "waterQuality": data['scenario']['optimization']['waterQuality']
+            "objective": optimizationSettings.get('objective',"cost"),
+            "runtime": optimizationSettings.get('runtime',900),
+            "pipeline_cost": optimizationSettings.get("pipeline_cost", "distance_based"),
+            "pipeline_capacity": optimizationSettings.get("pipeline_capacity", "input"),
+            "node_capacity": optimizationSettings.get("node_capacity", True),
+            "water_quality": optimizationSettings.get("waterQuality", "false"),
+            "solver": optimizationSettings.get('solver',None),
+            "build_units": optimizationSettings.get('build_units',"user_units"),
+            "optimalityGap": optimizationSettings.get("optimalityGap", 5),
+            "scale_model": optimizationSettings.get("scale_model", True),
+            "hydraulics": optimizationSettings.get('hydraulics',"false"),
+            "removal_efficiency_method": optimizationSettings.get('removal_efficiency_method',"concentration_based"),
+            "desalination_model": optimizationSettings.get("desalination_model", "false"),
+            "infrastructure_timing": optimizationSettings.get("infrastructure_timing", "false"),
+            "subsurface_risk": optimizationSettings.get("subsurface_risk", "false"),
         }
-        defaultParams = {'solver': None, 'build_units': 'user_units', 'optimalityGap': 5, 'scale_model': True, 'hydraulics': 'false'}
-        for param in ['solver', 'build_units', 'optimalityGap', 'scale_model', 'hydraulics']:
-            try:
-                modelParameters[param]=data['scenario']['optimization'][param]
-            except:
-                _log.error(f'unable to find {param}, using {defaultParams[param]}')
-                modelParameters[param]=defaultParams[param]
 
         _log.info(f"modelParameters: {modelParameters}")