matlab-proxy 0.24.1__py3-none-any.whl → 0.24.2__py3-none-any.whl

matlab_proxy/settings.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import datetime
 import os
@@ -47,7 +47,7 @@ def get_process_startup_timeout():
             return int(custom_startup_timeout)
 
         else:
-            logger.warn(
+            logger.warning(
                 f"The value set for {mwi_env.get_env_name_process_startup_timeout()}:{custom_startup_timeout} is not a number. Using {constants.DEFAULT_PROCESS_START_TIMEOUT} as the default value"
             )
             return constants.DEFAULT_PROCESS_START_TIMEOUT
@@ -74,7 +74,7 @@ def get_matlab_executable_and_root_path():
         matlab_root_path = Path(custom_matlab_root_path)
 
         # Terminate process if invalid Custom Path was provided!
-        mwi.validators.validate_matlab_root_path(
+        matlab_root_path = mwi.validators.validate_matlab_root_path(
             matlab_root_path, is_custom_matlab_root=True
         )
 
@@ -101,10 +101,9 @@ def get_matlab_executable_and_root_path():
 
     # Control only gets here if custom matlab root was not set AND which matlab returned no results.
     # Note, error messages are formatted as multi-line strings and the front end displays them as is.
-    error_message = "Unable to find MATLAB on the system PATH. Add MATLAB to the system PATH, and restart matlab-proxy."
-
-    logger.error(error_message)
-    raise MatlabInstallError(error_message)
+    raise MatlabInstallError(
+        "Unable to find MATLAB on the system PATH. Add MATLAB to the system PATH, and restart matlab-proxy."
+    )
 
 
 def get_matlab_version(matlab_root_path):
@@ -126,7 +125,16 @@ def get_matlab_version(matlab_root_path):
     tree = ET.parse(version_info_file_path)
     root = tree.getroot()
 
-    return root.find("release").text
+    matlab_version = root.find("release").text
+
+    # If the matlab on system PATH is a wrapper script, then it would not be possible to determine MATLAB root (inturn not being able to determine MATLAB version)
+    # unless MWI_CUSTOM_MATLAB_ROOT is set. Raising only a warning as the matlab version is only required for communicating with MHLM.
+    if not matlab_version:
+        logger.warning(
+            f"Could not determine MATLAB version from MATLAB root path: {matlab_root_path}. Set {mwi_env.get_env_name_custom_matlab_root()} to a valid MATLAB root path"
+        )
+
+    return matlab_version
 
 
 def get_ws_env_settings():
@@ -270,15 +278,7 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
             logger.warning(warning)
             settings["warnings"].append(warning)
 
-        try:
-            # Update settings with matlab specific values.
-            settings.update(get_matlab_settings())
-        except UIVisibleFatalError as error:
-            logger.error(f"Exception raised during initialization: {error}")
-            settings["error"] = error
-            # Exceptions of this kind must propagate to the UI.
-            # Returning settings that have been created without exceptions
-            pass
+        settings.update(get_matlab_settings())
 
     return settings
 
@@ -362,84 +362,33 @@ def get_matlab_settings():
     Unless they are of type UIVisibleFatalError
     """
 
-    matlab_executable_path, matlab_root_path = get_matlab_executable_and_root_path()
-
     ws_env, ws_env_suffix = get_ws_env_settings()
+    mw_licensing_urls = _get_mw_licensing_urls(ws_env_suffix)
+    nlm_conn_str = _get_nlm_conn_str()
+    has_custom_code_to_execute, code_to_execute = _get_matlab_code_to_execute()
+    err = None
 
-    # MATLAB Proxy gives precedence to the licensing information conveyed
-    # by the user. If MLM_LICENSE_FILE is set, it should be prioritised over
-    # other ways of licensing. But existence of license_info.xml in matlab/licenses
-    # folder may cause hinderance in this workflow. So specifying -licmode as 'file'
-    # overrides license_info.xml and enforces MLM_LICENSE_FILE to be the topmost priority
-
-    # NLM Connection String provided by MLM_LICENSE_FILE environment variable
-    nlm_conn_str = mwi.validators.validate_mlm_license_file(
-        os.environ.get(mwi_env.get_env_name_network_license_manager())
-    )
-    matlab_lic_mode = ["-licmode", "file"] if nlm_conn_str else ""
-    # flag to hide MATLAB Window
-    flag_to_hide_desktop = ["-nodesktop"]
-    if system.is_windows():
-        flag_to_hide_desktop.extend(["-noDisplayDesktop", "-wait", "-log"])
+    try:
+        matlab_executable_path, matlab_root_path = get_matlab_executable_and_root_path()
 
-    matlab_code_dir = Path(__file__).resolve().parent / "matlab"
-    matlab_startup_file = str(matlab_code_dir / "startup.m")
-    matlab_code_file = str(matlab_code_dir / "evaluateUserMatlabCode.m")
+    except UIVisibleFatalError as error:
+        logger.error(f"Exception raised during initialization: {error}")
+        # Set matlab root and executable path to None as MATLAB root could not be determined
+        matlab_executable_path = matlab_root_path = None
+        err = error
 
     matlab_version = get_matlab_version(matlab_root_path)
-
-    # If the matlab on system PATH is a wrapper script, then it would not be possible to determine MATLAB root (inturn not being able to determine MATLAB version)
-    # unless MWI_CUSTOM_MATLAB_ROOT is set. Raising only a warning as the matlab version is only required for communicating with MHLM.
-    if not matlab_version:
-        logger.warn(
-            f"Could not determine MATLAB version from MATLAB root path: {matlab_root_path}"
-        )
-        logger.warn(
-            f"Set {mwi_env.get_env_name_custom_matlab_root()} to a valid MATLAB root path"
-        )
-
-    mpa_flags = (
-        mwi_env.Experimental.get_mpa_flags()
-        if mwi_env.Experimental.is_mpa_enabled()
-        else ""
-    )
-    profile_matlab_startup = (
-        "-timing" if mwi_env.Experimental.is_matlab_startup_profiling_enabled() else ""
-    )
-
-    has_custom_code_to_execute = (
-        len(os.getenv(mwi_env.get_env_name_custom_matlab_code(), "").strip()) > 0
-    )
-
-    # Sanitize file paths to avoid MATLAB not running the script due to early breakup of character array.
-    mp_code_to_execute = f"try; run('{_sanitize_file_path_for_matlab(matlab_startup_file)}'); catch MATLABProxyInitializationError; disp(MATLABProxyInitializationError.message); end;"
-    custom_code_to_execute = f"try; run('{_sanitize_file_path_for_matlab(matlab_code_file)}'); catch MATLABCustomStartupCodeError; disp(MATLABCustomStartupCodeError.message); end;"
-    code_to_execute = (
-        mp_code_to_execute + custom_code_to_execute
-        if has_custom_code_to_execute
-        else mp_code_to_execute
-    )
+    matlab_version_determined_on_startup = bool(matlab_version)
+    matlab_cmd = _get_matlab_cmd(matlab_executable_path, code_to_execute, nlm_conn_str)
 
     return {
-        "matlab_path": matlab_root_path,
+        "error": err,
         "matlab_version": matlab_version,
-        "matlab_version_determined_on_startup": True if matlab_version else False,
-        "matlab_cmd": [
-            matlab_executable_path,
-            "-nosplash",
-            *flag_to_hide_desktop,
-            "-softwareopengl",
-            # " v=mvm ",
-            *matlab_lic_mode,
-            *mpa_flags,
-            profile_matlab_startup,
-            "-r",
-            code_to_execute,
-        ],
+        "matlab_path": matlab_root_path,
+        "matlab_version_determined_on_startup": matlab_version_determined_on_startup,
+        "matlab_cmd": matlab_cmd,
         "ws_env": ws_env,
-        "mwa_api_endpoint": f"https://login{ws_env_suffix}.mathworks.com/authenticationws/service/v4",
-        "mhlm_api_endpoint": f"https://licensing{ws_env_suffix}.mathworks.com/mls/service/v1/entitlement/list",
-        "mwa_login": f"https://login{ws_env_suffix}.mathworks.com",
+        **mw_licensing_urls,
         "nlm_conn_str": nlm_conn_str,
         "has_custom_code_to_execute": has_custom_code_to_execute,
     }
@@ -646,3 +595,104 @@ def _sanitize_file_path_for_matlab(filepath: str) -> str:
     """
     filepath_with_single_quotes_escaped = filepath.replace("'", "''")
     return filepath_with_single_quotes_escaped
+
+
+def _get_matlab_code_to_execute():
+    """Returns the code that needs to run on MATLAB startup.
+    Will check for user provided custom MATLAB code and execute it along with the default startup script.
+
+    Returns:
+        tuple: With the first value representing whether there is custom MATLAB code to execute, and the second value representing the MATLAB code to execute.
+    """
+    matlab_code_dir = Path(__file__).resolve().parent / "matlab"
+    matlab_startup_file = str(matlab_code_dir / "startup.m")
+    matlab_code_file = str(matlab_code_dir / "evaluateUserMatlabCode.m")
+
+    has_custom_code_to_execute = (
+        len(os.getenv(mwi_env.get_env_name_custom_matlab_code(), "").strip()) > 0
+    )
+
+    # Sanitize file paths to avoid MATLAB not running the script due to early breakup of character array.
+    mp_code_to_execute = f"try; run('{_sanitize_file_path_for_matlab(matlab_startup_file)}'); catch MATLABProxyInitializationError; disp(MATLABProxyInitializationError.message); end;"
+    custom_code_to_execute = f"try; run('{_sanitize_file_path_for_matlab(matlab_code_file)}'); catch MATLABCustomStartupCodeError; disp(MATLABCustomStartupCodeError.message); end;"
+    code_to_execute = (
+        mp_code_to_execute + custom_code_to_execute
+        if has_custom_code_to_execute
+        else mp_code_to_execute
+    )
+
+    return has_custom_code_to_execute, code_to_execute
+
+
+def _get_nlm_conn_str():
+    """Get the Network License Manager (NLM) connection string.
+
+    Returns:
+        str: The NLM connection string provided by the MLM_LICENSE_FILE environment variable.
+    """
+    # NLM Connection String provided by MLM_LICENSE_FILE environment variable
+    nlm_conn_str = mwi.validators.validate_mlm_license_file(
+        os.environ.get(mwi_env.get_env_name_network_license_manager())
+    )
+
+    return nlm_conn_str
+
+
+def _get_mw_licensing_urls(ws_env_suffix):
+    """Get the MathWorks licensing URLs.
+
+    Args:
+        ws_env_suffix (str): The environment suffix for the licensing URLs.
+
+    Returns:
+        dict: A dictionary containing the MathWorks licensing URLs for authentication and entitlement.
+    """
+    return {
+        "mwa_api_endpoint": f"https://login{ws_env_suffix}.mathworks.com/authenticationws/service/v4",
+        "mhlm_api_endpoint": f"https://licensing{ws_env_suffix}.mathworks.com/mls/service/v1/entitlement/list",
+        "mwa_login": f"https://login{ws_env_suffix}.mathworks.com",
+    }
+
+
+def _get_matlab_cmd(matlab_executable_path, code_to_execute, nlm_conn_str):
+    """Construct the MATLAB command with appropriate flags and arguments.
+
+    Args:
+        matlab_executable_path (str): The path to the MATLAB executable.
+        code_to_execute (str): The MATLAB code to execute on startup.
+        nlm_conn_str (str): The Network License Manager connection string.
+
+    Returns:
+        list: A list of command-line arguments to launch MATLAB with the specified configuration.
+    """
+    if not matlab_executable_path:
+        return None
+
+    matlab_lic_mode = ["-licmode", "file"] if nlm_conn_str else ""
+    # flag to hide MATLAB Window
+    flag_to_hide_desktop = ["-nodesktop"]
+    if system.is_windows():
+        flag_to_hide_desktop.extend(["-noDisplayDesktop", "-wait", "-log"])
+
+    mpa_flags = (
+        mwi_env.Experimental.get_mpa_flags()
+        if mwi_env.Experimental.is_mpa_enabled()
+        else ""
+    )
+
+    profile_matlab_startup = (
+        "-timing" if mwi_env.Experimental.is_matlab_startup_profiling_enabled() else ""
+    )
+
+    return [
+        matlab_executable_path,
+        "-nosplash",
+        *flag_to_hide_desktop,
+        "-softwareopengl",
+        # " v=mvm ",
+        *matlab_lic_mode,
+        *mpa_flags,
+        profile_matlab_startup,
+        "-r",
+        code_to_execute,
+    ]

matlab_proxy/util/mwi/validators.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 """This file contains validators for various runtime artifacts.
 A validator is defined as a function which verifies the input and
 returns it unchanged if validation passes.
@@ -320,9 +320,10 @@ def validate_matlab_root_path(matlab_root: Path, is_custom_matlab_root: bool):
     Raises:
         MatlabInstallError
     """
-    warn_string = ""
-    if is_custom_matlab_root:
-        warn_string += f"""Edit the environment variable {mwi_env.get_env_name_custom_matlab_root()} to the correct path, and restart matlab-proxy."""
+
+    # When Custom MATLAB root is provided, validate the existence of the
+    # VersionInfo.xml file at the specified path else, its optional (for matlab wrapper usecase)
+    custom_matlab_root_warn_str = f"Edit the environment variable {mwi_env.get_env_name_custom_matlab_root()} to the correct path, and restart matlab-proxy. "
 
     try:
         __validate_if_paths_exist([matlab_root])
@@ -332,18 +333,25 @@ def validate_matlab_root_path(matlab_root: Path, is_custom_matlab_root: bool):
 
     except OSError as exc:
         logger.error(". ".join(exc.args))
-        raise MatlabInstallError(warn_string)
+        raise MatlabInstallError(
+            custom_matlab_root_warn_str if is_custom_matlab_root else ""
+        )
 
     version_info_file_path = matlab_root / VERSION_INFO_FILE_NAME
 
     if not version_info_file_path.is_file():
-        log_warn_string = (
-            warn_string + f"Unable to locate {VERSION_INFO_FILE_NAME} at {matlab_root}"
-        )
-        logger.warn(log_warn_string)
+        warn_str = f"Unable to locate {VERSION_INFO_FILE_NAME} at {matlab_root}"
+        # If VersionInfo.xml file is missing when a custom MATLAB root is provided, then
+        # raise an error with a detailed message
+        if is_custom_matlab_root:
+            log_error_string = custom_matlab_root_warn_str + warn_str
+            raise MatlabInstallError(log_error_string)
 
-        # Returning None as matlab_root could not be determined
-        return None
+        else:
+            # No VersionInfo.xml file is present and its not a custom MATLAB root, implies a matlab wrapper is
+            # being used, so warn the user and return None as MATLAB root could not be determined
+            logger.warning(warn_str)
+            return None
 
     return matlab_root
 

{matlab_proxy-0.24.1.dist-info → matlab_proxy-0.24.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: matlab-proxy
-Version: 0.24.1
+Version: 0.24.2
 Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
 Home-page: https://github.com/mathworks/matlab-proxy/
 Author: The MathWorks, Inc.
@@ -103,7 +103,7 @@ python -m pip install matlab-proxy
 ```
 
 ### Building From Sources
-Building from sources requires Node.js® version 16 or higher. [Click here to install Node.js](https://nodejs.org/en/)
+Building from sources requires Node.js® version 18 or higher. [Click here to install Node.js](https://nodejs.org/en/)
 
 ```bash
 git clone https://github.com/mathworks/matlab-proxy.git

{matlab_proxy-0.24.1.dist-info → matlab_proxy-0.24.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
 matlab_proxy/__init__.py,sha256=6cwi8buKCMtw9OeWaOYUHEoqwl5MyJ_s6GxgNuqPuNg,1673
 matlab_proxy/app.py,sha256=7BsHSM3PxTjN6eN10HLj74Y1wtu-Gl92g1RLbaTGz9U,34698
-matlab_proxy/app_state.py,sha256=KO2aczGbTnIMoXVqHJEriEyeapYHU_sDXifwA5U3kTw,72077
+matlab_proxy/app_state.py,sha256=e1AnmZ22gegzZ9N26Ha-IQR1ZhDukNC_LAQYP5k09Lc,72542
 matlab_proxy/constants.py,sha256=L9fhXdcGH7Eu56h0aB_TNm3d6aNFr2nP6-HyQJ96TAA,1175
 matlab_proxy/default_configuration.py,sha256=tBHaEq_bYsX2uC9pPA9mi_8M6o94ij-rxq8mbvcYpFc,1874
 matlab_proxy/devel.py,sha256=nR6XPVBUEdQ-RZGtYvX1YHTp8gj9cuw5Hp8ahasMBc8,14310
-matlab_proxy/settings.py,sha256=ni-9zNbWF3cy4v0X8vAwAiM5WcC8U_t3a-s7GXIkyBA,26723
+matlab_proxy/settings.py,sha256=-_r5JtUfuid6CUydRYTb_0rsAF4z2AzBqieAc65tQ8Y,28109
 matlab_proxy/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/favicon.ico,sha256=7w7Ki1uQP2Rgwc64dOV4-NrTu97I3WsZw8OvRSoY1A0,130876
-matlab_proxy/gui/index.html,sha256=6SxjZB0znU7vcLRnk4avZIzdOqlFBFt-zaNC8qhxIr0,720
+matlab_proxy/gui/index.html,sha256=R-jJ3X8sD0wD4OEsS6esTybLzO6l7jizBsMvwdvCDs8,720
 matlab_proxy/gui/manifest.json,sha256=NwDbrALM5auYyj2bbEf4aGwAUDqNl1FzMFQpPiG2Ty4,286
 matlab_proxy/gui/robots.txt,sha256=kNJLw79pisHhc3OVAimMzKcq3x9WT6sF9IS4xI0crdI,67
 matlab_proxy/gui/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/css/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/css/index.BSVLACuY.css,sha256=LzuRvV10Z0pF0ugGSnj5zKJvT4AHwwBbCd-wSH4mHjg,305333
 matlab_proxy/gui/static/js/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-matlab_proxy/gui/static/js/index.Cm14Eqsb.js,sha256=mcaB_Rp1rvj4mdHLEWC3s3dZhDKTBuYOFXSg8e-B68o,280210
+matlab_proxy/gui/static/js/index.c3NLxnRM.js,sha256=VsDAyIfCMENbdJIcG2416ttyvYg8rmSqI_ogax2bIio,280258
 matlab_proxy/gui/static/media/MATLAB-env-blur.NupTbPv_.png,sha256=QpmQTLDvBu2-b7ev83Rvpt0Q72R6wdQGkuJMPPpjv7M,220290
 matlab_proxy/gui/static/media/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/media/glyphicons-halflings-regular.BKjkU69z.woff,sha256=omOU9-3hAMoRjv8u2ghZYnWpg5uVnCJuFUOVV6WoB0I,23424
@@ -52,7 +52,7 @@ matlab_proxy/util/mwi/environment_variables.py,sha256=sOfmL8PjQONgkJdegdotLbsqHs
 matlab_proxy/util/mwi/exceptions.py,sha256=3jklFU6br2_pSSsATCRDY3A5fTzk6ekJ4M69sunwxBk,5114
 matlab_proxy/util/mwi/logger.py,sha256=GoisSphy3Jyi5-6-X0WRl1YkdrKx2xzjSxBN_w3oTU8,3802
 matlab_proxy/util/mwi/token_auth.py,sha256=UbIWqo7qADaZdijFvorLYsZbxzaB8TycGP8nk305ru0,9997
-matlab_proxy/util/mwi/validators.py,sha256=iXPR7b3jtnwx2i15YxKQgmOm2pt3ujJeMGYNxY0oGGw,12633
+matlab_proxy/util/mwi/validators.py,sha256=dg2OXL686vWie_JoTNpFSje2m_UqdpvpTVHJl5tmxSo,13247
 matlab_proxy/util/mwi/embedded_connector/__init__.py,sha256=Vfl2hNC7V1IwoK9_wrwfENs4BC8P-Mvvqh4BNGi2n48,119
 matlab_proxy/util/mwi/embedded_connector/helpers.py,sha256=kpIgJN0AqYLeX56UylWgB0t07fg8sh0RhIlUH_8JitM,3654
 matlab_proxy/util/mwi/embedded_connector/request.py,sha256=RXoVvrm5fibVb2A6EZnkMWwAQkYX3J5kqDTGQDZo9p0,4316
@@ -86,12 +86,12 @@ tests/integration/utils/licensing.py,sha256=rEBjvMXO8R3mL6KnePu2lojmOsjD4GXl9frf
 tests/unit/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
 tests/unit/conftest.py,sha256=FIL7bhw2-9B5OEspqt9toZ2ZlN18pOsPEFjeQmVNcSk,1916
 tests/unit/test_app.py,sha256=pM8zVyXWLx8nP8RePusXH4admEBYKc5JC8eE2t8xIQE,38487
-tests/unit/test_app_state.py,sha256=HuRs4ofCviS_N8Nj71_KkB3OrEf8aqHsA0SZlUreQPc,37110
+tests/unit/test_app_state.py,sha256=pIO3hvpddetf4xAdAum05gKfZ0TTS-LAEq-c57h_f40,37961
 tests/unit/test_constants.py,sha256=2nXxTmDP8utr8krsfZ4c_Bh4_mWPcDO5uI8MXeq4Usg,158
 tests/unit/test_ddux.py,sha256=a2J2iM8j_nnfJVuMI38p5AjwrRdoMj3N88gFgS2I4hg,713
 tests/unit/test_devel.py,sha256=A-1iVhSSwmywaW65QIRcUS2Fk7nJxceCcCm7CJtNdEc,7982
 tests/unit/test_non_dev_mode.py,sha256=0v27y27SLOWvw6jf_GhLLNg-RMsZS_OyGAnqoQYPpSA,5515
-tests/unit/test_settings.py,sha256=eBlV-ME_O8oLoOjJqqYTDTXJs-0smnM0oIMwHZEjUbo,17727
+tests/unit/test_settings.py,sha256=SsWLOzossGCjRr8555clsBvDI4Z0jPE4JVhjhx7Ovno,23722
 tests/unit/util/__init__.py,sha256=GInSQBb2SoVD5LZfmSCQa9-UZJT_UP-jNfrojkgCybU,87
 tests/unit/util/test_mw.py,sha256=YC4mjn6G6_XuHELt8uW9F6g2K0_fWtQl1R0kWFvWbAo,18565
 tests/unit/util/test_util.py,sha256=gecUFSVIg4a9s3Ljl0A7eSSY5jN4vH668CbjnTpi198,7431
@@ -100,15 +100,15 @@ tests/unit/util/mwi/test_custom_http_headers.py,sha256=UfrhclS0j6WhShtg1ki2oF1kK
 tests/unit/util/mwi/test_download.py,sha256=jYwPJFYGrPKqnkIJW42XYSe1fowmzChAkOx0k0xVldo,4779
 tests/unit/util/mwi/test_logger.py,sha256=S0Q5TirFxysrH2YSxRzGY9mWoWB83hG3q3XpGENCpcw,3150
 tests/unit/util/mwi/test_token_auth.py,sha256=-eBsaQ5JC7pyd9PXt48Rqs4cWjg6I-eOkp_gFVEwYhk,10538
-tests/unit/util/mwi/test_validators.py,sha256=lJy9rEXCULRrp9wxv9KXUjtlTFbchqTefxGLUg_n3S8,11452
+tests/unit/util/mwi/test_validators.py,sha256=GvLP3lSvoOQAjoclYunKPfxPIagUsnVGHRskHELResE,11765
 tests/unit/util/mwi/embedded_connector/__init__.py,sha256=pl5jqyCHEwZEviiL8OC-SHulb1rBecstQCFF6qVjL9Y,37
 tests/unit/util/mwi/embedded_connector/test_helpers.py,sha256=vYTWNUTuDeaygo16JGMTvWeI_CLOnvPkwNJmLndvJhE,890
 tests/unit/util/mwi/embedded_connector/test_request.py,sha256=PR-jddnXDEiip-lD7A_QSvRwEkwo3eQ8owZlk-r9vnk,1867
 tests/utils/__init__.py,sha256=ttzJ8xKWGxOJZz56qOiWOn6sp5LGomkZMn_w4KJLRMU,42
 tests/utils/logging_util.py,sha256=VBy_NRvwau3C_CVTBjK5RMROrQimnJYHO2U0aKSZiRw,2234
-matlab_proxy-0.24.1.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
-matlab_proxy-0.24.1.dist-info/METADATA,sha256=4MRz3xe4BjJtlDV-2KJ07wl-lP-QsE-o64F2u5FZk4U,10199
-matlab_proxy-0.24.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-matlab_proxy-0.24.1.dist-info/entry_points.txt,sha256=ZAlCUsgKzGcAeQaMZOq31FrTB5tQ8Ypq8Op_8U600-A,305
-matlab_proxy-0.24.1.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
-matlab_proxy-0.24.1.dist-info/RECORD,,
+matlab_proxy-0.24.2.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
+matlab_proxy-0.24.2.dist-info/METADATA,sha256=ysaPplN9gudFA9lO3lByAYn2Gm1p9TVJ_gruq8HPU6U,10199
+matlab_proxy-0.24.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+matlab_proxy-0.24.2.dist-info/entry_points.txt,sha256=ZAlCUsgKzGcAeQaMZOq31FrTB5tQ8Ypq8Op_8U600-A,305
+matlab_proxy-0.24.2.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
+matlab_proxy-0.24.2.dist-info/RECORD,,

tests/unit/test_app_state.py

@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 
 import asyncio
 import json
@@ -13,7 +13,11 @@ from matlab_proxy import settings
 from matlab_proxy import settings
 from matlab_proxy.app_state import AppState
 from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
-from matlab_proxy.util.mwi.exceptions import LicensingError, MatlabError
+from matlab_proxy.util.mwi.exceptions import (
+    LicensingError,
+    MatlabError,
+    MatlabInstallError,
+)
 from matlab_proxy.constants import (
     CONNECTOR_SECUREPORT_FILENAME,
     USER_CODE_OUTPUT_FILE_NAME,
@@ -611,6 +615,29 @@ async def test_start_matlab_without_xvfb(app_state_fixture, mocker):
     assert app_state_fixture.processes["matlab"] is mock_matlab
 
 
+async def test_start_matlab_without_xvfb_and_matlab(app_state_fixture):
+    """Test to check if MATLAB doesn't start and sets the error variable to MatlabInstallError when
+    there is not MATLAB on system PATH
+
+    Args:
+        app_state_fixture (AppState): Object of AppState class with defaults set
+    """
+    # Arrange
+    app_state_fixture.settings["is_xvfb_available"] = False
+    app_state_fixture.settings["matlab_cmd"] = None
+
+    # Act
+    await app_state_fixture.start_matlab()
+
+    # Assert
+    # Check if Xvfb has not started
+    assert app_state_fixture.processes["xvfb"] is None
+    # Check if Matlab has not started
+    assert app_state_fixture.processes["matlab"] is None
+    # Check if MatlabInstallError is set as the error
+    assert isinstance(app_state_fixture.error, MatlabInstallError)
+
+
 @pytest.mark.parametrize(
     "is_desktop, client_id, is_client_id_present, expected_is_active_client",
     [