add exception back for instlist

Author: rerpha

installation_and_upgrade/ibex_install_utils/ca_utils.py

@@ -124,14 +124,12 @@ def get_machine_details_from_identifier(
     # then find the first match where pvPrefix equals the machine identifier
     # that's been passed to this function if it is not found instrument_details will be None
     instrument_details = None
-    input_list = caget("CS:INSTLIST").tobytes().decode().rstrip('\x00')
-    if input_list is not None:
-        assert isinstance(input_list, str | bytes)
-        instrument_list = dehex_decompress_and_dejson(input_list)
+    try:
+        instrument_list = dehex_decompress_and_dejson(caget("CS:INSTLIST").tobytes().decode().rstrip('\x00'))
         instrument_details = next(
             (inst for inst in instrument_list if inst["pvPrefix"] == machine_identifier), None
         )
-    else:
+    except AttributeError:
         print(
             "Error getting instlist, \nContinuing execution..."
         )
@@ -212,7 +210,11 @@ def get_blocks(self):
         Returns:
             A collection of blocks, or None if the PV was not connected
         """
-        blocks_hexed = caget(f"{self.prefix}CS:BLOCKSERVER:BLOCKNAMES").tobytes()
+        try:
+            blocks_hexed = caget(f"{self.prefix}CS:BLOCKSERVER:BLOCKNAMES").tobytes()
+        except AttributeError as e:
+            print("Error getting blocks.")
+            raise e
         return literal_eval(FileUtils.dehex_and_decompress(blocks_hexed).decode())
 
     def cget(self, block: str) -> Any:

installation_and_upgrade/instrument_deploy.bat

@@ -81,6 +81,7 @@ if "%DETECT_OLD_GALIL%" == "YES" (
 
 REM stop_ibex_server calls config_env which means we have to reactivate our venv
 call "%~dp0_activate_venv.bat"
+call "%~dp0set_epics_ca_addr_list.bat"
 
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_main
 IF %errorlevel% neq 0 exit /b %errorlevel%
@@ -90,6 +91,7 @@ start /i /wait cmd /c "%START_IBEX%"
 
 REM start_ibex_server calls config_env which means we have to reactivate our venv
 call "%~dp0_activate_venv.bat"
+call "%~dp0set_epics_ca_addr_list.bat"
 
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_post_start
 call rmdir /s /q %UV_TEMP_VENV%

installation_and_upgrade/instrument_install.bat

@@ -8,7 +8,6 @@ if %errorlevel% neq 0 goto ERROR
 
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 
-call "%~dp0set_epics_ca_addr_list.bat"
 call "%~dp0install_or_update_uv.bat"
 call "%~dp0set_up_venv.bat"
 if %errorlevel% neq 0 goto ERROR
@@ -39,6 +38,7 @@ IF EXIST "C:\Instrument\Apps\EPICS" (start /wait cmd /c "%STOP_IBEX%")
 
 REM stop_ibex_server calls config_env which means we have to reactivate our venv
 call "%~dp0_activate_venv.bat"
+call "%~dp0set_epics_ca_addr_list.bat"
 
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_install
 if %errorlevel% neq 0 goto ERROR