Merge pull request #11 from rimjhimittal/main

.github/workflows/teststreamlit.yml

@@ -20,4 +20,4 @@ jobs:
       - uses: streamlit/streamlit-app-action@v0.0.3
         with:
           app-path: app.py
-          ruff: true
+          ruff: false

app.py

@@ -5,7 +5,7 @@ from modeci_mdf.execution_engine import EvaluableGraph, EvaluableOutput
 import json
 import numpy as np
 import requests
-st.set_page_config(layout="wide", page_icon="logo.png", page_title="Model Description Format", menu_items={
+st.set_page_config(layout="wide", page_icon="page_icon.png", page_title="Model Description Format", menu_items={
         'Report a bug': "https://github.com/ModECI/MDF/",
         'About': "ModECI (Model Exchange and Convergence Initiative) is a multi-investigator collaboration that aims to develop a standardized format for exchanging computational models across diverse software platforms and domains of scientific research and technology development, with a particular focus on neuroscience, Machine Learning and Artificial Intelligence. Refer to https://modeci.org/ for more."
     })
@@ -71,25 +71,39 @@ def show_simulation_results(all_node_results, stateful_nodes):
                     st.session_state.selected_columns = {node_id: {col: True for col in chart_data.columns}}
                 elif node_id not in st.session_state.selected_columns:
                     st.session_state.selected_columns[node_id] = {col: True for col in chart_data.columns}
-                columns = chart_data.columns
-                for column in columns:
-                    st.checkbox(
-                        f"{column}",
-                        value=st.session_state.selected_columns[node_id][column],
-                        key=f"checkbox_{node_id}_{column}",
-                        on_change=update_selected_columns,
-                        args=(node_id, column,)
-                    )
-
+                
                 # Filter the data based on selected checkboxes
                 filtered_data = chart_data[[col for col, selected in st.session_state.selected_columns[node_id].items() if selected]]
-
                 # Display the line chart with filtered data
                 st.line_chart(filtered_data, use_container_width=True, height=400)
+                columns = chart_data.columns
+                checks = st.columns(8)
+                if len(columns) > 0 and len(st.session_state.selected_columns[node_id])>1:
+                    for l, column in enumerate(columns):
+                        with checks[l]:
+                            st.checkbox(
+                                f"{column}",
+                                value=st.session_state.selected_columns[node_id][column],
+                                key=f"checkbox_{node_id}_{column}",
+                                on_change=update_selected_columns,
+                                args=(node_id, column,)
+                            )
+                #show checkboxes horizontally
+                # in case we late go back to vertical
+                # for column in columns:
+                #     st.checkbox(
+                #         f"{column}",
+                #         value=st.session_state.selected_columns[node_id][column],
+                #         key=f"checkbox_{node_id}_{column}",
+                #         on_change=update_selected_columns,
+                #         args=(node_id, column,)
+                #     )
+
+
+                
             else:
                 st.write(all_node_results[node_id])
 
-
 def update_selected_columns(node_id, column):
     st.session_state.selected_columns[node_id][column] = st.session_state[f"checkbox_{node_id}_{column}"]
 
@@ -99,7 +113,7 @@ def show_mdf_graph(mdf_model):
     image_path = mdf_model.id + ".png"
     st.image(image_path, caption="Model Graph Visualization")
 
-def show_json_output(mdf_model):
+def show_json_model(mdf_model):
     st.subheader("JSON Model")
     st.json(mdf_model.to_json())
 
@@ -107,27 +121,17 @@ def show_json_output(mdf_model):
 def view_tabs(mdf_model, param_inputs, stateful): # view
     tab1, tab2, tab3 = st.tabs(["Simulation Results", "MDF Graph", "Json Model"])
     with tab1:
-        if stateful:
-            if 'simulation_results' not in st.session_state:
-                st.session_state.simulation_results = None
-                
-            if st.session_state.simulation_results is not None:
-                show_simulation_results(st.session_state.simulation_results, stateful)
-            else:
-                st.write("Run the simulation to see results.") # model
+        if 'simulation_run' not in st.session_state or not st.session_state.simulation_run:
+            st.write("Run the simulation to see results.")
+        elif st.session_state.simulation_results is not None:
+            show_simulation_results(st.session_state.simulation_results, stateful)
         else:
-            if 'simulation_results' not in st.session_state:
-                st.session_state.simulation_results = None
-                
-            if st.session_state.simulation_results is not None:
-                show_simulation_results(st.session_state.simulation_results, stateful)
-            else:
-                st.write("Stateless.")
+            st.write("No simulation results available.")
 
     with tab2:
         show_mdf_graph(mdf_model) # view
     with tab3:
-        show_json_output(mdf_model) # view
+        show_json_model(mdf_model) # view
 
 def display_and_edit_array(array, key):
     if isinstance(array, list):
@@ -241,6 +245,9 @@ def parameter_form_to_update_model_and_view(mdf_model):
                     if param.id in param_inputs:
                         param.value = param_inputs[param.id]
             st.session_state.simulation_results = run_simulation(param_inputs, mdf_model, stateful)
+            st.session_state.simulation_run = True
+        else:
+            st.error("Please correct the invalid inputs before running the simulation.")
 
     view_tabs(mdf_model, param_inputs, stateful_nodes)
 
@@ -250,13 +257,13 @@ def upload_file_and_load_to_model():
     github_url = st.sidebar.text_input("Enter GitHub raw file URL:", placeholder="Enter GitHub raw file URL")
     example_models = {
         "Newton Cooling Model": "./examples/NewtonCoolingModel.json",
-        # "ABCD": "./examples/ABCD.json",
+        "ABCD": "./examples/ABCD.json",
         "FN": "./examples/FN.mdf.json",
         "States": "./examples/States.json",
-        "Swicthed RLC Circuit": "./examples/switched_rlc_circuit.json",
+        "Switched RLC Circuit": "./examples/switched_rlc_circuit.json",
         "Simple":"./examples/Simple.json",
         # "Arrays":"./examples/Arrays.json",
-        # "RNN":"./examples/RNNs.json",
+        # "RNN":"./examples/RNNs.json", # some issue
         "IAF":"./examples/IAFs.json",
         "Izhikevich Test":"./examples/IzhikevichTest.mdf.json"
     }
@@ -311,6 +318,7 @@ def main():
     mdf_model = upload_file_and_load_to_model() # controller
 
     if mdf_model:
+        st.session_state.current_model = mdf_model
         header1, header2 = st.columns([1, 8], vertical_alignment="top")
         with header1:
             with st.container():