Consume ni-apis-python packages (#1220)

* Consume the ni-grpc-extensions package

* Fix some analyzer errors

* Fix some analyzer errors in generator

* Consume the ni.measurementlink.discovery.v1.client package in the service

* Consume the ni.measurementlink.discovery.v1.client package in the generator

* Remove ServiceInfo from this repo

* Add reference to ni.measurementlink.discovery.v1 package for generator

* Fix some generator tests

* Use sessionmanagement.v1.client package

* Fix up references to sessionmanagement.v1.client in generator

* Fix up references to sessionmanagement.v1.client in generator

* Fix mock references to ni.measurementlink.sessionmanagement.v1.client._drivers

* Fix linter errors

* Fix expected renders

Author: dixonjoel

packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py

@@ -11,11 +11,11 @@
 import click
 from click_option_group import RequiredMutuallyExclusiveOptionGroup, optgroup
 from mako.template import Template
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
 )
-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 ni_measurement_plugin_sdk_generator.client._support import (
     create_class_name,

packages/generator/ni_measurement_plugin_sdk_generator/client/_support.py

@@ -15,15 +15,15 @@
 from google.protobuf import descriptor_pool
 from google.protobuf.descriptor_pb2 import FieldDescriptorProto
 from google.protobuf.type_pb2 import Field
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )
+from ni_grpc_extensions.channelpool import GrpcChannelPool
 from ni_measurement_plugin_sdk_service._internal.grpc_servicer import (
     frame_metadata_dict,
 )
-from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient
-from ni_measurement_plugin_sdk_service.grpc.channelpool import GrpcChannelPool
 from ni_measurement_plugin_sdk_service.measurement.client_support import (
     ParameterMetadata,
     create_file_descriptor,

packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako

@@ -39,8 +39,9 @@ from ni.measurementlink.measurement.v2 import (
 % for module in custom_import_modules:
 ${module}
 % endfor
-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 ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni.measurementlink.sessionmanagement.v1.client import PinMapContext
 % if output_metadata:
 from ni_measurement_plugin_sdk_service.measurement import WrongMessageTypeWarning
 % endif
@@ -53,7 +54,6 @@ from ni_measurement_plugin_sdk_service.measurement.client_support import (
     serialize_parameters,
 )
 from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
-from ni_measurement_plugin_sdk_service.session_management import PinMapContext
 
 _logger = logging.getLogger(__name__)
 

packages/generator/poetry.lock

@@ -31,8 +31,10 @@ protobuf = ">=4.21"
 black = ">=24.8.0"
 click-option-group = ">=0.5.6"
 ni-measurement-plugin-sdk-service = {version = "^2.2.0"}
+ni-measurementlink-discovery-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
 ni-protobuf-types = { version = ">=0.1.0dev2", allow-prereleases = true }
 ni-grpcdevice-v1-proto = { version = ">=0.1.0dev2", allow-prereleases = true }
+ni-grpc-extensions =  { version = ">=0.1.0dev1", allow-prereleases = true }
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.2.0"

packages/generator/pyproject.toml

@@ -5,8 +5,8 @@
 
 import grpc
 import pytest
+from ni.measurementlink.sessionmanagement.v1.client import PinMapContext
 from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
-from ni_measurement_plugin_sdk_service.session_management import PinMapContext
 
 from tests.conftest import CliRunnerFunction
 from tests.utilities.discovery_service_process import DiscoveryServiceProcess

packages/generator/tests/acceptance/test_pin_aware_measurement_client.py

@@ -11,7 +11,7 @@
 
 import pytest
 from click.testing import CliRunner, Result
-from ni_measurement_plugin_sdk_service.discovery._support import (
+from ni.measurementlink.discovery.v1.client._support import (
     _get_registration_json_file_path,
 )
 from packaging.version import Version

packages/generator/tests/conftest.py

@@ -19,8 +19,9 @@
 from ni.protobuf.types.array_pb2 import Double2DArray
 from ni.protobuf.types.array_pb2 import String2DArray
 from ni.protobuf.types.xydata_pb2 import DoubleXYData
-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 ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni.measurementlink.sessionmanagement.v1.client import PinMapContext
 from ni_measurement_plugin_sdk_service.measurement import WrongMessageTypeWarning
 from ni_measurement_plugin_sdk_service.measurement.client_support import (
     ParameterMetadata,
@@ -29,7 +30,6 @@
     serialize_parameters,
 )
 from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
-from ni_measurement_plugin_sdk_service.session_management import PinMapContext
 
 _logger = logging.getLogger(__name__)
 

packages/generator/tests/test_assets/example_renders/measurement_plugin_client/localized_measurement_client.py

@@ -19,8 +19,9 @@
 from ni.protobuf.types.array_pb2 import Double2DArray
 from ni.protobuf.types.array_pb2 import String2DArray
 from ni.protobuf.types.xydata_pb2 import DoubleXYData
-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 ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni.measurementlink.sessionmanagement.v1.client import PinMapContext
 from ni_measurement_plugin_sdk_service.measurement import WrongMessageTypeWarning
 from ni_measurement_plugin_sdk_service.measurement.client_support import (
     ParameterMetadata,
@@ -29,7 +30,6 @@
     serialize_parameters,
 )
 from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
-from ni_measurement_plugin_sdk_service.session_management import PinMapContext
 
 _logger = logging.getLogger(__name__)
 

packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py

@@ -14,15 +14,15 @@
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )
-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 ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni.measurementlink.sessionmanagement.v1.client import PinMapContext
 from ni_measurement_plugin_sdk_service.measurement.client_support import (
     ParameterMetadata,
     create_file_descriptor,
     serialize_parameters,
 )
 from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
-from ni_measurement_plugin_sdk_service.session_management import PinMapContext
 
 _logger = logging.getLogger(__name__)