Eliminate remaining grpc stubs for ni .proto files

.github/renovate.json

@@ -11,7 +11,7 @@
                 "third_party/ni-apis"
             ],
             "extends": [
-                "schedule:weekly"
+                "schedule:monthly"
             ]
         }
     ]

.github/workflows/check_nims.yml

@@ -73,12 +73,11 @@ jobs:
         run:  rm -rf docs
       - name: Generate gRPC stubs
         run: |
-          find ni_measurement_plugin_sdk_service/_internal/stubs/ -name \*_pb2.py\* -o -name \*_pb2_grpc.py\* -delete
           find tests/utilities/stubs/ -name \*_pb2.py\* -o -name \*_pb2_grpc.py\* -delete
           poetry run python scripts/generate_grpc_stubs.py
       - name: Check for out-of-date gRPC stubs
         run:  git diff --exit-code
       - name: Revert gRPC stubs
         run: |
-          git clean -dfx ni_measurement_plugin_sdk_service/_internal/stubs/ tests/utilities/stubs/
-          git restore ni_measurement_plugin_sdk_service/_internal/stubs/ tests/utilities/stubs/
+          git clean -dfx tests/utilities/stubs/
+          git restore tests/utilities/stubs/

packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py

@@ -11,7 +11,7 @@
 import click
 from click_option_group import RequiredMutuallyExclusiveOptionGroup, optgroup
 from mako.template import Template
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
 )
 from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient

packages/generator/ni_measurement_plugin_sdk_generator/client/_support.py

@@ -15,13 +15,13 @@
 from google.protobuf import descriptor_pool
 from google.protobuf.descriptor_pb2 import FieldDescriptorProto
 from google.protobuf.type_pb2 import Field
-from ni_measurement_plugin_sdk_service._internal.grpc_servicer import (
-    frame_metadata_dict,
-)
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+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_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 (

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

@@ -32,7 +32,7 @@ from enum import Enum
 import grpc
 from google.protobuf import any_pb2, descriptor_pool
 from google.protobuf.type_pb2 import Field
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )

packages/generator/pyproject.toml

@@ -32,6 +32,7 @@ black = ">=24.8.0"
 click-option-group = ">=0.5.6"
 ni-measurement-plugin-sdk-service = {version = "^2.2.0"}
 ni-protobuf-types = { version = ">=0.1.0dev2", allow-prereleases = true }
+ni-grpcdevice-v1-proto = { version = ">=0.1.0dev2", allow-prereleases = true }
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.2.0"
@@ -58,6 +59,7 @@ numpy = [
   { version = ">=1.26", python = ">=3.12,<3.13"},
   { version = ">=2.1", python = "^3.13"},
 ]
+ni-measurementlink-proto = { version = ">=0.1.0dev1", allow-prereleases = true }
 
 [tool.poetry.scripts]
 ni-measurement-plugin-generator = "ni_measurement_plugin_sdk_generator.plugin:create_measurement"

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

@@ -12,7 +12,7 @@
 import grpc
 from google.protobuf import any_pb2, descriptor_pool
 from google.protobuf.type_pb2 import Field
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )

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

@@ -12,7 +12,7 @@
 import grpc
 from google.protobuf import any_pb2, descriptor_pool
 from google.protobuf.type_pb2 import Field
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )

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

@@ -10,7 +10,7 @@
 import grpc
 from google.protobuf import any_pb2, descriptor_pool
 from google.protobuf.type_pb2 import Field
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+from ni.measurementlink.measurement.v2 import (
     measurement_service_pb2 as v2_measurement_service_pb2,
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )

packages/service/ni_measurement_plugin_sdk_service/_internal/grpc_servicer.py

@@ -14,19 +14,19 @@
 
 import grpc
 from google.protobuf import any_pb2
-
-from ni_measurement_plugin_sdk_service._internal.parameter import decoder, encoder
-from ni_measurement_plugin_sdk_service._internal.parameter.metadata import (
-    ParameterMetadata,
-)
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v1 import (
+from ni.measurementlink.measurement.v1 import (
     measurement_service_pb2 as v1_measurement_service_pb2,
     measurement_service_pb2_grpc as v1_measurement_service_pb2_grpc,
 )
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
+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_measurement_plugin_sdk_service._internal.parameter import decoder, encoder
+from ni_measurement_plugin_sdk_service._internal.parameter.metadata import (
+    ParameterMetadata,
+)
 from ni_measurement_plugin_sdk_service.measurement import WrongMessageTypeWarning
 from ni_measurement_plugin_sdk_service.measurement.info import (
     MeasurementInfo,

packages/service/ni_measurement_plugin_sdk_service/_internal/service_manager.py

@@ -7,6 +7,12 @@
 from deprecation import deprecated
 from google.protobuf import descriptor_pool
 from grpc.framework.foundation import logging_pool
+from ni.measurementlink.measurement.v1 import (
+    measurement_service_pb2_grpc as v1_measurement_service_pb2_grpc,
+)
+from ni.measurementlink.measurement.v2 import (
+    measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
+)
 
 from ni_measurement_plugin_sdk_service._internal.grpc_servicer import (
     MeasurementServiceServicerV1,
@@ -18,12 +24,6 @@
 from ni_measurement_plugin_sdk_service._internal.parameter.serialization_descriptors import (
     create_file_descriptor,
 )
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v1 import (
-    measurement_service_pb2_grpc as v1_measurement_service_pb2_grpc,
-)
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.measurementlink.measurement.v2 import (
-    measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
-)
 from ni_measurement_plugin_sdk_service.discovery import DiscoveryClient, ServiceLocation
 from ni_measurement_plugin_sdk_service.grpc.loggers import ServerLogger
 from ni_measurement_plugin_sdk_service.measurement.info import (