Fixed #169: Removed underscore from _grpc_options (#174)

tkrebes · bkeryan · web-flow · commit b473bb2caf0f · 2022-12-19T11:06:15.000-06:00
* Replaced _grpc_options with grpc_options

* Updated nimi-python dependency version to 1.4.3

* niswitch_control_relays: Uncheck "Use adapter settings for Python interpreter"

Co-authored-by: Brad Keryan &lt;brad.keryan@ni.com&gt;
diff --git a/examples/nidcpower_source_dc_voltage/measurement.py b/examples/nidcpower_source_dc_voltage/measurement.py
@@ -158,7 +158,7 @@ def _create_nidcpower_session(
             session_grpc_channel = measurement_service.channel_pool.get_channel(
                 target=session_grpc_address
             )
-        session_kwargs["_grpc_options"] = nidcpower.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = nidcpower.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=nidcpower.SessionInitializationBehavior.AUTO,
diff --git a/examples/nidcpower_source_dc_voltage/pyproject.toml b/examples/nidcpower_source_dc_voltage/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nidcpower = ">=1.4.1"
+nidcpower = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"}
+# nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/nidcpower_source_dc_voltage/teststand_fixture.py b/examples/nidcpower_source_dc_voltage/teststand_fixture.py
@@ -47,7 +47,7 @@ def create_nidcpower_sessions(pin_map_id: str):
 
                 # Leave session open
                 nidcpower.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
 
             session_management_client.register_sessions(reservation.session_info)
@@ -80,6 +80,6 @@ def destroy_nidcpower_sessions():
                 )
 
                 session = nidcpower.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
                 session.close()
diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py b/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py
@@ -158,7 +158,7 @@ def _create_nidcpower_session(
             session_grpc_channel = measurement_service.channel_pool.get_channel(
                 target=session_grpc_address
             )
-        session_kwargs["_grpc_options"] = nidcpower.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = nidcpower.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=nidcpower.SessionInitializationBehavior.AUTO,
diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml b/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nidcpower = ">=1.4.1"
+nidcpower = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"}
+# nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py b/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py
@@ -47,7 +47,7 @@ def create_nidcpower_sessions(pin_map_id: str):
 
                 # Leave session open
                 nidcpower.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
 
             session_management_client.register_sessions(reservation.session_info)
@@ -80,6 +80,6 @@ def destroy_nidcpower_sessions():
                 )
 
                 session = nidcpower.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
                 session.close()
diff --git a/examples/nidmm_measurement/measurement.py b/examples/nidmm_measurement/measurement.py
@@ -130,7 +130,7 @@ def _create_nidmm_session(
             session_grpc_channel = measurement_service.channel_pool.get_channel(
                 target=session_grpc_address
             )
-        session_kwargs["_grpc_options"] = nidmm.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = nidmm.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=nidmm.SessionInitializationBehavior.AUTO,
diff --git a/examples/nidmm_measurement/pyproject.toml b/examples/nidmm_measurement/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nidmm = ">=1.4.1"
+nidmm = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-nidmm = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidmm"}
+# nidmm = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidmm"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/nidmm_measurement/teststand_fixture.py b/examples/nidmm_measurement/teststand_fixture.py
@@ -44,7 +44,7 @@ def create_nidmm_sessions(pin_map_id: str):
                 )
 
                 # Leave session open
-                nidmm.Session(resource_name=session_info.resource_name, _grpc_options=grpc_options)
+                nidmm.Session(resource_name=session_info.resource_name, grpc_options=grpc_options)
 
             session_management_client.register_sessions(reservation.session_info)
 
@@ -73,6 +73,6 @@ def destroy_nidmm_sessions():
                 )
 
                 session = nidmm.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
                 session.close()
