From 90e6b3a6f18cd32e68efab8782481f1f13dbfe05 Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Thu, 2 Jan 2025 15:35:35 +0000 Subject: [PATCH 1/3] Fixes pyright system test --- src/genie_python/genie_advanced.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/genie_python/genie_advanced.py b/src/genie_python/genie_advanced.py index 194826c4..b90cbb63 100644 --- a/src/genie_python/genie_advanced.py +++ b/src/genie_python/genie_advanced.py @@ -328,6 +328,19 @@ def get_instrument() -> str | None: return __api.get_instrument() +@usercommand +@helparglist("") +@log_command_and_handle_exception +def get_instrument_full_name() -> str | None: + """ + Gets the full name of the local instrument + + Returns: + the full name of the machine + """ + return __api.get_instrument_full_name() + + @usercommand @helparglist("verbose") @log_command_and_handle_exception From 5f8eb0c34182b42c296b6283025e60db4488dc1e Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 3 Jan 2025 11:12:03 +0000 Subject: [PATCH 2/3] Defines get inst full name in sim mode --- src/genie_python/genie_simulate_impl.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/genie_python/genie_simulate_impl.py b/src/genie_python/genie_simulate_impl.py index a61000d8..60b3b52e 100644 --- a/src/genie_python/genie_simulate_impl.py +++ b/src/genie_python/genie_simulate_impl.py @@ -6,6 +6,7 @@ from builtins import object, str from collections import OrderedDict from typing import TYPE_CHECKING, Callable +import socket import numpy as np import numpy.typing as npt @@ -1263,3 +1264,6 @@ def get_alarm_from_block(self, block: str) -> str: def get_block_units(self, block: str) -> str: return "mm" + + def get_instrument_full_name(self) -> str: + return socket.gethostname() From 4ce12358e0a9b58eba5f987d4b7f2afff3b46200 Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 3 Jan 2025 11:14:13 +0000 Subject: [PATCH 3/3] ruff --- src/genie_python/genie_simulate_impl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/genie_python/genie_simulate_impl.py b/src/genie_python/genie_simulate_impl.py index 60b3b52e..4262f984 100644 --- a/src/genie_python/genie_simulate_impl.py +++ b/src/genie_python/genie_simulate_impl.py @@ -2,11 +2,11 @@ import inspect import os +import socket import xml.etree.ElementTree as ET from builtins import object, str from collections import OrderedDict from typing import TYPE_CHECKING, Callable -import socket import numpy as np import numpy.typing as npt @@ -1264,6 +1264,6 @@ def get_alarm_from_block(self, block: str) -> str: def get_block_units(self, block: str) -> str: return "mm" - + def get_instrument_full_name(self) -> str: return socket.gethostname()