feat: launching a specific version of Sherlock

doc/changelog.d/431.added.md

@@ -0,0 +1 @@
+feat: launching a specific version of Sherlock

src/ansys/sherlock/core/launcher.py

@@ -33,8 +33,13 @@
 
 
 def launch_sherlock(
-    host=LOCALHOST, port=SHERLOCK_DEFAULT_PORT, single_project_path="", sherlock_cmd_args=""
-):
+    host: str = LOCALHOST,
+    port: int = SHERLOCK_DEFAULT_PORT,
+    release_number: int = None,
+    single_project_path: str = "",
+    sherlock_cmd_args: str = "",
+    year: int = None,
+) -> Sherlock:
     r"""Launch Sherlock and start gRPC on a given host and port.
 
     Parameters
@@ -44,10 +49,16 @@
         is the IP address for the local host.
     port : int, optional
         Port number for the connection.
+    release_number : int, optional
+        Release number of Sherlock to launch. If not provided,
+        the latest installed version of Sherlock will be launched.
     single_project_path : str, optional
         Path to the Sherlock project if invoking Sherlock in the single-project mode.
     sherlock_cmd_args : str, optional
         Additional command arguments for launching Sherlock.
+    year : int, optional
+        Year of the Sherlock release to launch. If not provided,
+        the latest installed version of Sherlock will be launched.
 
     Returns
     -------
@@ -60,7 +71,7 @@
     >>> launcher.launch_sherlock()
 
     >>> from ansys.sherlock.core import launcher
-    >>> launcher.launch_sherlock(port=9092)
+    >>> launcher.launch_sherlock(port=9092, year=2024, release_number=1)
 
     >>> from ansys.sherlock.core import launcher
     >>> project = "C:\\Default Projects Directory\\ODB++ Tutorial"
@@ -74,7 +85,7 @@
         return None
 
     try:
-        args = [_get_sherlock_exe_path()]
+        args = [_get_sherlock_exe_path(year=year, release_number=release_number)]
         args.append("-grpcPort=" + str(port))
         if single_project_path != "":
             args.append("-singleProject")
@@ -132,13 +143,26 @@
     return SHERLOCK
 
 
-def _get_base_ansys():
+def _get_base_ansys(year=None, release_number=None):
     supported_installed_versions = {
         env_key: path
         for env_key, path in os.environ.items()
         if env_key.startswith("AWP_ROOT") and os.path.isdir(path)
     }
 
+    try:
+        if year and release_number:
+            year = _extract_sherlock_version_year(year)
+            version_key = f"AWP_ROOT{year}{release_number}"
+            if version_key in supported_installed_versions:
+                return supported_installed_versions[version_key]
+    except ValueError as e:
+        LOG.error(f"Error extracting Sherlock version year: {e}")
+
+        version_key = f"AWP_ROOT{year}{release_number}"
+        if version_key in supported_installed_versions:
+            return supported_installed_versions[version_key]
+
     for key in sorted(supported_installed_versions, reverse=True):
         ansys_version = _get_ansys_version_from_awp_root(key)
         if ansys_version >= EARLIEST_SUPPORTED_VERSION:
@@ -153,12 +177,18 @@
     return ""
 
 
-def _get_sherlock_exe_path():
-    ansys_base = _get_base_ansys()
+def _get_sherlock_exe_path(year=None, release_number=None):
+    ansys_base = _get_base_ansys(year=year, release_number=release_number)
     if not ansys_base:
         return ""
     if os.name == "nt":
         sherlock_bin = os.path.join(ansys_base, "sherlock", "SherlockClient.exe")
     else:
         sherlock_bin = os.path.join(ansys_base, "sherlock", "runSherlock")
     return sherlock_bin
+
+
+def _extract_sherlock_version_year(year):
+    if 1000 <= year <= 9999:
+        return year % 100
+    raise ValueError("Year must be a 4-digit integer.")

tests/test_launcher.py

@@ -34,6 +34,32 @@ def test_get_sherlock_exe_path(self, mock_get_base_ansys):
             launcher._get_sherlock_exe_path(),
         )
 
+    def test_extract_sherlock_version_year_with_two_digits(self):
+        with self.assertRaises(ValueError) as context:
+            launcher._extract_sherlock_version_year(24)
+        self.assertEqual(str(context.exception), "Year must be a 4-digit integer.")
+
+    def test_extract_sherlock_version_year_with_four_digits(self):
+        self.assertEqual(24, launcher._extract_sherlock_version_year(2024))
+
+    @patch.dict(
+        os.environ,
+        {
+            "AWP_ROOT241": "C:\\Program Files\\ANSYS Inc\\v241",
+            "AWP_ROOT232": "C:\\Program Files\\ANSYS Inc\\v232",
+        },
+        clear=True,
+    )
+    @patch("os.path.isdir")
+    @patch("ansys.sherlock.core.launcher._extract_sherlock_version_year")
+    def test_get_base_ansys_calls_extract_sherlock_version_year(
+        self, mock_extract_year, mock_os_path_isdir
+    ):
+        mock_os_path_isdir.return_value = True
+        mock_extract_year.return_value = 24
+        launcher._get_base_ansys(year=2024, release_number=1)
+        mock_extract_year.assert_called_once_with(2024)
+
 
 if __name__ == "__main__":
     unittest.main()