Remove more SDK references that should be protobuf references.

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

Author: Michael Johansen

src/nipanel/converters/protobuf_types.py

@@ -19,9 +19,6 @@
     float64_analog_waveform_to_protobuf,
 )
 from ni.protobuf.types.waveform_pb2 import DoubleAnalogWaveform
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types.array_pb2 import (
-    Double2DArray,
-)
 from nitypes.scalar import Scalar
 from nitypes.waveform import AnalogWaveform
 from typing_extensions import TypeAlias
@@ -154,7 +151,7 @@ def to_python_value(
 
 
 
-class Double2DArrayConverter(CollectionConverter2D[float, Double2DArray]):
+class Double2DArrayConverter(CollectionConverter2D[float, array_pb2.Double2DArray]):
     """A converter between Collection[Collection[float]] and Double2DArray."""
 
     @property
@@ -163,12 +160,12 @@ def item_type(self) -> type:
         return float
 
     @property
-    def protobuf_message(self) -> Type[Double2DArray]:
+    def protobuf_message(self) -> Type[array_pb2.Double2DArray]:
         """The type-specific protobuf message for the Python type."""
-        return Double2DArray
+        return array_pb2.Double2DArray
 
-    def to_protobuf_message(self, python_value: Collection[Collection[float]]) -> Double2DArray:
-        """Convert the Python Collection[Collection[float]] to a protobuf 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."""
         rows = len(python_value)
         if rows:
             visitor = iter(python_value)
@@ -181,10 +178,10 @@ def to_protobuf_message(self, python_value: Collection[Collection[float]]) -> Do
 
         # Create a flat list in row major order.
         flat_list = [item for subcollection in python_value for item in subcollection]
-        return Double2DArray(rows=rows, columns=columns, data=flat_list)
+        return array_pb2.Double2DArray(rows=rows, columns=columns, data=flat_list)
 
-    def to_python_value(self, protobuf_message: Double2DArray) -> Collection[Collection[float]]:
-        """Convert the protobuf Double2DArray to a Python Collection[Collection[float]]."""
+    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]]."""
         if not protobuf_message.data:
             return []
         if len(protobuf_message.data) % protobuf_message.columns != 0:

tests/unit/test_convert.py

@@ -6,12 +6,7 @@
 from google.protobuf import any_pb2, duration_pb2, timestamp_pb2, wrappers_pb2
 from google.protobuf.message import Message
 from ni.protobuf.types import array_pb2, attribute_value_pb2, scalar_pb2
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types.array_pb2 import (
-    Double2DArray,
-)
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types.waveform_pb2 import (
-    DoubleAnalogWaveform,
-)
+from ni.protobuf.types.waveform_pb2 import DoubleAnalogWaveform
 from nitypes.scalar import Scalar
 from nitypes.waveform import AnalogWaveform
 from typing_extensions import TypeAlias
@@ -303,10 +298,10 @@ def test___python_2dcollection_of_float___to_any___valid_double2darray(
     expected_rows = 2
     expected_columns = 2
     result = nipanel._convert.to_any(python_value)
-    unpack_dest = Double2DArray()
+    unpack_dest = array_pb2.Double2DArray()
     _assert_any_and_unpack(result, unpack_dest)
 
-    assert isinstance(unpack_dest, Double2DArray)
+    assert isinstance(unpack_dest, array_pb2.Double2DArray)
     assert unpack_dest.rows == expected_rows
     assert unpack_dest.columns == expected_columns
     assert unpack_dest.data == expected_data
@@ -328,10 +323,10 @@ def test___python_set_of_collection_of_float___to_any___valid_double2darray(
     expected_rows = 2
     expected_columns = 2
     result = nipanel._convert.to_any(python_value)
-    unpack_dest = Double2DArray()
+    unpack_dest = array_pb2.Double2DArray()
     _assert_any_and_unpack(result, unpack_dest)
 
-    assert isinstance(unpack_dest, Double2DArray)
+    assert isinstance(unpack_dest, array_pb2.Double2DArray)
     assert unpack_dest.rows == expected_rows
     assert unpack_dest.columns == expected_columns
     # Sets and frozensets don't maintain order, so sort before comparing.
@@ -387,7 +382,7 @@ def test___double_analog_waveform___from_any___valid_python_analog_waveform() ->
 
 
 def test___double2darray___from_any___valid_python_2dcollection() -> None:
-    pb_value = Double2DArray(data=[1.0, 2.0, 3.0, 4.0], rows=2, columns=2)
+    pb_value = array_pb2.Double2DArray(data=[1.0, 2.0, 3.0, 4.0], rows=2, columns=2)
     packed_any = _pack_into_any(pb_value)
 
     result = nipanel._convert.from_any(packed_any)

tests/unit/test_protobuf_type_conversion.py

@@ -3,10 +3,7 @@
 
 import numpy
 import pytest
-from ni.protobuf.types import attribute_value_pb2, scalar_pb2
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types.array_pb2 import (
-    Double2DArray,
-)
+from ni.protobuf.types import array_pb2, attribute_value_pb2, scalar_pb2
 from ni.protobuf.types.waveform_pb2 import (
     DoubleAnalogWaveform,
     WaveformAttributeValue,
@@ -63,17 +60,17 @@ def test___list_of_lists_inconsistent_column_length___convert___throws_value_err
     "double2darray, expected_data",
     [
         (
-            Double2DArray(rows=3, columns=2, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]),
+            array_pb2.Double2DArray(rows=3, columns=2, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]),
             [[1.0, 2.0], [3.0, 4.0], [5.0, 6.0]],
         ),
         (
-            Double2DArray(rows=2, columns=3, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]),
+            array_pb2.Double2DArray(rows=2, columns=3, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]),
             [[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]],
         ),
     ],
 )
 def test___double2darray___convert___valid_list_of_lists(
-    double2darray: Double2DArray, expected_data: list[list[float]]
+    double2darray: array_pb2.Double2DArray, expected_data: list[list[float]]
 ) -> None:
     converter = Double2DArrayConverter()
     list_of_lists = converter.to_python_value(double2darray)
@@ -82,15 +79,15 @@ def test___double2darray___convert___valid_list_of_lists(
 
 
 def test___double2darray_invalid_num_columns___convert___throws_value_error() -> None:
-    double2darray = Double2DArray(rows=1, columns=2, data=[1.0, 2.0, 3.0])
+    double2darray = array_pb2.Double2DArray(rows=1, columns=2, data=[1.0, 2.0, 3.0])
     converter = Double2DArrayConverter()
 
     with pytest.raises(ValueError):
         _ = converter.to_python_value(double2darray)
 
 
 def test___double2darray_empty_data___convert___returns_empty_list() -> None:
-    double2darray = Double2DArray(rows=0, columns=0, data=[])
+    double2darray = array_pb2.Double2DArray(rows=0, columns=0, data=[])
     converter = Double2DArrayConverter()
 
     list_of_lists = converter.to_python_value(double2darray)