feat: Custom LAN Device Name for TCPIP Connections

.github/workflows/test-code.yml

@@ -28,9 +28,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-          check-latest: true
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:

CHANGELOG.md

@@ -18,6 +18,10 @@ Valid subsections within a version are:
 
 Things to be included in the next release go here.
 
+### Changed
+
+- Changed `DeviceConfigEntry` dataclass by adding an optional `lan_device_name` field, which allows connecting to instruments through TCPIP on LAN device names other than `inst0`.
+
 ---
 
 ## v2.2.0 (2024-08-02)

docs/configuration.md

@@ -79,18 +79,24 @@ devices:
     alias: <alias>
     connection_type: <connection_type>
     device_type: <device_type>
-# usb connection
+# TCPIP connection
+  - address: <ip_address_or_hostname>
+    alias: <alias>
+    connection_type: TCPIP
+    device_type: <device_type>
+    lan_device_name: <lan_device_name>
+# USB connection
   - address: <model>-<serial_number>
     alias: <alias>
     connection_type: USB
     device_type: <device_type>
-# socket connection
+# SOCKET connection
   - address: <ip_address_or_hostname>
     alias: <alias>
     connection_type: SOCKET
     device_type: <device_type>
     lan_port: <port_number>
-# serial connection
+# SERIAL connection
   - address: <serial_port>
     alias: <alias>
     connection_type: SERIAL
@@ -101,7 +107,7 @@ devices:
       flow_control: xon_xoff
       parity: none
       end_input: none
-# gpib connection
+# GPIB connection
   - address: <gpib_address>
     gpib_board_number: <gpib_board_number>
     alias: <alias>
@@ -171,6 +177,9 @@ devices:
     - The open port, a number in the range 0 to 65535.
     - Required when the `<connection_type>` is `SOCKET`.
     - Optional when `<connection_type>` is `REST_API`
+- `lan_device_name`
+    - The LAN device name to connect on when `<connection_type>` is `TCPIP`.
+    - If no LAN device name is provided in the configuration, `inst0` is used.
 - `serial_config`
     - Configuration data for `SERIAL` connection type, which VISA documentation
         commonly refers to as ASRL.
@@ -263,6 +272,11 @@ devices:
     alias: my_smu_by_ip
     connection_type: TCPIP
     device_type: SMU
+# TCPIP connection to SCOPE using the High Speed LAN Instrument Protocol (HiSLIP)
+  - address: MSO54-123456
+    alias: my_scope_on_hislip0
+    device_type: SCOPE
+    lan_device_name: hislip0
 # SOCKET connection to SCOPE types needs lan_port number
   - address: 123.45.67.255
     alias: my_scope_port4000
@@ -321,6 +335,14 @@ alias = "my_smu_by_ip"
 connection_type = "TCPIP"
 device_type = "SMU"
 
+# TCPIP connection to SCOPE using the High Speed LAN Instrument Protocol (HiSLIP)
+[[devices]]
+address = "MSO54-123456"
+alias = "my_scope_by_hostname"
+connection_type = "TCPIP"
+device_type = "SCOPE"
+lan_device_name = "hislip0"
+
 # SOCKET connection to SCOPE types needs lan_port number
 [[devices]]
 address = "123.45.67.255"

pyproject.toml

@@ -432,11 +432,12 @@ package = wheel
 install_command = python -I -m pip install --upgrade --upgrade-strategy=eager {opts} {packages}
 deps =
     poetry
+passenv =
+    PYRIGHT_PYTHON_GLOBAL_NODE  # If set outside of tox, this will cause python-pyright to use nodeenv to install node rather than use the system node
 setenv =
     DOC_PYTHON_VERSION = python3.11  # Keep this in sync with .readthedocs.yml and any CI scripts
     # Skip pre-commit checks that are not needed
     SKIP = file-contents-sorter
-    PYRIGHT_PYTHON_GLOBAL_NODE = False  # This will cause python-pyright to use nodeenv to install node rather than use the system node
 commands_pre =
     poetry install --no-root --without=main
 commands =

