rebranding: replace the "MeasurementLink" term from the packages and examples with the rebranded term

.github/ISSUE_TEMPLATE/bug_report.md

@@ -45,5 +45,5 @@ Search open/closed issues before submitting. Someone may have reported the same
 
 * OS & Device: [e.g. macOS, Windows, Linux] on [Mac, PC]
 * `ni-measurement-plugin-sdk-service` version [e.g. 2.0.0]
-* MeasurementLink version [e.g. 23.0.0d123]
+* InstrumentStudio version [e.g. 24.8.0d123]
 * Python version [e.g. 3.9]

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,5 @@
-- [ ] This contribution adheres to [CONTRIBUTING.md](https://github.com/ni/measurement-services-python/blob/main/CONTRIBUTING.md).
-
-TODO: Check the above box with an 'x' indicating you've read and followed [CONTRIBUTING.md](https://github.com/ni/measurement-services-python/blob/main/CONTRIBUTING.md).
+<!-- TODO: Check the below box with an 'x' indicating you've read and followed [CONTRIBUTING.md](https://github.com/ni/measurement-plugin-python/blob/main/CONTRIBUTING.md) -->
+- [ ] This contribution adheres to [CONTRIBUTING.md](https://github.com/ni/measurement-plugin-python/blob/main/CONTRIBUTING.md).
 
 ### What does this Pull Request accomplish?
 

README.md

@@ -210,7 +210,7 @@ Run the `ni-measurement-plugin-client-generator` tool.
         - `--module-name` and `--class-name` define the module and class names of the generated client. If not specified, they are derived from the measurement service class name.
 
         - `--directory-out` specifies the output directory for the generated files. If not specified, files are placed in the current directory.
-        
+
     > **Note**: When generating multiple measurement clients, `--module-name` and `--class-name` are ignored and derived from the service class of each measurement. So, ensure that the measurement service class name adheres to proper naming conventions.
 
 2. To create measurement clients for all registered measurements, use this command:

examples/.env.sample

@@ -3,7 +3,7 @@
 # To use it:
 # - Copy this file to your service's directory or one of its parent directories
 #   (such as the root of your Git repository or `C:\ProgramData\National
-#   Instruments\MeasurementLink\Services` for statically registered measurement services).
+#   Instruments\Plug-Ins\Measurements` for statically registered measurement services).
 # - Rename it to `.env`.
 # - Uncomment and edit the options you want to change.
 # - Restart any affected services.
@@ -58,7 +58,7 @@
 # NI gRPC Device Server Configuration
 #----------------------------------------------------------------------
 
-# By default, measurement services use the MeasurementLink discovery service to
+# By default, measurement services use the NI Discovery Service to
 # activate the NI gRPC Device Server. You probably don't want to change this,
 # but if you do, you can uncomment the following options to override this
 # behavior:

examples/.env.simulation

@@ -5,9 +5,9 @@
 # To use it:
 # - Copy this file to your service's directory or one of its parent directories
 #   (such as the root of your Git repository or `C:\ProgramData\National
-#   Instruments\MeasurementLink\Services` for statically registered measurement services).
+#   Instruments\Plug-Ins\Measurements` for statically registered measurement services).
 # - Rename it to `.env`.
-# - Uncomment and edit the options you want to change.
+# - Comment out or edit the options you want to change.
 # - Restart any affected services.
 
 MEASUREMENT_PLUGIN_NIDCPOWER_SIMULATE=1

examples/sample_measurement/_stubs/color.proto

@@ -4,7 +4,7 @@ syntax = "proto3";
 
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
-package ni.measurementlink.measurement.sample_measurement.v1;
+package ni.examples;
 
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------

examples/sample_measurement/_stubs/color_pb2.pyi

@@ -4,6 +4,7 @@ isort:skip_file
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
 """
+
 import builtins
 import google.protobuf.descriptor
 import google.protobuf.internal.enum_type_wrapper

examples/sample_measurement/_stubs/color_pb2_grpc.pyi

@@ -4,3 +4,16 @@ isort:skip_file
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
 """
+
+import abc
+import collections.abc
+import grpc
+import grpc.aio
+import typing
+
+_T = typing.TypeVar("_T")
+
+class _MaybeAsyncIterator(collections.abc.AsyncIterator[_T], collections.abc.Iterator[_T], metaclass=abc.ABCMeta): ...
+
+class _ServicerContext(grpc.ServicerContext, grpc.aio.ServicerContext):  # type: ignore[misc, type-arg]
+    ...

examples/sample_measurement/pyproject.toml

@@ -14,6 +14,8 @@ click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pal
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
 grpc-stubs = "^1.53"
+grpcio-tools = "1.49.1"
+mypy-protobuf = "^3.6.0"
 types-protobuf = "^4.21"
 # Uncomment to use prerelease dependencies.
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}

packages/generator/ni_measurement_plugin_sdk_generator/plugin/templates/measurement.measproj.mako

@@ -1,20 +1,36 @@
 <%page args="ui_file"/>\
 \
 <?xml version="1.0" encoding="utf-8"?>
-<SourceFile Checksum="D75F992328C5D7515D9D415BD6A735FA591B6E5166671A3EDAAE0DA526541089828917B78BD7BD71409844922699BFC30CB6497F7CD8B6753585526A9B7B43DD" xmlns="http://www.ni.com/PlatformFramework">
+<SourceFile Checksum="45C379C12E21531099FA05BA0133A871C1484C2D21AE60D19E992798D99A4020F84B7105887E5560BD63521128915683E687C64C7E275FA176574FC5AEB48A6E" xmlns="http://www.ni.com/PlatformFramework">
 	<SourceModelFeatureSet>
-		<ParsableNamespace AssemblyFileVersion="23.0.0.49332" FeatureSetName="InstrumentStudio Measurement UI" Name="http://www.ni.com/InstrumentFramework/ScreenDocument" OldestCompatibleVersion="22.1.0.1" Version="22.1.0.1" />
-		<ParsableNamespace AssemblyFileVersion="9.7.0.49332" FeatureSetName="Editor" Name="http://www.ni.com/PlatformFramework" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
-		<ApplicationVersionInfo Build="23.0.0.49332" Name="MeasurementLink UI Editor" Version="23.0.0.49332" />
+		<ParsableNamespace AssemblyFileVersion="24.8.0.49911" FeatureSetName="InstrumentStudio Measurement UI" Name="http://www.ni.com/InstrumentFramework/ScreenDocument" OldestCompatibleVersion="22.1.0.1" Version="24.8.0.0" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="Editor" Name="http://www.ni.com/PlatformFramework" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="SystemDesigner" Name="http://www.ni.com/SystemDesigner/EnvoyManagement" OldestCompatibleVersion="5.0.0.0" Version="5.0.0.49152" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="SystemDesigner" Name="http://www.ni.com/SystemDesigner/SystemDiagram" OldestCompatibleVersion="8.0.0.49152" Version="8.0.0.49152" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="SystemDesigner" Name="http://www.ni.com/SystemDesigner/SystemModelCore" OldestCompatibleVersion="5.1.0.5" Version="5.2.0.49152" />
+		<ApplicationVersionInfo Build="24.8.0.49911" Name="Measurement Plug-In UI Editor" Version="24.8.0.49911" />
 	</SourceModelFeatureSet>
 	<Project xmlns="http://www.ni.com/PlatformFramework">
-		<EnvoyManagerRootEnvoy Id="6a601cfa53834724b3e46aa0445e25a0" ModelDefinitionType="EnvoyManagerRootEnvoy" Name="RootEnvoy" />
-		<EmbeddedDefinitionReference Id="3f1bd45184744d6595d6d7b008662efc" ModelDefinitionType="NationalInstruments.ProjectExplorer.Modeling.ProjectDataManager" Name="ProjectExplorer">
+		<EnvoyManagerRootEnvoy Id="dd27c2d5c720415eb15215bd545c9daa" ModelDefinitionType="EnvoyManagerRootEnvoy" Name="RootEnvoy" />
+		<EmbeddedDefinitionReference Id="89d719e01a084206ad23639db4b2f56f" ModelDefinitionType="NationalInstruments.ProjectExplorer.Modeling.ProjectDataManager" Name="ProjectExplorer">
 			<ProjectExplorer />
 		</EmbeddedDefinitionReference>
-		<NameScopingEnvoy Id="a7e9c36db3194f71869079e48ac6397e" ModelDefinitionType="DefaultTarget" Name="DefaultTarget">
+		<NameScopingEnvoy Id="595eaf9348434a23ae9cd79306a9f1cb" ModelDefinitionType="DefaultTarget" Name="DefaultTarget">
 			<DefaultTarget />
-			<SourceFileReference Id="7d137e4ffec6485693839b2b92093077" ModelDefinitionType="{http://www.ni.com/InstrumentFramework/ScreenDocument}Screen" Name="${ui_file}" StoragePath="${ui_file}" />
+			<SourceFileReference Id="82b9ddbcdf2948238df082fc48b602b7" ModelDefinitionType="{http://www.ni.com/InstrumentFramework/ScreenDocument}Screen" Name="${ui_file}" StoragePath="${ui_file}" />
+		</NameScopingEnvoy>
+		<EmbeddedDefinitionReference Id="e346ab41c93c4c81b47bf6d0522b5deb" ModelDefinitionType="NationalInstruments.SystemDesigner.SystemDiagram.SystemDiagramDefinition" Name="SystemDiagram">
+			<SystemDiagram Id="1a63510b9b8443258bb044b34b362c63" SystemDiagramVersion="75" xmlns="http://www.ni.com/SystemDesigner/SystemDiagram">
+				<EnvoySuperimpositionContainer Id="403e8b77a2104c37bbedb0ae13460459" xmlns="http://www.ni.com/SystemDesigner/EnvoyManagement">
+					<MappingManager Id="9e777b028f4b469b8549ceadb6957a0a" xmlns="http://www.ni.com/SystemDesigner/SystemModelCore">
+						<Superimposition Id="89235b0c03b1429dbc3dacc6a88e6f61" Name="Root Superimposition" />
+					</MappingManager>
+				</EnvoySuperimpositionContainer>
+				<SystemDiagramRootDiagram Id="5a0c562a2db249768b0a8ecb33fd3041" />
+			</SystemDiagram>
+		</EmbeddedDefinitionReference>
+		<NameScopingEnvoy Id="99031b5a162c4ef0ba572fcd38a9e9ef" ModelDefinitionType="NullTarget" Name="NullTarget">
+			<NullTarget />
 		</NameScopingEnvoy>
 	</Project>
 	<ProjectInformation xmlns="http://www.ni.com/PlatformFramework" />

packages/generator/ni_measurement_plugin_sdk_generator/plugin/templates/measurement.measui.mako

@@ -1,33 +1,27 @@
 <%page args="display_name, service_class"/>\
 \
 <?xml version="1.0" encoding="utf-8"?>
-<SourceFile Checksum="BDCAC3F8D8E3716B3E94E0FD086DD46820712B258DCAA34AB2518BD37944E507B9171022113DA7022D17735D0DD4EB8F7BF9FF126A9B26EAFB5385CE466A2328" Timestamp="1D924B702209D19" xmlns="http://www.ni.com/PlatformFramework">
+<SourceFile Checksum="C68495BACA801D17201A400444BA8E57096D877C220B005C9CC754DDBC96D7FF74F6512D245FAE462DBE92AF734E428F52FD46C680D4C1315BDAFF8C1B569796" Timestamp="1DB3B1ED4C5A7FD" xmlns="http://www.ni.com/PlatformFramework">
 	<SourceModelFeatureSet>
-		<ParsableNamespace AssemblyFileVersion="9.7.0.49332" FeatureSetName="Configuration Based Software Core" Name="http://www.ni.com/ConfigurationBasedSoftware.Core" OldestCompatibleVersion="6.3.0.49152" Version="6.3.0.49152" />
-		<ParsableNamespace AssemblyFileVersion="9.7.0.49332" FeatureSetName="LabVIEW Controls" Name="http://www.ni.com/Controls.LabVIEW.Design" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
-		<ParsableNamespace AssemblyFileVersion="23.0.0.49332" FeatureSetName="InstrumentStudio Measurement UI" Name="http://www.ni.com/InstrumentFramework/ScreenDocument" OldestCompatibleVersion="22.1.0.1" Version="22.1.0.1" />
-		<ParsableNamespace AssemblyFileVersion="9.7.0.49332" FeatureSetName="Editor" Name="http://www.ni.com/PanelCommon" OldestCompatibleVersion="6.1.0.0" Version="6.1.0.49152" />
-		<ParsableNamespace AssemblyFileVersion="9.7.0.49332" FeatureSetName="Editor" Name="http://www.ni.com/PlatformFramework" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
-		<ApplicationVersionInfo Build="23.0.0.49332" Name="MeasurementLink UI Editor" Version="23.0.0.49332" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="Configuration Based Software Core" Name="http://www.ni.com/ConfigurationBasedSoftware.Core" OldestCompatibleVersion="6.3.0.49152" Version="9.8.1.49152" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="LabVIEW Controls" Name="http://www.ni.com/Controls.LabVIEW.Design" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
+		<ParsableNamespace AssemblyFileVersion="24.8.0.49911" FeatureSetName="InstrumentStudio Measurement UI" Name="http://www.ni.com/InstrumentFramework/ScreenDocument" OldestCompatibleVersion="22.1.0.1" Version="24.8.0.0" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="Editor" Name="http://www.ni.com/PanelCommon" OldestCompatibleVersion="6.1.0.0" Version="6.1.0.49152" />
+		<ParsableNamespace AssemblyFileVersion="9.14.0.49911" FeatureSetName="Editor" Name="http://www.ni.com/PlatformFramework" OldestCompatibleVersion="8.1.0.49152" Version="8.1.0.49152" />
+		<ApplicationVersionInfo Build="24.8.0.49911" Name="Measurement Plug-In UI Editor" Version="24.8.0.49911" />
 	</SourceModelFeatureSet>
-	<Screen ClientId="{c652bbf0-7148-496d-85fe-06653cd41eaf}" DisplayName="${display_name}" Id="951ada7311244fc186690f66be50fe48" ServiceClass="${service_class}" xmlns="http://www.ni.com/InstrumentFramework/ScreenDocument">
-		<ScreenSurface Height="[float]400" Id="98b2ef21e0a14a49bdce21ce0e6ffd5d" Left="[float]0" PanelSizeMode="Fixed" Top="[float]0" Width="[float]800" xmlns="http://www.ni.com/ConfigurationBasedSoftware.Core">
-			<ScreenSurfaceCanvas Background="[SMSolidColorBrush]#80808080" BaseName="[string]Canvas" Height="[float]155" Id="18409ed2a6834e3c9d16482ce12d4456" Label="[UIModel]4cf4adf12c947918b5397e14dbe63ea" Left="[float]25" Top="[float]31" Width="[float]134">
-				<ChannelArrayViewer AdaptsToType="[bool]True" ArrayElement="[UIModel]e87ce07b6f2748068bb6ee94f8a9f950" BaseName="[string]Numeric Array Input" Channel="[string]Configuration/Array in" Columns="[int]1" Dimensions="[int]1" Height="[float]120" Id="47ce4cf9a7ba483b9302b38396cecd3f" IndexVisibility="[Visibility]Collapsed" Label="[UIModel]e047fd7a7506489286d7cd1895155531" Left="[float]11" Orientation="[SMOrientation]Vertical" Rows="[int]4" Top="[float]26" VerticalScrollBarVisibility="[ScrollBarVisibility]Visible" Width="[float]104">
-					<p.DefaultElementValue>0x0</p.DefaultElementValue>
-					<ChannelArrayNumericText BaseName="[string]Numeric" Height="[float]24" Id="e87ce07b6f2748068bb6ee94f8a9f950" UnitAnnotation="[string]" ValueFormatter="[string]LV:G5" ValueType="[Type]Double" Width="[float]72" />
-				</ChannelArrayViewer>
-				<Label Height="[float]16" Id="e047fd7a7506489286d7cd1895155531" LabelOwner="[UIModel]47ce4cf9a7ba483b9302b38396cecd3f" Left="[float]11" Text="[string]Array in" Top="[float]2" Width="[float]41" xmlns="http://www.ni.com/PanelCommon" />
-			</ScreenSurfaceCanvas>
-			<Label Height="[float]16" Id="4cf4adf12c947918b5397e14dbe63ea" LabelOwner="[UIModel]18409ed2a6834e3c9d16482ce12d4456" Left="[float]25" Text="[string]Input" Top="[float]11" Width="[float]28" xmlns="http://www.ni.com/PanelCommon" />
-			<ScreenSurfaceCanvas Background="[SMSolidColorBrush]#80808080" BaseName="[string]Canvas" Height="[float]155" Id="c380edefe8e43fe9bec7aa3789c4ac9" Label="[UIModel]418004886c464b879c0b1a356b4a0a96" Left="[float]207" Top="[float]31" Width="[float]134">
-				<ChannelArrayViewer AdaptsToType="[bool]True" ArrayElement="[UIModel]424a12e4d68a4b948d2613ca4c3908a6" BaseName="[string]Numeric Array Output" Channel="[string]Output/Array out" Columns="[int]1" Dimensions="[int]1" Height="[float]120" Id="af62731a9eab4296ab89339950e542d6" IndexVisibility="[Visibility]Collapsed" Label="[UIModel]8b3d1fbb5c68438695c70ab5a8377ac2" Left="[float]10" Orientation="[SMOrientation]Vertical" Rows="[int]4" Top="[float]27" VerticalScrollBarVisibility="[ScrollBarVisibility]Visible" Width="[float]104">
-					<p.DefaultElementValue>0x0</p.DefaultElementValue>
-					<ChannelArrayNumericText BaseName="[string]Numeric" Height="[float]24" Id="424a12e4d68a4b948d2613ca4c3908a6" IsReadOnly="[bool]True" UnitAnnotation="[string]" ValueFormatter="[string]LV:G5" ValueType="[Type]Double" Width="[float]72" />
-				</ChannelArrayViewer>
-				<Label Height="[float]16" Id="8b3d1fbb5c68438695c70ab5a8377ac2" LabelOwner="[UIModel]af62731a9eab4296ab89339950e542d6" Left="[float]10" Text="[string]Array out" Top="[float]7" Width="[float]49" xmlns="http://www.ni.com/PanelCommon" />
-			</ScreenSurfaceCanvas>
-			<Label Height="[float]16" Id="418004886c464b879c0b1a356b4a0a96" LabelOwner="[UIModel]c380edefe8e43fe9bec7aa3789c4ac9" Left="[float]207" Text="[string]Output" Top="[float]11" Width="[float]38" xmlns="http://www.ni.com/PanelCommon" />
+	<Screen DisplayName="${display_name}" Id="3656de7c9d6a42cfb27ea41494f0ed46" ServiceClass="${service_class}" xmlns="http://www.ni.com/InstrumentFramework/ScreenDocument">
+		<ScreenSurface BackgroundColor="[SMSolidColorBrush]#ffffffff" Height="[float]400" Id="5c1b8cc5eaf94b12b2be341f38937113" Left="[float]0" PanelSizeMode="Fixed" Top="[float]0" Width="[float]800" xmlns="http://www.ni.com/ConfigurationBasedSoftware.Core">
+			<ChannelArrayViewer AdaptsToType="[bool]True" ArrayElement="[UIModel]6f8ab70f7a984a76ab50c8963cdebdfc" BaseName="[string]Numeric Array Input" Channel="[string]{5541d3fb-67cf-41cb-af53-b51b5b84fe2c}/Configuration/Array in" Columns="[int]1" Dimensions="[int]1" Height="[float]120" Id="4c034db32a2a40ce8ce645cda760a0bc" IndexVisibility="[Visibility]Collapsed" IsFixedSize="[bool]False" Label="[UIModel]1eff9af8bfcd427b919b514abb7494d9" Left="[float]34" Orientation="[SMOrientation]Vertical" Rows="[int]4" TabIndex="[int]0" Top="[float]50" VerticalScrollBarVisibility="[ScrollBarVisibility]Visible" Width="[float]104">
+				<p.DefaultElementValue>0x0</p.DefaultElementValue>
+				<ChannelArrayNumericText BaseName="[string]Numeric" Height="[float]24" Id="6f8ab70f7a984a76ab50c8963cdebdfc" UnitAnnotation="[string]" ValueFormatter="[string]LV:G5" ValueType="[Type]Double" Width="[float]72" />
+			</ChannelArrayViewer>
+			<Label Height="[float]16" Id="1eff9af8bfcd427b919b514abb7494d9" LabelOwner="[UIModel]4c034db32a2a40ce8ce645cda760a0bc" Left="[float]34" Text="[string]Array in" Top="[float]30" Width="[float]41" xmlns="http://www.ni.com/PanelCommon" />
+			<ChannelArrayViewer AdaptsToType="[bool]True" ArrayElement="[UIModel]2601f80845974011b1488c655006560d" BaseName="[string]Numeric Array Output" Channel="[string]{5541d3fb-67cf-41cb-af53-b51b5b84fe2c}/Output/Array out" Columns="[int]1" Dimensions="[int]1" Height="[float]120" Id="48aa4906df6b47cf9e0404db2300ea9f" IndexVisibility="[Visibility]Collapsed" IsFixedSize="[bool]False" Label="[UIModel]107983d1f11646ee84e5159106f36b81" Left="[float]202" Orientation="[SMOrientation]Vertical" Rows="[int]4" TabIndex="[int]1" Top="[float]50" VerticalScrollBarVisibility="[ScrollBarVisibility]Visible" Width="[float]104">
+				<p.DefaultElementValue>0x0</p.DefaultElementValue>
+				<ChannelArrayNumericText BaseName="[string]Numeric" Height="[float]24" Id="2601f80845974011b1488c655006560d" IsReadOnly="[bool]True" UnitAnnotation="[string]" ValueFormatter="[string]LV:G5" ValueType="[Type]Double" Width="[float]72" />
+			</ChannelArrayViewer>
+			<Label Height="[float]16" Id="107983d1f11646ee84e5159106f36b81" LabelOwner="[UIModel]48aa4906df6b47cf9e0404db2300ea9f" Left="[float]202" Text="[string]Array out" Top="[float]30" Width="[float]49" xmlns="http://www.ni.com/PanelCommon" />
 		</ScreenSurface>
 	</Screen>
 </SourceFile>