Merge branch 'main' into users/mjohanse/more_pb_converters

Author: mjohanse-emr

.gitignore

@@ -172,6 +172,3 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
-
-# VS Code settings
-.vscode/launch.json

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        },
+        {
+            // To use this configuration, add `debugpy.listen(("localhost", 5678))` to the script you wish to debug
+            "name": "Attach to Streamlit at localhost:5678",
+            "type": "debugpy",
+            "request": "attach",
+            "connect": {
+                "host": "localhost",
+                "port": 5678
+            },
+            "justMyCode": false
+        }
+    ]
+}

CONTRIBUTING.md

@@ -56,7 +56,11 @@ start docs\_build\index.html
 
 # Debugging on the streamlit side
 
-Debugging the measurement script can be done using standard Python debugging techniques. However, debugging the Streamlit script—or any code invoked by the Streamlit script—is more complex because it runs in a separate process launched by the PythonPanelServer. To debug the Streamlit script, you can use debugpy to attach the Visual Studio Code debugger as follows:
+Debugging the measurement script can be done using standard Python debugging
+techniques. However, debugging the Streamlit script—or any code invoked by the
+Streamlit script—is more complex because it runs in a separate process launched
+by the PythonPanelServer. To debug the Streamlit script, you can use debugpy to
+attach the Visual Studio Code debugger as follows:
 
 ## Instrument Streamlit script to debug
 
@@ -73,9 +77,15 @@ except RuntimeError as e:
         raise
 ```
 
-The `debugpy.listen()` function opens a port that allows the debugger to attach to the running process. You can specify any available port, as long as it matches the port configured in the launch.json file shown below. Since calling listen() more than once will raise an exception, it is wrapped in a try block to prevent the script from crashing if it is rerun.
+The `debugpy.listen()` function opens a port that allows the debugger to attach
+to the running process. You can specify any available port, as long as it
+matches the port configured in the launch.json file shown below. Since calling
+listen() more than once will raise an exception, it is wrapped in a try block to
+prevent the script from crashing if it is rerun.
 
-The `debugpy.wait_for_client()` function pauses script execution until the debugger is attached. This is helpful if you need to debug initialization code, but you can omit this line if it is not required.
+The `debugpy.wait_for_client()` function pauses script execution until the
+debugger is attached. This is helpful if you need to debug initialization code,
+but you can omit this line if it is not required.
 
 The `import debugpy` statement includes a type suppression comment to satisfy mypy.
 
@@ -96,7 +106,12 @@ You will also need this configuration in your launch.json:
         }
 ```
 
-After running your measurement script and allowing the PythonPanelServer to launch Streamlit with your Streamlit script, you can attach the debugger by clicking the **Attach to Streamlit at localhost:5678** button in the VS Code **Run and Debug** tab. Once attached, you can set breakpoints and use all standard debugging features in your Streamlit script, as well as in any nipanel code invoked by the Streamlit script.
+After running your measurement script and allowing the PythonPanelServer to
+launch Streamlit with your Streamlit script, you can attach the debugger by
+clicking the **Attach to Streamlit at localhost:5678** button in the VS Code
+**Run and Debug** tab. Once attached, you can set breakpoints and use all
+standard debugging features in your Streamlit script, as well as in any nipanel
+code invoked by the Streamlit script.
 
 # Developer Certificate of Origin (DCO)
 

examples/sample/sample_panel.py

@@ -18,8 +18,8 @@
     st.write("List")
 
 with col2:
-    st.write(panel.get_value("sample_string"))
-    st.write(panel.get_value("sample_int"))
-    st.write(panel.get_value("sample_float"))
-    st.write(panel.get_value("sample_bool"))
-    st.write(panel.get_value("float_values"))
+    st.write(panel.get_value("sample_string", ""))
+    st.write(panel.get_value("sample_int", 0))
+    st.write(panel.get_value("sample_float", 0.0))
+    st.write(panel.get_value("sample_bool", False))
+    st.write(panel.get_value("float_values", []))

poetry.lock

@@ -41,16 +41,23 @@ def panel_id(self) -> str:
         """Read-only accessor for the panel ID."""
         return self._panel_id
 
-    def get_value(self, value_id: str) -> object:
-        """Get the value for a control on the panel.
+    def get_value(self, value_id: str, default_value: object = None) -> object:
+        """Get the value for a control on the panel with an optional default value.
 
         Args:
             value_id: The id of the value
+            default_value: The default value to return if the value is not set
 
         Returns:
-            The value
+            The value, or the default value if not set
         """
-        return self._panel_client.get_value(self._panel_id, value_id)
+        try:
+            return self._panel_client.get_value(self._panel_id, value_id)
+        except grpc.RpcError as e:
+            if e.code() == grpc.StatusCode.NOT_FOUND and default_value is not None:
+                return default_value
+            else:
+                raise e
 
     def set_value(self, value_id: str, value: object) -> None:
         """Set the value for a control on the panel.

src/nipanel/_panel_value_accessor.py

@@ -123,7 +123,7 @@ def test___panel___set_value___sets_value(
     }
 
 
-def test___panel___get_unset_value___raises_exception(
+def test___panel___get_unset_value_with_no_default___raises_exception(
     fake_panel_channel: grpc.Channel,
 ) -> None:
     """Test that get_value() raises an exception for an unset value."""
@@ -146,6 +146,30 @@ def test___panel___set_value___gets_value(
     assert panel.get_value(value_id) == string_value
 
 
+def test___set_value___get_value_ignores_default(
+    fake_panel_channel: grpc.Channel,
+) -> None:
+    panel = StreamlitPanel("my_panel", "path/to/script", grpc_channel=fake_panel_channel)
+
+    value_id = "test_id"
+    string_value = "test_value"
+    panel.set_value(value_id, string_value)
+
+    assert panel.get_value(value_id, "default") == string_value
+
+
+def test___get_value_returns_default_when_value_not_set(
+    fake_panel_channel: grpc.Channel,
+) -> None:
+    panel = StreamlitPanel("my_panel", "path/to/script", grpc_channel=fake_panel_channel)
+
+    assert panel.get_value("missing_string", "default") == "default"
+    assert panel.get_value("missing_int", 123) == 123
+    assert panel.get_value("missing_float", 1.23) == 1.23
+    assert panel.get_value("missing_bool", True) is True
+    assert panel.get_value("missing_list", [1, 2, 3]) == [1, 2, 3]
+
+
 @pytest.mark.parametrize(
     "value_payload",
     [

tests/unit/test_streamlit_panel.py

@@ -59,6 +59,8 @@ def EnumeratePanels(  # noqa: N802
 
     def GetValue(self, request: GetValueRequest, context: Any) -> GetValueResponse:  # noqa: N802
         """Trivial implementation for testing."""
+        if request.value_id not in self._panel_value_ids.get(request.panel_id, {}):
+            context.abort(grpc.StatusCode.NOT_FOUND, "Value ID not found in panel")
         value = self._panel_value_ids[request.panel_id][request.value_id]
         return GetValueResponse(value=value)