Code

Move server to fastapi#43

Code

Closed

CopyDemon wants to merge 244 commits intoIDAES:mainIDAES/idaes-ui:mainfrom CopyDemon:move_server_to_fastapiCopyDemon/idaes-ui:move_server_to_fastapiCopy head branch name to clipboard

+13,718-1,274

Commits

Commits on Nov 2, 2023

• Initial commit: Moved all related backend server code to FastAPI.

  CopyDemon

  committed
  87d9609

• update react build folder to idaes_ui.fv/

  CopyDemon

  committed
  954a765

• import Flowsheetapp, use new Fastapi app replace the old http server as starting app

  CopyDemon

  committed
  365e437

• move build to idaes_fv.reactBuild run react build

  CopyDemon

  committed
  4657e2c

Commits on Nov 6, 2023

• create root server static react app, reorder define root and mount static folder, add fn can open browser after 1.5 s delay after uvicorn runs

  CopyDemon

  committed
  1e0efef

• open new web service with fastapi pass flowsheet and name as params

  CopyDemon

  committed
  5441f20

• update route order put fs to front

  CopyDemon

  committed
  262b820

• update route order, should define api route first then mount static folder or error

  CopyDemon

  committed
  814ee9a

• update api link from example: /fs/ into /api/get_fs/ etc. make it more clear

  CopyDemon

  committed
  cdba1f0

• enable CORS for dev env port 5173

  CopyDemon

  committed
  1e2028a

• update when dev server port point to 8000 match fastapi port

  CopyDemon

  committed
  693f2bd

• update server_port to 8000 match to fastapi port

  CopyDemon

  committed
  ac4c9ac

• update get and put fs api links

  CopyDemon

  committed
  a4751d8

• run build static and test

  CopyDemon

  committed
  4ff966e

• add 8000 as a CORS, update api end point remove / from end of url

  CopyDemon

  committed
  ef9768c

• CORS won't use * but use origins[]

  CopyDemon

  committed
  7e45c78

• react use port 8000 as defult port

  CopyDemon

  committed
  b198c0a

• update getTimeInterval fn update api url update if res.val set it as save time interval or set as default 500

  CopyDemon

  committed
  8f06695

• remove import model_server.py'

  CopyDemon

  committed
  ea85935

• add 127.0.0.1:8000 as one of the origins

  CopyDemon

  committed
  709f7cd

• react run build

  CopyDemon

  committed
  a22a2bd

• fix event loop error rewrite .run() by using asyncio and also check if in jupyter if true add patch nest_asyncio

  CopyDemon

  committed
  4c4f937

Commits on Nov 7, 2023

• format with black

  CopyDemon

  committed
  41531f5

• turn off old http server, will remove this file later

  CopyDemon

  committed
  ce34322

• use ms as time as default

  CopyDemon

  committed
  2145ec4

• define basic doc structure of fastapi

  CopyDemon

  committed
  ae9c8c3

• move cors to another file

  CopyDemon

  committed
  2babda5

• import core and call function

  CopyDemon

  committed
  a57bd21

Commits on Nov 11, 2023

• only run on local so enable all port can pass CORS

  CopyDemon

  committed
  0027453

• try fix error 'flowsheet.py:556: FutureWarning: DataFrame.applymap has been deprecated. Use DataFrame.map instead.'

  CopyDemon

  committed
  a24ccf7

• format

  CopyDemon

  committed
  f11b334

• add nest_asyncio as part of package for prevent event loop already running issue

  CopyDemon

  committed
  34d57a7

• move uvicorn run fastapp app to its own class

  CopyDemon

  committed
  39edd68

• init fastapi_functions as part of package

  CopyDemon

  committed
  cd9effd

• move uvicorn serve fastapi to its own file

  CopyDemon

  committed
  7b2848c

• add comment

  CopyDemon

  committed
  5917d17

• update fsvis use fastapi app, comment old web_server fns re do them later

  CopyDemon

  committed
  1919fc4

Commits on Nov 12, 2023

• remove arg from serve() fix error

  CopyDemon

  committed
  68e2bbc

Commits on Nov 14, 2023

• add modular router

  CopyDemon

  committed
  964d9f9

• move get flowsheet to its own route

  CopyDemon

  committed
  33d8c3c

• move static endpoint to its own file

  CopyDemon

  committed
  0d07c70

• remove while uvicorn directly stop the server with ctr + c

  CopyDemon

  committed
  25eb401

• add fn check port is available if not update port

  CopyDemon

  committed
  73a5b3b

• initial put api endpoint

  CopyDemon

  committed
  d1b0d00

• initial put api endpoint

  CopyDemon

  committed
  f8305d3

• remove sensitive info

  CopyDemon

  committed
  7736b08

Commits on Nov 15, 2023

• just format

  CopyDemon

  committed
  a30e30c

• remove token

  CopyDemon

  committed
  5ab5a4b

• work save add running port storage

  CopyDemon

  committed
  2cd16b7

• work save put fs end point

  CopyDemon

  committed
  1fc0305

• version should not be 1.0.0 should be 0.1.0, update git ui all point to https://github.com/IDAES/idaes-ui/

  CopyDemon

  committed
  4a57eb2

• enable baisc put req for put fs

  CopyDemon

  committed
  273d465

• move save flowsheet(put fs) to its own file

  CopyDemon

  committed
  a17a52e

• move get diagnostic to its own class

  CopyDemon

  committed
  cc3707b

• update the port for dev env

  CopyDemon

  committed
  e237d99

• add get app setting route move it to own file and remove from app.py

  CopyDemon

  committed
  ef0bc4b

• add get app setting route

  CopyDemon

  committed
  466eda7

• remove initial setting this will initial from app setting route

  CopyDemon

  committed
  85f463a

• add param save_time_interval if user want to define their own time

  CopyDemon

  committed
  6fe117c

• reorder code order put initial related flowsheet to front

  CopyDemon

  committed
  a128246

• remove get flowsheet it's already in it's own route file

  CopyDemon

  committed
  9f11168

• add save dir and define self.save dir

  CopyDemon

  committed
  219848c

• format

  CopyDemon

  committed
  bb63738

• add flowsheet store location save_dir

  CopyDemon

  committed
  9cc24b1

• add save_dir param

  CopyDemon

  committed
  66e9216

• add save_dir param

  CopyDemon

  committed
  f8b57f1

Commits on Nov 16, 2023

• move initial self... params into its own file or it's too long to read...

  CopyDemon

  committed
  73c4410

• remove defined path, that path move to api route serve static files

  CopyDemon

  committed
  dcc7fa8

• update app save url

  CopyDemon

  committed
  dc08859

• work save check user already has saved flowsheet

  CopyDemon

  committed
  4486765

• work save, return fs only, now you can ignore this

  CopyDemon

  committed
  e789594

• update param in route pass from fastapi app class

  CopyDemon

  committed
  52be925

• add flowsheet_manager class to manage get and set new flowsheet to both get and put request

  CopyDemon

  committed
  fb2e804

• update get request return flowsheet from flowsheet_manager

  CopyDemon

  committed
  a8b7221

• updat put endpoint now use it to receive user req, use flowsheet manager to update flowsheet

  CopyDemon

  committed
  8cf628a

• run build react

  CopyDemon

  committed
  6116796

• react save modle param update from fs to jjs_fs

  CopyDemon

  committed
  c0a123b

• update dev port to 49999

  CopyDemon

  committed
  6eaec6f

• rename get update and original flowsheet name frontend use jjs format, diagnostic use original

  CopyDemon

  committed
  27d1a5f

• rename get update and original flowsheet name frontend use jjs format, diagnostic use original

  CopyDemon

  committed
  cff50bd

• call flowsheet manager as a middleware, to manage state of flowsheet

  CopyDemon

  committed
  9de51e9

Commits on Nov 20, 2023

• work save health check

  CopyDemon

  committed
  d8e1e3b

• add health check route

  CopyDemon

  committed
  255fce2

• add update uvicorn run

  CopyDemon

  committed
  b4dc72f

Commits on Nov 21, 2023

• run build react again

  CopyDemon

  committed
  38ee2ad

Commits on Nov 22, 2023

• add ignore runnning_server.pickle, this one is use to track running server, later may use memory to track

  CopyDemon

  committed
  bdc4a44

• request package for python send request to fastapi

  CopyDemon

  committed
  01bdf04

