Update nipanel to pull stubs from ni-apis-python packages

Signed-off-by: Michael Johansen <[email protected]>

Author: Michael Johansen

poetry.lock

@@ -10,12 +10,16 @@ packages = [{ include = "nipanel", from = "src" }]
 python = ">=3.9,<4.0,!=3.9.7" # Exclude 3.9.7 due to streamlit not supporting it
 grpcio = {version=">=1.49.0,<2.0"}
 protobuf = {version=">=4.21"}
-ni-measurement-plugin-sdk = {version=">=2.3"}
+ni-measurement-plugin-sdk = {version=">=2.4.0dev1", allow-prereleases = true }
+# ni-measurement-plugin-sdk-service = {version=">=2.4.0dev1"}
+# ni-measurement-plugin-sdk-generator = {version=">=2.4.0dev1"}
 typing-extensions = ">=4.13.2"
 streamlit = ">=1.24"
 nitypes = {version=">=0.1.0dev8", allow-prereleases=true}
 numpy = ">=1.22"
 debugpy = ">=1.8.1"
+ni-protobuf-types = { version = ">=0.1.0dev2", allow-prereleases = true }
+ni-panels-v1-proto = { version = ">=0.1.0dev1", allow-prereleases = true }
 
 [tool.poetry.group.dev.dependencies]
 types-grpcio = ">=1.0"

pyproject.toml

@@ -2,7 +2,6 @@
 
 from importlib.metadata import version
 