src/tm_devices/components/dm_config_parser.py

@@ -151,6 +151,7 @@ def add_device(  # noqa: PLR0913
         connection_type: Union[ConnectionTypes, str] = ConnectionTypes.TCPIP,
         alias: Optional[str] = None,
         lan_port: Optional[int] = None,
+        lan_device_name: Optional[str] = None,
         serial_config: Optional[SerialConfig] = None,
         device_driver: Optional[str] = None,
         gpib_board_number: Optional[int] = None,
@@ -168,6 +169,8 @@ def add_device(  # noqa: PLR0913
             connection_type: The specific type of connection defined in the config entry.
             alias: An optional key/name used to retrieve this device from the DeviceManager.
             lan_port: The port number to connect on, used for SOCKET/REST_API connections.
+            lan_device_name: The LAN device name to connect on, only used for TCPIP connections.
+                The default is 'inst0'.
             serial_config: A dataclass for holding serial connection info.
             device_driver: A string indicating the specific Python device driver to use.
             gpib_board_number: The GPIB board number (also referred to as a controller), only used
@@ -188,6 +191,7 @@ def add_device(  # noqa: PLR0913
             connection_type=connection_type,
             alias=alias,
             lan_port=lan_port,
+            lan_device_name=lan_device_name,
             serial_config=serial_config,
             device_driver=device_driver,
             gpib_board_number=gpib_board_number,

src/tm_devices/helpers/constants_and_dataclasses.py

@@ -12,7 +12,12 @@
     AsDictionaryMixin,
     AsDictionaryUseEnumNameUseCustEnumStrValueMixin,
 )
-from tm_devices.helpers.enums import ConnectionTypes, DeviceTypes, LoadImpedanceAFG, SupportedModels
+from tm_devices.helpers.enums import (
+    ConnectionTypes,
+    DeviceTypes,
+    LoadImpedanceAFG,
+    SupportedModels,
+)
 from tm_devices.helpers.standalone_functions import validate_address
 
 
@@ -185,6 +190,8 @@ class DeviceConfigEntry(AsDictionaryUseEnumNameUseCustEnumStrValueMixin, _Config
     """An optional key/name used to retrieve this devices from the DeviceManager."""
     lan_port: Optional[int] = None
     """The port number to connect on, used for SOCKET/REST_API connections."""
+    lan_device_name: Optional[str] = None
+    """The LAN device name to connect on, used for TCPIP connections (defaults to 'inst0')."""
     serial_config: Optional[SerialConfig] = None
     """Serial configuration properties for connecting to a device over SERIAL (ASRL)."""
     device_driver: Optional[str] = None
@@ -193,7 +200,7 @@ class DeviceConfigEntry(AsDictionaryUseEnumNameUseCustEnumStrValueMixin, _Config
     """The GPIB board number (also referred to as a controller) to be used when making a GPIB connection (defaults to 0)."""  # noqa: E501
 
     # pylint: disable=too-many-branches
-    def __post_init__(self) -> None:  # noqa: PLR0912,C901,PLR0915
+    def __post_init__(self) -> None:  # noqa: PLR0912, C901
         """Validate data after creation.
 
         Raises:
@@ -219,20 +226,21 @@ def __post_init__(self) -> None:  # noqa: PLR0912,C901,PLR0915
             # this is from an invalid enum name
             raise TypeError(*error.args)  # noqa: TRY200,B904
 
-        # Set the GPIB board number to 0 if it is not provided
-        if self.connection_type == ConnectionTypes.GPIB:
-            if self.gpib_board_number is None:
-                object.__setattr__(self, "gpib_board_number", 0)
-            if not isinstance(self.gpib_board_number, int):
-                try:
-                    # noinspection PyTypeChecker
-                    object.__setattr__(self, "gpib_board_number", int(self.gpib_board_number))  # pyright: ignore[reportArgumentType]
-                except ValueError:
-                    msg = (
-                        f'"{self.gpib_board_number}" is not a valid GPIB board number, '
-                        f"valid board numbers must be integers."
-                    )
-                    raise ValueError(msg)  # noqa: B904
+        # Validate the GPIB board number
+        if (
+            self.connection_type == ConnectionTypes.GPIB
+            and not isinstance(self.gpib_board_number, int)
+            and self.gpib_board_number is not None
+        ):
+            try:
+                # noinspection PyTypeChecker
+                object.__setattr__(self, "gpib_board_number", int(self.gpib_board_number))
+            except ValueError:
+                msg = (
+                    f'"{self.gpib_board_number}" is not a valid GPIB board number, '
+                    f"valid board numbers must be integers."
+                )
+                raise ValueError(msg)  # noqa: B904
 
         if (
             self.gpib_board_number is not None
@@ -395,13 +403,16 @@ def get_visa_resource_expression(self) -> str:
         elif self.connection_type == ConnectionTypes.SOCKET:
             resource_expr = f"TCPIP0::{self.address}::{self.lan_port}::SOCKET"
         elif self.connection_type == ConnectionTypes.TCPIP:
-            resource_expr = f"TCPIP0::{self.address}::inst0::INSTR"
+            # Set the LAN device name to "inst0" if one is not provided/
+            lan_device_name = "inst0" if self.lan_device_name is None else self.lan_device_name
+            resource_expr = f"TCPIP0::{self.address}::{lan_device_name}::INSTR"
         elif self.connection_type == ConnectionTypes.SERIAL:
             resource_expr = f"ASRL{self.address}::INSTR"
         elif self.connection_type == ConnectionTypes.MOCK:  # pragma: no cover
             resource_expr = f"MOCK0::{self.address}::INSTR"
         elif self.connection_type == ConnectionTypes.GPIB:
-            resource_expr = f"GPIB{self.gpib_board_number}::{self.address}::INSTR"
+            gpib_board_number = 0 if self.gpib_board_number is None else self.gpib_board_number
+            resource_expr = f"GPIB{gpib_board_number}::{self.address}::INSTR"
         else:
             msg = (
                 f"{self.connection_type.value} is not a valid connection "

tests/samples/sample_devices.toml

@@ -2,6 +2,7 @@
 address = "MSO54-123456"
 connection_type = "TCPIP"
 device_type = "SCOPE"
+lan_device_name = "hislip0"
 
 [[devices]]
 address = "789.56.4.123"

tests/samples/sample_devices.yaml

@@ -3,6 +3,7 @@ devices:
   - address: MSO54-123456
     connection_type: TCPIP
     device_type: SCOPE
+    lan_device_name: hislip0
   - address: 789.56.4.123
     alias: foo
     connection_type: SOCKET

tests/test_config_parser.py

@@ -33,11 +33,14 @@ def test_nested_config_prefix_mapping() -> None:
 def test_environment_variable_config(capsys: pytest.CaptureFixture[str]) -> None:
     """Test the environment variable config method."""
     options = ["STANDALONE"]
-    expected_device_string = "address=MSO54-123456,connection_type=TCPIP,device_type=SCOPE"
+    expected_device_string = (
+        "address=MSO54-123456,connection_type=TCPIP,device_type=SCOPE,lan_device_name=hislip0"
+    )
     expected_device = DeviceConfigEntry(
         address="MSO54-123456",
         connection_type=ConnectionTypes.TCPIP,
         device_type=DeviceTypes.SCOPE,
+        lan_device_name="hislip0",
     )
     expected_entry = MappingProxyType({"SCOPE 1": expected_device})
 
@@ -207,6 +210,7 @@ def test_file_config_non_default_path(
             address="MSO54-123456",
             connection_type=ConnectionTypes.TCPIP,
             device_type=DeviceTypes.SCOPE,
+            lan_device_name="hislip0",
         ),
         "SCOPE 2": DeviceConfigEntry(
             address="789.56.4.123",