diff --git a/examples/nifgen_standard_function/measurement.py b/examples/nifgen_standard_function/measurement.py
@@ -162,7 +162,7 @@ def _create_nifgen_session(
         # Assumption: the pin map specifies one NI-FGEN session per instrument. If the pin map
         # specified an NI-FGEN session per channel, the session name would need to include the
         # channel name(s).
-        session_kwargs["_grpc_options"] = nifgen.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = nifgen.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=nifgen.SessionInitializationBehavior.AUTO,
diff --git a/examples/nifgen_standard_function/pyproject.toml b/examples/nifgen_standard_function/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nifgen = ">=1.4.1"
+nifgen = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-nifgen = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nifgen"}
+# nifgen = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nifgen"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/nifgen_standard_function/teststand_fixture.py b/examples/nifgen_standard_function/teststand_fixture.py
@@ -47,7 +47,7 @@ def create_nifgen_sessions(pin_map_id: str):
                 nifgen.Session(
                     resource_name=session_info.resource_name,
                     channel_name=session_info.channel_list,
-                    _grpc_options=grpc_options,
+                    grpc_options=grpc_options,
                 )
 
             session_management_client.register_sessions(reservation.session_info)
@@ -80,6 +80,6 @@ def destroy_nifgen_sessions():
                 session = nifgen.Session(
                     resource_name=session_info.resource_name,
                     channel_name=session_info.channel_list,
-                    _grpc_options=grpc_options,
+                    grpc_options=grpc_options,
                 )
                 session.close()
diff --git a/examples/niscope_acquire_waveform/measurement.py b/examples/niscope_acquire_waveform/measurement.py
@@ -205,7 +205,7 @@ def _create_niscope_session(
             session_grpc_channel = measurement_service.channel_pool.get_channel(
                 target=session_grpc_address
             )
-        session_kwargs["_grpc_options"] = niscope.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = niscope.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=niscope.SessionInitializationBehavior.AUTO,
diff --git a/examples/niscope_acquire_waveform/pyproject.toml b/examples/niscope_acquire_waveform/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-niscope = ">=1.4.1"
+niscope = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-niscope = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niscope"}
+# niscope = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niscope"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/niscope_acquire_waveform/teststand_fixture.py b/examples/niscope_acquire_waveform/teststand_fixture.py
@@ -44,9 +44,7 @@ def create_niscope_sessions(pin_map_id: str):
                 )
 
                 # Leave session open
-                niscope.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
-                )
+                niscope.Session(resource_name=session_info.resource_name, grpc_options=grpc_options)
 
             session_management_client.register_sessions(reservation.session_info)
 
@@ -76,6 +74,6 @@ def destroy_niscope_sessions():
                 )
 
                 session = niscope.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
                 session.close()
diff --git a/examples/niswitch_control_relays/NISwitchControlRelays.seq b/examples/niswitch_control_relays/NISwitchControlRelays.seq
@@ -9754,7 +9754,7 @@
 																	<PythonCall classname='CPythonCall'>
 																		<subprops>
 																			<UseAdapterSettingsForInterpreterSession classname='Bool'>
-																				<value>true</value>
+																				<value>false</value>
 																			</UseAdapterSettingsForInterpreterSession>
 																			<InterpreterSessionScope classname='Num'>
 																				<value>3</value>
@@ -10199,7 +10199,7 @@
 																	<PythonCall classname='CPythonCall'>
 																		<subprops>
 																			<UseAdapterSettingsForInterpreterSession classname='Bool'>
-																				<value>true</value>
+																				<value>false</value>
 																			</UseAdapterSettingsForInterpreterSession>
 																			<InterpreterSessionScope classname='Num'>
 																				<value>3</value>
@@ -11325,7 +11325,7 @@
 																	<PythonCall classname='CPythonCall'>
 																		<subprops>
 																			<UseAdapterSettingsForInterpreterSession classname='Bool'>
-																				<value>true</value>
+																				<value>false</value>
 																			</UseAdapterSettingsForInterpreterSession>
 																			<InterpreterSessionScope classname='Num'>
 																				<value>3</value>