-from ni.protobuf.types import array_pb2
 from nipanel._panel_value_accessor import PanelValueAccessor
 from nipanel._streamlit_panel import StreamlitPanel
 from nipanel._streamlit_panel_initializer import (

src/nipanel/__init__.py

@@ -7,13 +7,13 @@
 
 import nitypes.bintime as bt
 import numpy as np
-from ni.protobuf.types import attribute_value_pb2, scalar_pb2, array_pb2
-from ni.protobuf.types.precision_timestamp_pb2 import PrecisionTimestamp
-from ni.protobuf.types.scalar_conversion import scalar_from_protobuf, scalar_to_protobuf
+from ni.protobuf.types import scalar_pb2, array_pb2
 from ni.protobuf.types.precision_timestamp_conversion import (
     bintime_datetime_from_protobuf,
     bintime_datetime_to_protobuf,
 )
+from ni.protobuf.types.precision_timestamp_pb2 import PrecisionTimestamp
+from ni.protobuf.types.scalar_conversion import scalar_from_protobuf, scalar_to_protobuf
 from ni.protobuf.types.waveform_conversion import (
     float64_analog_waveform_from_protobuf,
     float64_analog_waveform_to_protobuf,
@@ -63,15 +63,11 @@ def protobuf_message(self) -> Type[array_pb2.BytesArray]:
         """The type-specific protobuf message for the Python type."""
         return array_pb2.BytesArray
 
-    def to_protobuf_message(
-        self, python_value: Collection[bytes]
-    ) -> array_pb2.BytesArray:
+    def to_protobuf_message(self, python_value: Collection[bytes]) -> array_pb2.BytesArray:
         """Convert the collection of byte strings to array_pb2.BytesArray."""
         return self.protobuf_message(values=python_value)
 
-    def to_python_value(
-        self, protobuf_message: array_pb2.BytesArray
-    ) -> Collection[bytes]:
+    def to_python_value(self, protobuf_message: array_pb2.BytesArray) -> Collection[bytes]:
         """Convert the protobuf message to a Python collection of byte strings."""
         return list(protobuf_message.values)
 
@@ -89,15 +85,11 @@ def protobuf_message(self) -> Type[array_pb2.DoubleArray]:
         """The type-specific protobuf message for the Python type."""
         return array_pb2.DoubleArray
 
-    def to_protobuf_message(
-        self, python_value: Collection[float]
-    ) -> array_pb2.DoubleArray:
+    def to_protobuf_message(self, python_value: Collection[float]) -> array_pb2.DoubleArray:
         """Convert the collection of floats to array_pb2.DoubleArray."""
         return self.protobuf_message(values=python_value)
 
-    def to_python_value(
-        self, protobuf_message: array_pb2.DoubleArray
-    ) -> Collection[float]:
+    def to_python_value(self, protobuf_message: array_pb2.DoubleArray) -> Collection[float]:
         """Convert the protobuf message to a Python collection of floats."""
         return list(protobuf_message.values)
 
@@ -137,20 +129,15 @@ def protobuf_message(self) -> Type[array_pb2.StringArray]:
         """The type-specific protobuf message for the Python type."""
         return array_pb2.StringArray
 
-    def to_protobuf_message(
-        self, python_value: Collection[str]
-    ) -> array_pb2.StringArray:
+    def to_protobuf_message(self, python_value: Collection[str]) -> array_pb2.StringArray:
         """Convert the collection of strings to panel_types_pb2.StringCollection."""
         return self.protobuf_message(values=python_value)
 
-    def to_python_value(
-        self, protobuf_message: array_pb2.StringArray
-    ) -> Collection[str]:
+    def to_python_value(self, protobuf_message: array_pb2.StringArray) -> Collection[str]:
         """Convert the protobuf message to a Python collection of strings."""
         return list(protobuf_message.values)
 
 
-
 class Double2DArrayConverter(CollectionConverter2D[float, array_pb2.Double2DArray]):
     """A converter between Collection[Collection[float]] and Double2DArray."""
 
@@ -164,8 +151,10 @@ def protobuf_message(self) -> Type[array_pb2.Double2DArray]:
         """The type-specific protobuf message for the Python type."""
         return array_pb2.Double2DArray
 
-    def to_protobuf_message(self, python_value: Collection[Collection[float]]) -> array_pb2.Double2DArray:
-        """Convert the Python Collection[Collection[float]] to a protobuf array_pb2.Double2DArray."""
+    def to_protobuf_message(
+        self, python_value: Collection[Collection[float]]
+    ) -> array_pb2.Double2DArray:
+        """Convert the Python Collection[Collection[float]] to a protobuf Double2DArray."""
         rows = len(python_value)
         if rows:
             visitor = iter(python_value)
@@ -180,8 +169,10 @@ def to_protobuf_message(self, python_value: Collection[Collection[float]]) -> ar
         flat_list = [item for subcollection in python_value for item in subcollection]
         return array_pb2.Double2DArray(rows=rows, columns=columns, data=flat_list)
 
-    def to_python_value(self, protobuf_message: array_pb2.Double2DArray) -> Collection[Collection[float]]:
-        """Convert the protobuf array_pb2.Double2DArray to a Python Collection[Collection[float]]."""
+    def to_python_value(
+        self, protobuf_message: array_pb2.Double2DArray
+    ) -> Collection[Collection[float]]:
+        """Convert the protobuf Double2DArray to a Python Collection[Collection[float]]."""
         if not protobuf_message.data:
             return []
         if len(protobuf_message.data) % protobuf_message.columns != 0:

src/nipanel/converters/protobuf_types.py

@@ -1,16 +1,17 @@
 import datetime as dt
-from typing_extensions import Mapping
+
 
 import numpy
 import pytest
-from ni.protobuf.types import attribute_value_pb2, scalar_pb2, array_pb2
+from ni.protobuf.types import array_pb2, attribute_value_pb2, scalar_pb2
 from ni.protobuf.types.waveform_pb2 import (
     DoubleAnalogWaveform,
     WaveformAttributeValue,
 )
 from nitypes.bintime import DateTime
 from nitypes.scalar import Scalar
 from nitypes.waveform import AnalogWaveform, NoneScaleMode, SampleIntervalMode, Timing
+from typing_extensions import Mapping
 
 from nipanel.converters.protobuf_types import (
     Double2DArrayConverter,
@@ -298,7 +299,7 @@ def test___scalar_protobuf_value_unset___convert___throws_type_error() -> None:
     with pytest.raises(ValueError) as exc:
         _ = converter.to_python_value(protobuf_value)
 
-    assert exc.value.args[0].startswith("Unexpected value for protobuf_value.WhichOneOf")
+    assert exc.value.args[0].startswith("Could not determine the data type of 'value'.")
 
 
 def test___scalar_protobuf_units_unset___convert___python_units_blank() -> None: