refactor: Separate out the custom handling of different devices' soft…

…ware/firmware version parsing (#373)

src/tm_devices/driver_mixins/device_control/pi_control.py

@@ -149,10 +149,7 @@ def sw_version(self) -> Version:
         sw_version = id_string_parts[-1]
         if ":" in id_string_parts[-1]:
             sw_version = id_string_parts[-1].rsplit(":", 1)[-1]
-        if "-" in sw_version:
-            split_sw = sw_version.split("-")
-            retval = get_version(split_sw[0])
-        elif " " in sw_version.lstrip():
+        if " " in sw_version.lstrip():
             split_sw = sw_version.split(" ")
             retval = get_version(split_sw[0])
         else:

src/tm_devices/drivers/power_supplies/psu22xx/psu2230.py

@@ -1,6 +1,10 @@
 """PSU2230 device driver."""
 
+from packaging.version import Version
+
 from tm_devices.drivers.power_supplies.psu22xx.psu2200 import PSU2200
+from tm_devices.helpers import get_version
+from tm_devices.helpers import ReadOnlyCachedProperty as cached_property  # noqa: N813
 
 
 class PSU2230(PSU2200):
@@ -9,3 +13,13 @@ class PSU2230(PSU2200):
     ################################################################################################
     # Magic Methods
     ################################################################################################
+
+    ################################################################################################
+    # Cached Properties
+    ################################################################################################
+    @cached_property
+    def sw_version(self) -> Version:
+        """Return the software version of the device."""
+        id_string_parts = self.idn_string.split(",")
+        sw_version = id_string_parts[-1].split("-")[0]
+        return get_version(sw_version)

src/tm_devices/helpers/functions.py

@@ -162,6 +162,8 @@
 # For this reason, the regex string itself is stored in a separate, private constant.
 _SUPPORTED_MODEL_REGEX_MAPPING = re.compile(__SUPPORTED_MODEL_REGEX_STRING)
 
+_VALID_VERSION_REGEX = re.compile(r"^\d+\.\d+(\.\d+)*$")
+
 
 ####################################################################################################
 # Public Functions
@@ -537,6 +539,10 @@ def get_version(version_string: str) -> Version:
             version = Version(
                 version_string.replace("." + version_parts[-1], "+" + version_parts[-1])
             )
+        elif version_string.count("-") == 1 and _VALID_VERSION_REGEX.match(
+            version_string.split("-")[0]
+        ):
+            version = Version(version_string.replace("-", "+"))
         else:
             output_str = ""
             for char in version_parts[-1]:

tests/test_helpers.py

@@ -409,6 +409,9 @@ def test_detect_visa_resource_expression(
         ("1.2.3.4abc", Version("1.2.3.4+abc")),
         ("1.20.345.abc", Version("1.20.345+abc")),
         ("1.20.345.4abc123", Version("1.20.345.4+abc123")),
+        ("1.2.3-alpha.4", Version("1.2.3.alpha.4")),
+        ("1.2.3-custom.52", Version("1.2.3+custom.52")),
+        ("1.2.3-123custom.52", Version("1.2.3+123custom.52")),
     ],
 )
 def test_get_version(version_string: str, expected_result: Version) -> None:
@@ -422,6 +425,8 @@ def test_get_version_error() -> None:
         get_version("1a.2.3.abc")
     with pytest.raises(InvalidVersion):
         get_version("invalid-version")
+    with pytest.raises(InvalidVersion):
+        get_version("1.2.3-invalid-version.1234")
 
 
 def test_read_only_cached_property() -> None: