Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Be more robust to issues with the flowsheets #55

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Be more robust to issues with the flowsheets #55

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
555f838
fix for missing attr
dangunter Oct 25, 2024
e23ad35
some debug logs
dangunter Oct 31, 2024
1bf4205
strict mode for validation, warn by default for missing components
dangunter Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
some debug logs
  • Loading branch information
@dangunter
dangunter committed Oct 31, 2024
commit e23ad3532d3d5813f6f9c636de8c6dc94ed1821a
22 changes: 21 additions & 1 deletion idaes_ui/fv/model_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@ def do_GET(self):
* `/setting`: Retrieve a setting value.
* `/path/to/file`: Retrieve file stored static directory
"""

if _log.isEnabledFor(logging.DEBUG):
_log.debug(f"begin do_GET: path={self.path}")
# Query url param
u, queries = self._parse_flowsheet_url(self.path)
id_ = queries.get("id", None) if queries else None
Expand All @@ -286,6 +287,8 @@ def do_GET(self):
self.send_error(
400, message=f"Query parameter 'id' is required for '{u.path}'"
)
if _log.isEnabledFor(logging.DEBUG):
_log.debug(f" end do_GET: path={self.path} status=error missing 'id'")
return

# From path get what to do
Expand All @@ -300,6 +303,10 @@ def do_GET(self):
400,
message=f"Query parameter 'setting_key' is required for '{u.path}'",
)
if _log.isEnabledFor(logging.DEBUG):
_log.debug(
f" end do_GET: path={self.path} status=error missing 'setting_key'"
)
return
self._get_setting(setting_key_)
elif u.path == "/diagnostics":
Expand All @@ -309,13 +316,20 @@ def do_GET(self):
self.directory = _static_dir # keep here: overwritten if set earlier
super().do_GET()

if _log.isEnabledFor(logging.DEBUG):
_log.debug(f"begin do_GET: path={self.path} status=ok")

def _get_app(self, id_):
"""Read index file, process to insert flowsheet identifier, and return it."""
if _log.isEnabledFor(logging.DEBUG):
_log.debug(f"begin /app")
p = Path(_template_dir / "index.html")
with open(p, "r", encoding="utf-8") as fp:
s = fp.read()
page = s.format(flowsheet_id=id_)
self._write_html(200, page)
if _log.isEnabledFor(logging.DEBUG):
_log.debug(f"end /app")

def _get_fs(self, id_: str):
"""Get updated flowsheet.
Expand All @@ -326,18 +340,24 @@ def _get_fs(self, id_: str):
Returns:
None
"""
if _log.isEnabledFor(logging.DEBUG):
_log.debug(f"begin /fs")
try:
merged = self.server.update_flowsheet(id_)
except errors.FlowsheetUnknown as err:
# User error: user asked for a flowsheet by an unknown ID
self.send_error(404, message=str(err))
_log.error(f" end /fs: status=error bad-id")
return
except (errors.FlowsheetNotFound, errors.ProcessingError) as err:
# Internal error: flowsheet ID is found, but other things are missing
self.send_error(500, message=str(err))
_log.error(f" end /fs: status=error msg={str(err)}")
return
# Return merged flowsheet
self._write_json(200, merged)
if _log.isEnabledFor(logging.DEBUG):
_log.debug(f" end /fs: status=ok")

def _get_setting(self, setting_key_: str):
"""Get setting value.
Expand Down