Update repo for changes in measurement.proto (#100)

* Updated stubs - tests are passing

* Remove unused import

Author: dixonjoel

ni_measurement_service/_internal/grpc_servicer.py

@@ -154,16 +154,15 @@ def GetMetadata(self, request, context):  # noqa N802:inherited method names-aut
         # User Interface details - Framed relative to the metadata python File
         ui_details = Measurement_pb2.UserInterfaceDetails()
 
-        ui_details.configuration_ui_url = (
-            self.measurement_info.ui_file_type.value + self.measurement_info.ui_file_path
-        )
+        ui_details.configuration_ui_url = self.measurement_info.ui_file_path
 
         # Sending back Response
         metadata_response = Measurement_pb2.GetMetadataResponse(
             measurement_details=measurement_details,
             measurement_parameters=measurement_parameters,
-            user_interface_details=ui_details,
+            user_interface_details=None,
         )
+        metadata_response.user_interface_details.append(ui_details)
         return metadata_response
 
     def Measure(self, request, context):  # noqa N802:inherited method names-autogen baseclass

ni_measurement_service/_internal/stubs/Measurement_pb2.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from . import ServiceManagement_pb2 as ServiceManagement__pb2
+import ServiceManagement_pb2 as ServiceManagement__pb2
 
 
 class ServiceManagementServiceStub(object):

ni_measurement_service/_internal/stubs/ServiceManagement_pb2_grpc.py

@@ -1,2 +1,2 @@
-poetry run python -m grpc_tools.protoc -I proto --python_out=. --grpc_python_out=. ServiceLocation.proto DiscoveryServices.proto Measurement.proto ServiceManagement.proto && ^
+poetry run python -m grpc_tools.protoc -I proto --python_out=. --grpc_python_out=. proto/ni/measurements/pin_map_context.proto ServiceLocation.proto DiscoveryServices.proto Measurement.proto ServiceManagement.proto && ^
 poetry run black *.py

ni_measurement_service/_internal/stubs/generate.bat

@@ -0,0 +1 @@
+""" Auto generated gRPC files."""

ni_measurement_service/_internal/stubs/ni/__init__.py

@@ -0,0 +1 @@
+""" Auto generated gRPC files."""

ni_measurement_service/_internal/stubs/ni/measurements/__init__.py

@@ -0,0 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+

ni_measurement_service/_internal/stubs/ni/measurements/pin_map_context_pb2.py

@@ -14,15 +14,16 @@ option csharp_namespace = "NationalInstruments.MeasurementServices.Measurements"
 //---------------------------------------------------------------------
 import "google/protobuf/any.proto";
 import "google/protobuf/type.proto";
+import "ni/measurements/pin_map_context.proto";
 
 // Service that contains methods related to measurement
 service MeasurementService {
-  
+
   // API to get complete metadata
   rpc GetMetadata (GetMetadataRequest) returns (GetMetadataResponse);
-  
+
   // API to measure
-  rpc Measure (MeasureRequest) returns (MeasureResponse);  
+  rpc Measure (MeasureRequest) returns (MeasureResponse);
 }
 
 // Below message is the metadata request which is currently empty
@@ -84,9 +85,9 @@ message GetMetadataResponse{
 
   // Measurement Configurations and outputs details
   MeasurementParameters measurement_parameters = 2;
-    
+
   // Measurement User Interface details
-  UserInterfaceDetails user_interface_details = 3;
+  repeated UserInterfaceDetails user_interface_details = 3;
 }
 
 // measurement configuration info that is part of metadata
@@ -130,6 +131,8 @@ message Output {
 // message that holds measurement configurations at run time
 message MeasureRequest{
   google.protobuf.Any configuration_parameters = 1;
+
+  ni.measurements.PinMapContext pin_map_context = 2;
 }
 
 // message that holds measurement outputs at run time

ni_measurement_service/_internal/stubs/ni/measurements/pin_map_context_pb2_grpc.py

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package ni.measurements;
+
+option csharp_namespace = "NationalInstruments.MeasurementServices";
+
+option go_package = "nationalinstruments.com/measurementservices/pin_map_context;pin_map_context";
+
+option java_multiple_files = true;
+
+option java_outer_classname = "PinMapContextProto";
+
+option java_package = "com.nationalinstruments.measurementservices";
+
+option objc_class_prefix = "NIMS";
+
+option php_namespace = "NationalInstruments\\MeasurementServices";
+
+message PinMapContext {
+    // Required. The resource id of the pin map in the Pin Map service that should be used for the call.
+    string pin_map_id = 1;
+
+    // Optional. List of site numbers being used for the call. If unspecified, use all sites in the pin map.
+    repeated int32 sites = 2;
+}