Merge pull request #141 from MichaelPesce/use-idaes-flowsheet-processor

Update fsapi to idaes-flowsheet-processor api
watertap-org · Nov 26, 2024 · f101e72 · f101e72
2 parents 5af8e1e + 8c8d2f4
commit f101e72
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/backend/src/idaes_flowsheet_processor_ui/internal/flowsheet_manager.py b/backend/src/idaes_flowsheet_processor_ui/internal/flowsheet_manager.py
@@ -25,7 +25,7 @@
 
 # package-local
 from app.internal.settings import Deployment, AppSettings
-from watertap.ui.fsapi import FlowsheetInterface
+from idaes_flowsheet_processor.api import FlowsheetInterface
 import idaes.logger as idaeslog
 
 _log = idaeslog.getLogger(__name__)

diff --git a/backend/src/idaes_flowsheet_processor_ui/internal/tests/examples/api_example.py b/backend/src/idaes_flowsheet_processor_ui/internal/tests/examples/api_example.py
@@ -1,4 +1,4 @@
-from watertap.ui.fsapi import FlowsheetInterface
+from idaes_flowsheet_processor.api import FlowsheetInterface
 from idaes.core.solvers import get_solver
 
 

diff --git a/backend/src/idaes_flowsheet_processor_ui/internal/tests/examples/api_example_nodiagram.py b/backend/src/idaes_flowsheet_processor_ui/internal/tests/examples/api_example_nodiagram.py
@@ -1,4 +1,4 @@
-from watertap.ui.fsapi import FlowsheetInterface
+from idaes_flowsheet_processor.api import FlowsheetInterface
 from idaes.core.solvers import get_solver
 
 

diff --git a/backend/src/idaes_flowsheet_processor_ui/routers/flowsheets.py b/backend/src/idaes_flowsheet_processor_ui/routers/flowsheets.py
@@ -21,7 +21,7 @@
 from app.internal.flowsheet_manager import FlowsheetManager, FlowsheetInfo
 from app.internal.parameter_sweep import run_parameter_sweep
 from app.internal.log_parser import parse_logs
-from watertap.ui.fsapi import FlowsheetInterface, FlowsheetExport
+from idaes_flowsheet_processor.api import FlowsheetInterface, FlowsheetExport
 import idaes.logger as idaeslog
 
 CURRENT = "current"

diff --git a/backend/src/idaes_flowsheet_processor_ui/routers/tests/test_flowsheets.py b/backend/src/idaes_flowsheet_processor_ui/routers/tests/test_flowsheets.py
@@ -5,7 +5,7 @@
 import os
 from urllib.parse import quote
 
-from watertap.ui.fsapi import FlowsheetExport
+from idaes_flowsheet_processor.api import FlowsheetExport
 from fastapi.responses import FileResponse
 
 # add 'examples' to packages, *before* app starts
@@ -24,7 +24,7 @@ def client():
 
 def pytest_generate_tests(metafunc):
     if "flowsheet_id" in metafunc.fixturenames:
-        from watertap.ui.fsapi import FlowsheetInterface
+        from idaes_flowsheet_processor.api import FlowsheetInterface
 
         module_names = list(FlowsheetInterface.from_installed_packages())
         metafunc.parametrize(

diff --git a/frontend/cypress/e2e/FlowsheetTesting.cy.js b/frontend/cypress/e2e/FlowsheetTesting.cy.js
@@ -55,8 +55,8 @@ describe('WaterTAP UI Testing', () => {
 
     it('tests new flowsheet', () => {
         let modelFile = "https://drive.google.com/uc?export=download&id=1XdjuWNpYT9teZxaF8TuwDz0XS2XyXKeT"
-        // let exportFile = "https://drive.google.com/uc?export=download&id=1-jWQmI4wO2OlyUi32fqobFEmPn3zm9Q9"
-        let exportFile = "https://drive.google.com/uc?export=download&id=1_KtDRLSQeyKoQ3rH-4kNuxpvuQVuhQCu"
+        let exportFile = "https://drive.google.com/uc?export=download&id=1-jWQmI4wO2OlyUi32fqobFEmPn3zm9Q9"
+        // let exportFile = "https://drive.google.com/uc?export=download&id=1_KtDRLSQeyKoQ3rH-4kNuxpvuQVuhQCu"
         cy.load_flowsheets_list()
         cy.screenshot('loaded flowsheet list page')