• fastapi get take query param to query flowsheet name

  CopyDemon

  committed
  8505ee9

• loading is not correct just update flowsheet not found if not found flowsheetname

  CopyDemon

  committed
  f459ff9

• uvicorn class take one more param flowsheet name

  CopyDemon

  committed
  bb8a18f

• work save webserver start with ServerManager class

  CopyDemon

  committed
  b44b573

• update update original flowsheet fn, add get flowsheet name fn

  CopyDemon

  committed
  2cf8416

• work save, add server manager, use to control logic if need to start app or update flowsheet this script should also control clean up process when app turn off

  CopyDemon

  committed
  965c607

• work save update uvicorn script with async run, won't block the jupyter process

  CopyDemon

  committed
  adb86d5

• work save, simplize get_fs endpoint, by use query string to return flowsheet or flowsheet name

  CopyDemon

  committed
  cceb5c9

• work save testing health check now return turn, will update later

  CopyDemon

  committed
  af24919

• work save update put_fs endpoint base on put what type of flowsheet to call different fn from flowsheet manager, return differen flowsheet obj

  CopyDemon

  committed
  7be79fc

• update flowsheet manager required params

  CopyDemon

  committed
  05b9b1a

• react run build

  CopyDemon

  committed
  3ed2f14

Commits on Nov 28, 2023

• read app setting

  CopyDemon

  committed
  86b254a

• Merge branch 'IDAES:main' into main

  CopyDemon

  authored
  78c02b8

• update vite build path

  CopyDemon

  committed
  1c99f2e

• remove old ui static files

  CopyDemon

  committed
  f872b14

• react run build to idaes_ui.fv.static fileder

  CopyDemon

  committed
  08d731b

• update simple http server serve react build file from static folder

  CopyDemon

  committed
  14ed9b7

• remove shared_variable.json file path build, this path is not valid any more

  CopyDemon

  committed
  9094bc9

• remove worlflow test extract server port, the dev test port is fix to 499999 and get live port from URL directly, so the shared_varliable.json is no longer in use

  CopyDemon

  committed
  9c95bf5

• merge main resolve conflict keep main's change but comment out model server this code replace by fastapi, delete later

  CopyDemon

  committed
  02ab6e2

• react run build

  CopyDemon

  committed
  140f3b5

• update serve static file path to static/

  CopyDemon

  committed
  6ffb395

• delete reactBuild folder, now build files are in idaes_ui.fv.static

  CopyDemon

  committed
  532c7f5

• work save : try to find a way to continue monitor user change model

  CopyDemon

  committed
  971baa6

• work save : try to find a way to continue monitor user change model

  CopyDemon

  committed
  948ae07

Commits on Dec 6, 2023

• update the way to read param from merge_flowsheets fn

  CopyDemon

  committed
  125e71f

• update fetch get to decide where to pick the data

  CopyDemon

  committed
  808c684

• work save: remove useless import, and remove flowsheet_monitor while loop now its auto update in memary

  CopyDemon

  committed
  8d8c772

• fix 2 errors. 1. when user execute on notebook with new unit the ui not update issue. 2. when user click on save on UI and refresh the page the save is not saved issue

  CopyDemon

  committed
  c87e352

• 1.update how app get the available port. 2. remove while loop check if user update flowsheet. 3.TODO need to find a way to manage user's UI process

  CopyDemon

  committed
  614d8a1

• update port-> read port from parent class, remove port check move to server manager

  CopyDemon

  committed
  396ba5b

• update put request, return message and updated fs

  CopyDemon

  committed
  2e8a837

Commits on Dec 11, 2023

• update cypress base url

  CopyDemon

  committed
  38b0dea

• Merge branch 'IDAES:main' into main

  CopyDemon

  authored
  ffd817d

• update *.pickle as a ignore file

  CopyDemon

  committed
  d27959e

• Merge branch 'main' into move_server_to_fastapi

  CopyDemon

  committed
  bbfe105

• all UI related test move to cypress to simplify the test

  CopyDemon

  committed
  5e72759

• server is move to fastAPI

  CopyDemon

  committed
  f9a5aba

• mark to do now use in ui script demo_flowsheet todo is to use idaes-pse build in demo_flowsheet

  CopyDemon

  committed
  c2b4b20

