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

matlab_proxy/app.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 import asyncio
 import json
@@ -197,8 +197,6 @@ async def get_env_config(req):
     state = req.app["state"]
     config = state.settings["env_config"]
 
-    config["useMOS"] = mwi_env.Experimental.should_use_mos_html()
-    config["useMRE"] = mwi_env.Experimental.should_use_mre_html()
     config["isConcurrencyEnabled"] = IS_CONCURRENCY_CHECK_ENABLED
     # In a previously authenticated session, if the url is accessed without the token(using session cookie), send the token as well.
     config["authentication"] = {

matlab_proxy/app_state.py

@@ -10,15 +10,15 @@ import time
 import uuid
 from collections import deque
 from datetime import datetime, timedelta, timezone
-from typing import Final, Optional, Callable
+from typing import Callable, Final, Optional
 
 from matlab_proxy import util
 from matlab_proxy.constants import (
+    CHECK_MATLAB_STATUS_INTERVAL_SECONDS,
     CONNECTOR_SECUREPORT_FILENAME,
     IS_CONCURRENCY_CHECK_ENABLED,
     MATLAB_LOGS_FILE_NAME,
     USER_CODE_OUTPUT_FILE_NAME,
-    CHECK_MATLAB_STATUS_INTERVAL_SECONDS,
 )
 from matlab_proxy.settings import get_process_startup_timeout
 from matlab_proxy.util import mw, mwi, system, windows
@@ -30,10 +30,11 @@ from matlab_proxy.util.mwi.exceptions import (
     FatalError,
     LicensingError,
     MatlabError,
+    MatlabInstallError,
     OnlineLicensingError,
     UIVisibleFatalError,
     XvfbError,
-    LockAcquisitionError,
+    WindowManagerError,
     log_error,
 )
 
@@ -90,10 +91,6 @@ class AppState:
         self.error = settings["error"]
         self.warnings = settings["warnings"]
 
-        if self.error is not None:
-            self.logs["matlab"].clear()
-            return
-
         # Keep track of when the Embedded connector starts.
         # Would be initialized appropriately by get_embedded_connector_state() task.
         self.embedded_connector_start_time = None
@@ -552,7 +549,7 @@ class AppState:
 
         if system.is_linux():
             # If Xvfb is on system PATH, check if it up and running.
-            if self.settings["is_xvfb_available"] and (
+            if self.settings.get("is_xvfb_available", None) and (
                 xvfb_process is None or xvfb_process.returncode is not None
             ):
                 logger.debug(
@@ -998,17 +995,11 @@ class AppState:
         # The mwi_logs_dir is where MATLAB will write any subsequent logs
         matlab_env["MATLAB_LOG_DIR"] = str(self.mwi_logs_dir)
 
-        # Set MW_CONNECTOR_CONTEXT_ROOT for MPA
-        if mwi_env.Experimental.is_mpa_enabled():
-            matlab_env["MW_CONNECTOR_CONTEXT_ROOT"] = self.settings.get("base_url", "/")
-            logger.info(
-                f"MW_CONNECTOR_CONTEXT_ROOT is set to: {matlab_env['MW_CONNECTOR_CONTEXT_ROOT']}"
-            )
-
-        # Setup Simulink Online which requires a pre-warm stage
-        if mwi_env.Experimental.is_simulink_enabled():
-            logger.info("Enabling usage of Simulink Online...")
-            matlab_env["PREWARM_SIMULINK"] = "true"
+        # Set MW_CONNECTOR_CONTEXT_ROOT
+        matlab_env["MW_CONNECTOR_CONTEXT_ROOT"] = self.settings.get("base_url", "/")
+        logger.info(
+            f"MW_CONNECTOR_CONTEXT_ROOT is set to: {matlab_env['MW_CONNECTOR_CONTEXT_ROOT']}"
+        )
 
         # Env setup related to logging
         # Very verbose logging in debug mode
@@ -1057,6 +1048,31 @@ class AppState:
             key: value for key, value in env_vars.items() if not key.startswith(prefix)
         }
 
+    async def __start_window_manager(self, display=None):
+        if display is None:
+            logger.info("Not starting fluxbox as display is not provided")
+            return None
+
+        wm_env = os.environ.copy()
+        wm_env["DISPLAY"] = display
+        wm_cmd = ["fluxbox", "-screen", "0", "-log", "/dev/null"]
+
+        try:
+            logger.info(f"Starting window manager with DISPLAY={wm_env['DISPLAY']}")
+            return await asyncio.create_subprocess_exec(
+                *wm_cmd, close_fds=False, env=wm_env, stderr=asyncio.subprocess.PIPE
+            )
+
+        except Exception as err:
+            self.error = WindowManagerError(
+                "Unable to start the Fluxbox Window Manager due to the following error: "
+                + err
+            )
+            # Log the error on the console.
+            log_error(logger, self.error)
+
+        return None
+
     async def __start_xvfb_process(self):
         """Private method to start the xvfb process. Will set appropriate
         errors to self.error and return None when any exceptions are raised.
@@ -1078,7 +1094,7 @@ class AppState:
             )
             self.settings["matlab_display"] = ":" + str(display_port)
 
-            logger.debug(f"Started Xvfb with PID={xvfb.pid} on DISPLAY={display_port}")
+            logger.info(f"Started Xvfb with PID={xvfb.pid} on DISPLAY={display_port}")
 
             return xvfb
 
@@ -1109,6 +1125,12 @@ class AppState:
         Returns:
             (asyncio.subprocess.Process | psutil.Process): If process creation is successful, else return None.
         """
+        # If there's no matlab_cmd available, it means that MATLAB is not available on system PATH.
+        if not self.settings["matlab_cmd"]:
+            raise MatlabInstallError(
+                "Unable to find MATLAB on the system PATH. Add MATLAB to the system PATH, and restart matlab-proxy."
+            )
+
         if system.is_posix():
             import pty
 
@@ -1302,7 +1324,13 @@ class AppState:
 
             self.processes["xvfb"] = xvfb
 
+        # Start Window Manager on linux if possible
+        if system.is_linux() and self.settings["is_windowmanager_available"]:
+            display = self.settings.get("matlab_display", None)
+            await self.__start_window_manager(display)
+
         try:
+
             # Prepare ready file for the MATLAB process.
             self.create_logs_dir_for_MATLAB()
 
@@ -1328,7 +1356,14 @@ class AppState:
         # Start MATLAB Process
         logger.debug("Starting MATLAB")
 
-        matlab = await self.__start_matlab_process(matlab_env)
+        try:
+            matlab = await self.__start_matlab_process(matlab_env)
+
+        # If there's an error with starting MATLAB, set the error to the state and matlab to None
+        except MatlabInstallError as err:
+            log_error(logger, err)
+            self.error = err
+            matlab = None
 
         # Release the lock after MATLAB process has started.
         await self.matlab_state_updater_lock.release()

matlab_proxy/constants.py

@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The MathWorks, Inc.
+# Copyright 2023-2025 The MathWorks, Inc.
 from typing import Final, List
 
 """This module defines project-level constants"""
@@ -24,6 +24,7 @@ SUPPORTED_MATLAB_VERSIONS: Final[List[str]] = [
     "R2023b",
     "R2024a",
     "R2024b",
+    "R2025a",
 ]
 
 # This constant when set to True restricts the number of active sessions to one

matlab_proxy/gui/index.html

@@ -11,7 +11,7 @@
     <meta name="internal_mw_identifier" content="MWI_MATLAB_PROXY_IDENTIFIER" />
     <link rel="manifest" href="./manifest.json" />
     <title>MATLAB</title>
-    <script type="module" crossorigin src="./static/js/index.Cm14Eqsb.js"></script>
+    <script type="module" crossorigin src="./static/js/index.qK3VCGVb.js"></script>
     <link rel="stylesheet" crossorigin href="./static/css/index.BSVLACuY.css">
   </head>
   <body>