Merge pull request #52 from ComputationalPhysiology/fix-gui

Update gui for new version of streamlit and favor gotranx over gotran¨

Author: finsberg

src/modelgraph/__main__.py

@@ -1,4 +1,4 @@
 if __name__ == "__main__":
     from .cli import main
 
-    main()
+    raise SystemExit(main())

src/modelgraph/cli.py

@@ -24,10 +24,26 @@
 def main(filename):
     os.environ["MODELGRAPH_FILENAME"] = filename
     # Make sure we can import the required packages
-    from . import gui  # noqa: F401
     from pathlib import Path
+    import sys
+    import subprocess as sp
+
+    try:
+        import streamlit  # noqa: F401
+    except ImportError:
+        print("Please install streamlit - python3 -m pip install streamlit")
+        exit(1)
+
+    try:
+        import gotranx  # noqa: F401
+    except ImportError:
+        try:
+            import gotran  # noqa: F401
+        except ImportError:
+            print("Please install gotranx or gotran - python3 -m pip install gotranx")
+            exit(1)
 
     gui_path = Path(__file__).parent.joinpath("gui.py")
-    import subprocess as sp
+    args = [sys.executable, "-m", "streamlit", "run", gui_path.as_posix()]
 
-    sp.run(["streamlit", "run", gui_path.as_posix()])
+    sp.run(args)

src/modelgraph/gui.py

@@ -11,16 +11,18 @@
     print("Please install streamlit - python3 -m pip install streamlit")
     exit(1)
 
-
-import gotran
+try:
+    import gotranx as gotran
+except ImportError:
+    import gotran
 
 from modelgraph import DependencyGraph
 
 
 here = Path(__file__).absolute().parent
 
 
-@st.cache(allow_output_mutation=True)
+@st.cache_data
 def get_graph():
     ode = gotran.load_ode(os.getenv("MODELGRAPH_FILENAME"))
     return DependencyGraph(ode)
@@ -52,26 +54,28 @@ def inv_dependency_graph():
         st.image(temp.name)
 
 
-# Page settings
-st.set_page_config(page_title="modelgraph")
+if __name__ == "__main__":
+    # Page settings
+    st.set_page_config(page_title="modelgraph")
 
-# Sidebar settings
-pages = {
-    "Dendencency graph": dependency_graph,
-    "Inverse dendencency graph": inv_dependency_graph,
-}
+    # Sidebar settings
+    pages = {
+        "Dendencency graph": dependency_graph,
+        "Inverse dendencency graph": inv_dependency_graph,
+    }
 
-st.sidebar.title("modelgraph")
+    st.sidebar.title("modelgraph")
 
-# Radio buttons to select desired option
-page = st.sidebar.radio("", tuple(pages.keys()))
+    # Radio buttons to select desired option
+    keys = list(pages.keys())
+    page = st.sidebar.radio("Select a page", keys)
 
-pages[page]()
+    pages[page]()
 
-# About
-st.sidebar.markdown(
-    """
-- [Source code](https://github.com/ComputationalPhysiology/modelgraph)
-- [Documentation](https://computationalphysiology.github.io/modelgraph/)
-""",
-)
+    # About
+    st.sidebar.markdown(
+        """
+    - [Source code](https://github.com/ComputationalPhysiology/modelgraph)
+    - [Documentation](https://computationalphysiology.github.io/modelgraph/)
+    """,
+    )