Commits on Dec 30, 2023

• update pytest path from idaes_ui.fv to ./idaes_ui/fv or show error missing __init__ file.... no idea why that is happens

  CopyDemon

  committed
  b3892d0

• update savetime interval to 5 not 5000ms later will process this ms to s in js

  CopyDemon

  committed
  06cd1fe

• work save 1. update savetime interval to 5 not 5000ms later will process this ms to s in js 2. comment out save dir related working on it later

  CopyDemon

  committed
  9e2d20f

• add save time interval related param and fn

  CopyDemon

  committed
  8f43f69

• update savetime interval to 5 not 5000ms later will process this ms to s in js, it no need to be None at start

  CopyDemon

  committed
  d668825

• add save_time_interval, add type for params

  CopyDemon

  committed
  14ae61b

• add get_save_time_interval route, return initial save time interval value

  CopyDemon

  committed
  bc414fd

• add put_save_time_interval route, can use api to update save_time_interval

  CopyDemon

  committed
  504d9c1

• add save_time_interval param in router, add PutAppSettingRoute route

  CopyDemon

  committed
  7f6660b

• keep autosave_interval to 5s

  CopyDemon

  committed
  726cf32

• use server manager instence return fastapi app instence for test file use

  CopyDemon

  committed
  f638915

• after initial fastapi app use get_fast_api_app return fastapi instence

  CopyDemon

  committed
  8101949

• use flowsheet class instences call function get_fast_api_app return fastapi instence

  CopyDemon

  committed
  fee0614

• remove print

  CopyDemon

  committed
  fc89355

• when do put request to jjs flowsheet flowsheet manager also do a return updated_fs

  CopyDemon

  committed
  5900726

• remove return message

  CopyDemon

  committed
  39a6d03

• remove return message, rename new_save_time_interval to save_time_interval make it clear

  CopyDemon

  committed
  43cfc7d

• fix fastapi pytest

  CopyDemon

  committed
  33c0014

• remove test model server the model server file is not exsit anymore

  CopyDemon

  committed
  afd7b51

Commits on Dec 31, 2023

• 1. move read flowsheet flowsheet name from flowsheet manager into if. 2. add get which return original_flowsheet

  CopyDemon

  committed
  4546b06

• remove comment out code which call old web server

  CopyDemon

  committed
  c240161

Commits on Jan 4, 2024

• just try remove --pyargs to avoid __init__.py missing may revert it later

  CopyDemon

  committed
  93bb6f9

• remove dir path for pytest, try to see if this will resolve the __init__.py missing issue

  CopyDemon

  committed
  837c977

• test try to install requriements-dev.txt in workflow, may repeat in action fix that later, try resolve missing __init__.py shows in workflow

  CopyDemon

  committed
  02a79c5

• update workflow pytest exe command

  CopyDemon

  committed
  d5691e5

• revert back to old workflow with pytest run without path, will update install package detail in actions/install/action.yml

  CopyDemon

  committed
  79e98fe

• update echo out variant check if variant is dev revert this later

  CopyDemon

  committed
  0d2a98e

• revert last commit print out variant, now know variant is standard

  CopyDemon

  committed
  1dd558b

• test remove standard variant, only use dev check if it will install requriements-dev.txt revert it back later

  CopyDemon

  committed
  f036b62

Commits on Jan 5, 2024

• revert close variant standard, now know the issue __init__.py not found because fastapi uvicorn not installed because the standard variant

  CopyDemon

  committed
  76bfbe2

• update in standard variant installed package, add fastapi uvicorn

  CopyDemon

  committed
  1fed995

Commits on Jan 6, 2024

• revert add fastapi and uvicorn in Install using pip part, it not resolve in standard variant install lib list in requirements-dev.txt

  CopyDemon

  committed
  672f03b

• add install requirements-dev.txt in standard variant, fix this later this is for github can pick up correct package

  CopyDemon

  committed
  d56ab1c

• when get original flowsheet return a dict can be parse to json not fs from memory

  CopyDemon

  committed
  43d7388

• update dof value shoule be 52

  CopyDemon

  committed
  2114822

• fix fsvis test until test save

  CopyDemon

  committed
  32f339b

• add params related to save, receive them from server manager when initial fastapi app

  CopyDemon

  committed
  df54672

