cleanup

Author: Mike Prosser

protos/ni/pythonpanel/v1/python_panel_service.proto

@@ -35,7 +35,7 @@ service PythonPanelService {
   // Enumerate the panels available in the system, including information about the state of the panels and what values they have.
   // Status Codes for errors:
   rpc EnumeratePanels(EnumeratePanelsRequest) returns (EnumeratePanelsResponse);
-  
+
   // Get a value for a control on the panel
   // Status Codes for errors:
   // - INVALID_ARGUMENT: 

src/nipanel/_panel_client.py

@@ -130,23 +130,22 @@ def get_value(self, panel_id: str, value_id: str) -> object:
         response = self._invoke_with_retry(self._get_stub().GetValue, try_get_value_request)
         return from_any(response.value)
 
-    def try_get_value(self, panel_id: str, value_id: str) -> tuple[bool, object]:
+    def try_get_value(self, panel_id: str, value_id: str) -> object:
         """Try to get the value for the control with value_id.
 
         Args:
             panel_id: The ID of the panel.
             value_id: The ID of the control.
 
         Returns:
-            A tuple containing a boolean indicating whether the value was successfully retrieved and
-            the value itself (or None if not present).
+            The value if found, otherwise None.
         """
         try_get_value_request = GetValueRequest(panel_id=panel_id, value_id=value_id)
         response = self._invoke_with_retry(self._get_stub().TryGetValue, try_get_value_request)
         if response.HasField("value"):
-            return True, from_any(response.value)
+            return from_any(response.value)
         else:
-            return False, None
+            return None
 
     def _get_stub(self) -> PythonPanelServiceStub:
         if self._stub is None:

src/nipanel/_panel_value_accessor.py

@@ -71,8 +71,8 @@ def get_value(self, value_id: str, default_value: _T | None = None) -> _T | obje
         Returns:
             The value, or the default value if not set
         """
-        found, value = self._panel_client.try_get_value(self._panel_id, value_id)
-        if not found:
+        value = self._panel_client.try_get_value(self._panel_id, value_id)
+        if value is None:
             if default_value is not None:
                 return default_value
             raise KeyError(f"Value with id '{value_id}' not found on panel '{self._panel_id}'.")

tests/unit/test_convert.py

@@ -144,6 +144,12 @@ def test___python_panel_collection___to_any___valid_paneltype_value(
     assert unpack_dest.values == expected_value
 
 
+def test___none_value___to_any___raises_type_error() -> None:
+    """Test that passing None to to_any() raises a TypeError."""
+    with pytest.raises(TypeError):
+        nipanel._convert.to_any(None)
+
+
 # ========================================================
 # Built-in Types: Protobuf to Python
 # ========================================================

tests/unit/test_panel_client.py

@@ -60,12 +60,12 @@ def test___get_unset_value___raises_exception(fake_panel_channel: grpc.Channel)
     assert exc_info.value.code() == grpc.StatusCode.NOT_FOUND
 
 
-def test___try_get_unset_value___returns_not_found(fake_panel_channel: grpc.Channel) -> None:
+def test___try_get_unset_value___returns_none(fake_panel_channel: grpc.Channel) -> None:
     client = create_panel_client(fake_panel_channel)
 
     response = client.try_get_value("panel1", "unset_id")
 
-    assert response == (False, None)
+    assert response is None
 
 
 def test___set_value___enumerate_panels_shows_value(
@@ -83,7 +83,7 @@ def test___set_value___gets_value(fake_panel_channel: grpc.Channel) -> None:
 
     client.set_value("panel1", "val1", "value1", notify=False)
 
-    assert client.try_get_value("panel1", "val1") == (True, "value1")
+    assert client.try_get_value("panel1", "val1") == "value1"
 
 
 def create_panel_client(fake_panel_channel: grpc.Channel) -> PanelClient: