Update nipanel to pull DiscoveryClient from ni.measurementlink.discovery.v1.client (#146)

Author: csjall

poetry.lock

@@ -17,12 +17,13 @@ requires-poetry = '>=2.1,<3.0'
 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.4.0dev1", allow-prereleases = true }
 typing-extensions = ">=4.13.2"
 streamlit = ">=1.24"
 nitypes = {version=">=0.1.0dev8", allow-prereleases=true}
 numpy = ">=1.22"
 debugpy = ">=1.8.1"
+ni-grpc-extensions = { version = ">=0.1.0.dev1", allow-prereleases = true }
+ni-measurementlink-discovery-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
 ni-protobuf-types = { version = ">=0.1.0dev3", allow-prereleases = true }
 ni-panels-v1-proto = { version = ">=0.1.0dev1", allow-prereleases = true }
 

pyproject.toml

@@ -7,6 +7,7 @@
 
 import grpc
 from google.protobuf.any_pb2 import Any
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni.panels.v1.panel_service_pb2 import (
     EnumeratePanelsRequest,
     GetValueRequest,
@@ -17,8 +18,7 @@
 )
 from ni.panels.v1.panel_service_pb2_grpc import PanelServiceStub
 from ni.panels.v1.streamlit_panel_configuration_pb2 import StreamlitPanelConfiguration
-from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient
-from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
+from ni_grpc_extensions.channelpool import GrpcChannelPool
 from typing_extensions import ParamSpec
 
 from nipanel._convert import (

src/nipanel/_panel_client.py

@@ -8,8 +8,8 @@
 import grpc
 import hightime as ht
 import nitypes.bintime as bt
-from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient
-from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni_grpc_extensions.channelpool import GrpcChannelPool
 from nitypes.time import convert_datetime
 
 from nipanel._panel_client import _PanelClient

src/nipanel/_panel_value_accessor.py

@@ -5,8 +5,8 @@
 from typing import final
 
 import grpc
-from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient
-from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni_grpc_extensions.channelpool import GrpcChannelPool
 
 from nipanel._panel_value_accessor import PanelValueAccessor
 

src/nipanel/_streamlit_panel.py

@@ -4,8 +4,8 @@
 
 import threading
 
-from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient
-from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni_grpc_extensions.channelpool import GrpcChannelPool
 from streamlit.components.v1 import declare_component
 from streamlit.components.v1.custom_component import CustomComponent