• receive save related params, pass down to server manager instence when initial it

  CopyDemon

  committed
  dd62750

• initial new save related params for fastapi app

  CopyDemon

  committed
  d98ec7f

• add basic save class includes create save location, and write to json file

  CopyDemon

  committed
  88a44d5

• update put flowshet router tag to update flowsheet

  CopyDemon

  committed
  d655ac1

• initial save flowsheet class to handle all save related

  CopyDemon

  committed
  a2ce82a

• add params related to save flowsheet

  CopyDemon

  committed
  83d63c2

• add new router PostSaveFlowsheet

  CopyDemon

  committed
  7ef9664

• revert standard varient run pip install requirements-dev.txt, it not working, now just comment out standard fix this later

  CopyDemon

  committed
  4ea2a9f

• remove kill_port from each test, this will cause pytest error when test over pytest will clean up ports

  CopyDemon

  committed
  ff776bc

• remove print

  CopyDemon

  committed
  5fea86d

Commits on Jan 8, 2024

• add clean up when exit the visualize clean up current flowsheet from running_server.pickle

  CopyDemon

  committed
  87744d8

Commits on Jan 9, 2024

• update fsvis add params and fns allow user to check running server list clean up running server list and enable test mode and print instruction to screen

  CopyDemon

  committed
  85ecbfe

• add test and browser params to enable and disable the browser

  CopyDemon

  committed
  e74e778

• pass browser param down to server manager and fastapi app, control on off of start browser

  CopyDemon

  committed
  fc028f3

• add test and browser params control browser on and off, test is use for pytest no sense to enable a browser

  CopyDemon

  committed
  32bbfda

• temp close while loop, it use to catch keyboardinterrupt but it block thread

  CopyDemon

  committed
  f1306f3

• minimize server_manager, since the flowsheet pass in memory no need to call api end point to update flowsheet, now only when server in running server list won't start a new fastapi

  CopyDemon

  committed
  6ac8357

• clean up test app fix test url with http:...., use correct way to initial visualize and enable testclient, remove comment out code

  CopyDemon

  committed
  933209e

• update save end point add logic to populate save path and add version number to saved flowsheet and compare if has different between will save flowsheet and latest flowsheet

  CopyDemon

  committed
  0f6c882

• add clean-up param for example to easy remove running server list

  CopyDemon

  committed
  a0224a1

• work save continue fix fsvis test

  CopyDemon

  committed
  5116c47

• default saved_flowsheet folder and its sub saved json file should not push to github

  CopyDemon

  committed
  c3500be

• fix flowsheet manager get_jjs_flowsheet, when no update in else it returns wrong flowsheet

  CopyDemon

  committed
  ebf636e

Commits on Jan 10, 2024

• fix test app

  CopyDemon

  committed
  7980730

Commits on Jan 11, 2024

• work save continue fix fsvis pytest

  CopyDemon

  committed
  074f5ea

• in cyperss test update variant == dev to avoid ui not start issue, because in python part just removed the varient standar, need to find a way to fix this

  CopyDemon

  committed
  e9e01db

• work save the read saved file name == raw_name looks not woking, try to understand why

  CopyDemon

  committed
  f6c9ea6

• comment out the standar variant for test

  CopyDemon

  committed
  9821d41

Commits on Jan 13, 2024

• update get req query param to flowsheet_name

  CopyDemon

  committed
  fb10f55

• work save, todo validate save param make sure user passed save is valid

  CopyDemon

  committed
  2ef31be

• work save, has an error, the returned flowsheet name is not equal to raw_name

  CopyDemon

  committed
  5829d14

Commits on Jan 17, 2024

• update dependecy for pyproject for standard varient

  CopyDemon

  committed
  f31ee91

• add standard varient back fix not install requirements-dev.txt by add dependency in pyproject.toml

  CopyDemon

  committed
  a8456e6

• update pytest run command add --pyargs and package path back

  CopyDemon

  committed
  0d1db96

• fix pytest command error add package path to the end

  CopyDemon

  committed
  af0b0ed

• add missing package httpx

  CopyDemon

  committed
  64a77ec

• remove check repo only when variant == dev

  CopyDemon

  committed
  cf42a72

