remove service class since it is not needed by the discovery service, provided interface is enough

Author: Mike Prosser

src/nipanel/_panel_client.py

@@ -30,20 +30,18 @@
 
 _logger = logging.getLogger(__name__)
 
-PANEL_INTERFACE = "ni.panels.v1.PanelService"
+PANEL_SERVICE = "ni.panels.v1.PanelService"
 
 
 class _PanelClient:
     def __init__(
         self,
         *,
-        service_class: str | None = None,
         discovery_client: DiscoveryClient | None = None,
         grpc_channel_pool: GrpcChannelPool | None = None,
         grpc_channel: grpc.Channel | None = None,
     ) -> None:
         self._initialization_lock = threading.Lock()
-        self._service_class = service_class
         self._discovery_client = discovery_client
         self._grpc_channel_pool = grpc_channel_pool
         self._grpc_channel = grpc_channel
@@ -98,7 +96,7 @@ def _get_stub(self) -> PanelServiceStub:
         if self._stub is None:
             if self._grpc_channel is not None:
                 self._stub = PanelServiceStub(self._grpc_channel)
-            elif self._service_class is not None:
+            else:
                 with self._initialization_lock:
                     if self._grpc_channel_pool is None:
                         _logger.debug("Creating unshared GrpcChannelPool.")
@@ -110,13 +108,10 @@ def _get_stub(self) -> PanelServiceStub:
                         )
 
                     service_location = self._discovery_client.resolve_service(
-                        provided_interface=PANEL_INTERFACE,
-                        service_class=self._service_class,
+                        provided_interface=PANEL_SERVICE
                     )
                     channel = self._grpc_channel_pool.get_channel(service_location.insecure_address)
                     self._stub = PanelServiceStub(channel)
-            else:
-                raise TypeError("Either grpc_channel or service_class must be provided.")
         return self._stub
 
     def _invoke_with_retry(

src/nipanel/_panel_value_accessor.py

@@ -29,15 +29,13 @@ def __init__(
         self,
         *,
         panel_id: str,
-        service_class: str | None = None,
         notify_on_set_value: bool = True,
         discovery_client: DiscoveryClient | None = None,
         grpc_channel_pool: GrpcChannelPool | None = None,
         grpc_channel: grpc.Channel | None = None,
     ) -> None:
         """Initialize the accessor."""
         self._panel_client = _PanelClient(
-            service_class=service_class,
             discovery_client=discovery_client,
             grpc_channel_pool=grpc_channel_pool,
             grpc_channel=grpc_channel,

src/nipanel/_streamlit_constants.py

@@ -1,2 +1 @@
-STREAMLIT_PYTHON_PANEL_SERVICE = "ni.panels.v1.PanelService"
 STREAMLIT_REFRESH_COMPONENT_URL = "http://localhost:42001/panel-service/refresh"

src/nipanel/_streamlit_panel.py

@@ -9,7 +9,6 @@
 from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
 
 from nipanel._panel_value_accessor import PanelValueAccessor
-from nipanel._streamlit_constants import STREAMLIT_PYTHON_PANEL_SERVICE
 
 
 @final
@@ -41,7 +40,6 @@ def __init__(
         """
         super().__init__(
             panel_id=panel_id,
-            service_class=STREAMLIT_PYTHON_PANEL_SERVICE,
             discovery_client=discovery_client,
             grpc_channel_pool=grpc_channel_pool,
             grpc_channel=grpc_channel,

src/nipanel/_streamlit_panel_initializer.py

@@ -5,7 +5,6 @@
 
 from nipanel._convert import is_supported_type
 from nipanel._panel_value_accessor import PanelValueAccessor
-from nipanel._streamlit_constants import STREAMLIT_PYTHON_PANEL_SERVICE
 from nipanel._streamlit_panel import StreamlitPanel
 from nipanel.streamlit_refresh import initialize_refresh_component
 
@@ -84,7 +83,6 @@ def _initialize_panel_from_base_path() -> PanelValueAccessor:
     return PanelValueAccessor(
         panel_id=panel_id,
         notify_on_set_value=False,
-        service_class=STREAMLIT_PYTHON_PANEL_SERVICE,
     )