matlab-proxy 0.5.3__py3-none-any.whl → 0.30.1__py3-none-any.whl

matlab_proxy/matlab/evaluateUserMatlabCode.m

@@ -0,0 +1,51 @@
+% Copyright 2024 The MathWorks, Inc.
+
+% Note:
+% Any extra variable we are creating begins with `mwiInternal` to prevent
+% potential conflicts with variables created by user code evaluated using evalc.
+% Since evalc("user code") is executed in the base workspace, it might create
+% variables that could overwrite our internal variables. To avoid polluting the
+% user's workspace when MATLAB starts, we ensure to clear any internal variable
+% that we create in the base workspace. We do not need to be concerned about
+% variables in the function's workspace.
+
+if ~isempty(getenv('MWI_MATLAB_STARTUP_SCRIPT')) && ~all(isspace(getenv('MWI_MATLAB_STARTUP_SCRIPT')))
+    try
+        % Evaluate the code from the environment variable and capture the output
+        mwiInternalResults = evalc(getenv('MWI_MATLAB_STARTUP_SCRIPT'));
+        % Write the results to the file
+        logOutputOrError(mwiInternalResults);
+        clear mwiInternalResults;
+    catch mwiInternalException
+        % Log the error message to the file
+        logOutputOrError(" ", mwiInternalException);
+        clear mwiInternalResults mwiInternalException;
+        error("Unable to run the startup code you specified. For details of the error, see the output file at " + fullfile(getenv('MATLAB_LOG_DIR'), "startup_code_output.txt"));
+    end
+
+end
+
+function logOutputOrError(userCodeResults, mwiInternalException)
+    %   Logs the results of the user code execution if successful, otherwise logs the
+    %   error information. It then closes the file handle.
+    %
+    %   Inputs:
+    %       userCodeResults       - String containing the output from the user code.
+    %       mwiInternalException  - (Optional) MException object containing error details.
+    filePath = fullfile(getenv('MATLAB_LOG_DIR'), "startup_code_output.txt");
+    [fileHandle, ~] = fopen(filePath, 'w');
+    if nargin < 2
+        % Log the successful output of the user code
+        fprintf(fileHandle, " ");
+        fprintf(fileHandle, userCodeResults);
+    else
+        % Log the error information
+        fprintf(fileHandle, 'An error occurred in the following code:\n');
+        fprintf(fileHandle, getenv('MWI_MATLAB_STARTUP_SCRIPT'));
+        fprintf(fileHandle, '\n\nMessage: %s\n', mwiInternalException.message);
+        fprintf(fileHandle, '\nError Identifier: %s\n', mwiInternalException.identifier);
+    end
+    % Close the file handle
+    fclose(fileHandle);
+end
+

matlab_proxy/matlab/startup.m

@@ -1,39 +1,14 @@
-% Copyright (c) 2020-2022 The MathWorks, Inc.
+% Copyright 2020-2025 The MathWorks, Inc.
 
-% Ensures figures are docked
-set(0,'DefaultFigureWindowStyle','docked')
-
-% Configure logged in user if possible
-if ~isempty(getenv('MW_LOGIN_USER_ID'))
-    user_id = getenv('MW_LOGIN_USER_ID');
-    first_name = getenv('MW_LOGIN_FIRST_NAME');
-    last_name = getenv('MW_LOGIN_LAST_NAME');
-    email_address = getenv('MW_LOGIN_EMAIL_ADDRESS');
-    profile_id = getenv('MW_LOGIN_PROFILE_ID');
-    display_name = getenv('MW_LOGIN_DISPLAY_NAME');
-
-    li = com.mathworks.matlab_login.MatlabLogin.isUserLoggedIn(2, 'DESKTOP');
-    token = li.getToken();
-    login_level = 2;
-    remember_me = true;
-    li = com.mathworks.matlab_login.MatlabLogin.saveCacheLoginInfo(first_name, ...
-        last_name, email_address, user_id, token, profile_id, login_level, ...
-        remember_me, email_address, display_name);
-    % Clear all local variables from users workspace.
-    clear li login_level user_id first_name last_name email_address profile_id display_name token remember_me
-end
-
-if (strlength(getenv('MWI_BASE_URL')) > 0)
-    connector.internal.setConfig('contextRoot', getenv('MWI_BASE_URL'));
-end
 evalc('connector.internal.Worker.start');
 
 % Add-on explorer is not supported in this environment.
 % The following settings instructs it to display appropriate error messages when used.
 matlab_settings = settings;
 if ~matlab_settings.matlab.addons.explorer.hasSetting('isExplorerSupported')
-    matlab_settings.matlab.addons.explorer.addSetting('isExplorerSupported');
+    matlab_settings.matlab.addons.explorer.addSetting('isExplorerSupported', 'PersonalValue', true);
 end
 matlab_settings.matlab.addons.explorer.isExplorerSupported.TemporaryValue = false;
 
 clear
+clc