• remove & echo 'UI Server started' make sure the ui is running and running in background

  CopyDemon

  committed
  1fc621e

• try to update the command not use npm to start example

  CopyDemon

  committed
  1f283fa

• let server run quite in background not block thread, sleep 30 sec give ci time to start server, update cypress wait time to 50 sec

  CopyDemon

  committed
  eed6828

• add insall current repo when dev varient

  CopyDemon

  committed
  9acb83a

• update the varient dev install order, and print out debug items py env python version idaes_ui module and pip list

  CopyDemon

  committed
  41415b8

• add bash and echo to debug

  CopyDemon

  committed
  33898d9

• degbug run install current not in action but in core

  CopyDemon

  committed
  934b10a

Commits on Jan 20, 2024

• remove debug line

  CopyDemon

  committed
  fba691f

• remove step checkout current repo and put check variant back

  CopyDemon

  committed
  3837433

Commits on Jan 24, 2024

• add HTTPException, move diagnostics into try block

  CopyDemon

  committed
  86b4a91

• use diagnostics toolbox build next steps and toolbox warnings cautions as backup for ui

  CopyDemon

  committed
  08f0f2f

• build module statistics output

  CopyDemon

  committed
  2546ef1

Commits on Jan 26, 2024

• update diagnostics data export, move all diagnoststool box related out of Model issues class, create a diagnosticToolBoxReport class to handle all report from diagnosticToolBox from idaes core

  CopyDemon

  committed
  4632c6d

Commits on Feb 7, 2024

• add function zoomClearExtraFvElement to handle zoom in and zoom out not working issue by clear extra fv display

  CopyDemon

  committed
  b88bb19

• react build

  CopyDemon

  committed
  24bec4f

• sync with main

  CopyDemon

  committed
  15053d8

Commits on Feb 12, 2024

• work save react app add saveFSUrl

  CopyDemon

  committed
  b83aac8

• work save fastapi save route need to rewrite

  CopyDemon

  committed
  2320784

Commits on Feb 15, 2024

• fix clean up function call location, instead of call in zoom btn click now call in mainFV constractor last step

  CopyDemon

  committed
  9160afa

• update cypress test

  CopyDemon

  committed
  50512c0

• rename test file

  CopyDemon

  committed
  eee9684

• add id to element for cypress test

  CopyDemon

  committed
  47ce8fe

• react run build

  CopyDemon

  committed
  24b9d1d

Commits on Feb 21, 2024

• work save pytest save

  CopyDemon

  committed
  8a804dd

Commits on Feb 22, 2024

• fix flowsheet when zoom out too small and flowsheed disappear issue

  CopyDemon

  committed
  299f6ba

• idaes build

  CopyDemon

  committed
  d0c979d

Commits on Feb 27, 2024

• remove maximize button from flowsheet panel

  CopyDemon

  committed
  f47a5e7

• close maximize panel function since the only maximize btn in flowsheet is removed

  CopyDemon

  committed
  e338874

• remove import function maxmizePanele there will no maxmize btn

  CopyDemon

  committed
  c88860b

• update class and style for stream table header right container to style hide btn and minimize btn

  CopyDemon

  committed
  ab0bf5a

• react run build

  CopyDemon

  committed
  d477aaa

• since maximize btn been removed, remove test related to it

  CopyDemon

  committed
  1463dde

• merge main

  CopyDemon

  committed
  d476e44

• react run build

  CopyDemon

  committed
  6c39351

• update pyproject fix .fv package cant find issue

  CopyDemon

  committed
  ce7b4a8

• work save

  CopyDemon

  committed
  4f077e6

Commits on Mar 1, 2024

• Fixed an issue where repeatedly minimizing the panel caused the zoom in and zoom out values to become excessively large due to duplicate event calls.

  CopyDemon

  committed
  c2a45ca

• react run build

  CopyDemon

  committed
  8daada9

• fix bug when minimiz panel stream table hide field has duplicate list item

  CopyDemon

  committed
  ec116de

• react run build

  CopyDemon

  committed
  9f1d79a

Commits on Mar 7, 2024

• merge main

  CopyDemon

  committed
  343fbba

• react build

  CopyDemon

  committed
  1f9a432

• prepare fix the pytest

  CopyDemon

  committed
  3fb95f4