diff --git a/examples/niswitch_control_relays/measurement.py b/examples/niswitch_control_relays/measurement.py
@@ -92,7 +92,7 @@ def _create_niswitch_session(
             session_grpc_channel = measurement_service.channel_pool.get_channel(
                 target=session_grpc_address
             )
-        session_kwargs["_grpc_options"] = niswitch.GrpcSessionOptions(
+        session_kwargs["grpc_options"] = niswitch.GrpcSessionOptions(
             session_grpc_channel,
             session_name=session_info.session_name,
             initialization_behavior=niswitch.SessionInitializationBehavior.AUTO,
diff --git a/examples/niswitch_control_relays/pyproject.toml b/examples/niswitch_control_relays/pyproject.toml
@@ -6,13 +6,13 @@ authors = ["National Instruments"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-niswitch = ">=1.4.1"
+niswitch = ">=1.4.3"
 ni-measurement-service = "*"
 click = ">=7.1.2"
 
 [tool.poetry.dev-dependencies]
 # Uncomment to use prerelease dependencies (requires poetry>=1.2).
-niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch"}
+# niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch"}
 # ni-measurement-service = {path = "../..", develop = true}
 
 [build-system]
diff --git a/examples/niswitch_control_relays/teststand_fixture.py b/examples/niswitch_control_relays/teststand_fixture.py
@@ -45,7 +45,7 @@ def create_niswitch_sessions(pin_map_id: str):
 
                 # Leave session open
                 niswitch.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
 
             session_management_client.register_sessions(reservation.session_info)
@@ -76,6 +76,6 @@ def destroy_niswitch_sessions():
                 )
 
                 session = niswitch.Session(
-                    resource_name=session_info.resource_name, _grpc_options=grpc_options
+                    resource_name=session_info.resource_name, grpc_options=grpc_options
                 )
                 session.close()

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ def _create_nidcpower_session(`
`158`	`158`	`session_grpc_channel = measurement_service.channel_pool.get_channel(`
`159`	`159`	`target=session_grpc_address`
`160`	`160`	`)`
`161`		`- session_kwargs["_grpc_options"] = nidcpower.GrpcSessionOptions(`
	`161`	`+ session_kwargs["grpc_options"] = nidcpower.GrpcSessionOptions(`
`162`	`162`	`session_grpc_channel,`
`163`	`163`	`session_name=session_info.session_name,`
`164`	`164`	`initialization_behavior=nidcpower.SessionInitializationBehavior.AUTO,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ def create_nidcpower_sessions(pin_map_id: str):`
`47`	`47`
`48`	`48`	`# Leave session open`
`49`	`49`	`nidcpower.Session(`
`50`		`- resource_name=session_info.resource_name, _grpc_options=grpc_options`
	`50`	`+ resource_name=session_info.resource_name, grpc_options=grpc_options`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`session_management_client.register_sessions(reservation.session_info)`
`@@ -80,6 +80,6 @@ def destroy_nidcpower_sessions():`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`session = nidcpower.Session(`
`83`		`- resource_name=session_info.resource_name, _grpc_options=grpc_options`
	`83`	`+ resource_name=session_info.resource_name, grpc_options=grpc_options`
`84`	`84`	`)`
`85`	`85`	`session.close()`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ def _create_nidmm_session(`
`130`	`130`	`session_grpc_channel = measurement_service.channel_pool.get_channel(`
`131`	`131`	`target=session_grpc_address`
`132`	`132`	`)`
`133`		`- session_kwargs["_grpc_options"] = nidmm.GrpcSessionOptions(`
	`133`	`+ session_kwargs["grpc_options"] = nidmm.GrpcSessionOptions(`
`134`	`134`	`session_grpc_channel,`
`135`	`135`	`session_name=session_info.session_name,`
`136`	`136`	`initialization_behavior=nidmm.SessionInitializationBehavior.AUTO,`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def create_nidmm_sessions(pin_map_id: str):`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`# Leave session open`
`47`		`- nidmm.Session(resource_name=session_info.resource_name, _grpc_options=grpc_options)`
	`47`	`+ nidmm.Session(resource_name=session_info.resource_name, grpc_options=grpc_options)`
`48`	`48`
`49`	`49`	`session_management_client.register_sessions(reservation.session_info)`
`50`	`50`
`@@ -73,6 +73,6 @@ def destroy_nidmm_sessions():`
`73`	`73`	`)`
`74`	`74`
`75`	`75`	`session = nidmm.Session(`
`76`		`- resource_name=session_info.resource_name, _grpc_options=grpc_options`
	`76`	`+ resource_name=session_info.resource_name, grpc_options=grpc_options`
`77`	`77`	`)`
`78`	`78`	`session.close()`