Constrain types for python scalar class. Allow prerelease for nitypes dependency.

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

Author: Michael Johansen

poetry.lock

@@ -13,8 +13,7 @@ protobuf = {version=">=4.21"}
 ni-measurement-plugin-sdk = {version=">=2.3"}
 typing-extensions = ">=4.13.2"
 streamlit = ">=1.24"
-# Temporary dependency until ni-apis-python is available.
-nitypes = ">=0.1.0dev1"
+nitypes = {version=">=0.1.0dev1", allow-prereleases=true}
 
 [tool.poetry.group.dev.dependencies]
 types-grpcio = ">=1.0"

pyproject.toml

@@ -1,14 +1,16 @@
 """Classes to convert between measurement specific protobuf types and containers."""
 
-from typing import Any, Type
+from typing import Type, TypeAlias, Union
 
 from ni.protobuf.types import scalar_pb2
 from nitypes.scalar import Scalar
 
 from nipanel.converters import Converter
 
+_AnyScalarType: TypeAlias = Union[bool, int, float, str]
 
-class ScalarConverter(Converter[Scalar[Any], scalar_pb2.ScalarData]):
+
+class ScalarConverter(Converter[Scalar[_AnyScalarType], scalar_pb2.ScalarData]):
     """A converter for Scalar objects."""
 
     @property
@@ -21,7 +23,7 @@ def protobuf_message(self) -> Type[scalar_pb2.ScalarData]:
         """The type-specific protobuf message for the Python type."""
         return scalar_pb2.ScalarData
 
-    def to_protobuf_message(self, python_value: Scalar[Any]) -> scalar_pb2.ScalarData:
+    def to_protobuf_message(self, python_value: Scalar[_AnyScalarType]) -> scalar_pb2.ScalarData:
         """Convert the Python Scalar to a protobuf scalar_pb2.ScalarData."""
         message = self.protobuf_message()
         message.units = python_value.units
@@ -38,7 +40,7 @@ def to_protobuf_message(self, python_value: Scalar[Any]) -> scalar_pb2.ScalarDat
 
         return message
 
-    def to_python_value(self, protobuf_value: scalar_pb2.ScalarData) -> Scalar[Any]:
+    def to_python_value(self, protobuf_value: scalar_pb2.ScalarData) -> Scalar[_AnyScalarType]:
         """Convert the protobuf message to a Python Scalar."""
         if protobuf_value.units is None:
             raise ValueError("protobuf.units cannot be None.")

src/nipanel/converters/protobuf_types.py

@@ -74,7 +74,6 @@ def test___scalar_protobuf_value_unset___convert___throws_type_error() -> None:
 def test___scalar_protobuf_units_unset___convert___python_units_blank() -> None:
     protobuf_value = ScalarData()
     protobuf_value.bool_value = True
-    print(f"Protobuf units: {protobuf_value.units!r}")
 
     converter = ScalarConverter()
     python_value = converter.to_python_value(protobuf_value)