refactor: reorganize controls imports and update usage in examples

Author: Mike Prosser

examples/all_types/all_types_panel.py

@@ -6,6 +6,7 @@
 from define_types import all_types_with_values
 
 import nipanel
+import nipanel.controls as ni
 
 
 st.set_page_config(page_title="All Types Example", page_icon="📊", layout="wide")
@@ -25,9 +26,9 @@
         if isinstance(default_value, bool):
             st.checkbox(label=name, value=default_value, key=name)
         elif isinstance(default_value, Flag):
-            nipanel.flag_checkboxes(panel, label=name, value=default_value, key=name)
+            ni.flag_checkboxes(panel, label=name, value=default_value, key=name)
         elif isinstance(default_value, Enum) and not isinstance(default_value, Flag):
-            nipanel.enum_selectbox(panel, label=name, value=default_value, key=name)
+            ni.enum_selectbox(panel, label=name, value=default_value, key=name)
         elif isinstance(default_value, int) and not isinstance(default_value, Flag):
             st.number_input(label=name, value=default_value, key=name)
         elif isinstance(default_value, float):

examples/nidaqmx/nidaqmx_continuous_analog_input_panel.py

@@ -11,6 +11,7 @@
 from streamlit_echarts import st_echarts
 
 import nipanel
+import nipanel.controls as ni
 
 
 st.markdown(
@@ -75,7 +76,7 @@
                     key="voltage_max_value",
                 )
             with channel_right:
-                nipanel.enum_selectbox(
+                ni.enum_selectbox(
                     panel,
                     label="Terminal Configuration",
                     value=TerminalConfiguration.DEFAULT,
@@ -103,22 +104,22 @@
                     key="thermocouple_max_value",
                 )
             with channel_middle:
-                nipanel.enum_selectbox(
+                ni.enum_selectbox(
                     panel,
                     label="Units",
                     value=TemperatureUnits.DEG_C,
                     disabled=panel.get_value("is_running", False),
                     key="thermocouple_units",
                 )
-                nipanel.enum_selectbox(
+                ni.enum_selectbox(
                     panel,
                     label="Thermocouple Type",
                     value=ThermocoupleType.K,
                     disabled=panel.get_value("is_running", False),
                     key="thermocouple_type",
                 )
             with channel_right:
-                nipanel.enum_selectbox(
+                ni.enum_selectbox(
                     panel,
                     label="CJC Source",
                     value=CJCSource.CONSTANT_USER_VALUE,
@@ -218,7 +219,7 @@
         st.header("Logging Settings")
         logging_left, logging_right = st.columns(2)
         with logging_left:
-            nipanel.enum_selectbox(
+            ni.enum_selectbox(
                 panel,
                 label="Logging Mode",
                 value=LoggingMode.OFF,

src/nipanel/__init__.py

@@ -6,13 +6,9 @@
 from nipanel._streamlit_panel import StreamlitPanel
 from nipanel._streamlit_panel_initializer import create_panel, get_panel_accessor
 from nipanel._streamlit_panel_value_accessor import StreamlitPanelValueAccessor
-from nipanel.controls._enum_selectbox import enum_selectbox
-from nipanel.controls._flag_checkboxes import flag_checkboxes
 
 __all__ = [
     "create_panel",
-    "enum_selectbox",
-    "flag_checkboxes",
     "get_panel_accessor",
     "Panel",
     "StreamlitPanel",

src/nipanel/controls/__init__.py

@@ -0,0 +1,6 @@
+"""Controls for nipanel."""
+
+from nipanel.controls._enum_selectbox import enum_selectbox
+from nipanel.controls._flag_checkboxes import flag_checkboxes
+
+__all__ = ["enum_selectbox", "flag_checkboxes"]