matlab-proxy 0.10.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of matlab-proxy might be problematic. Click here for more details.

Files changed (19) hide show
  1. matlab_proxy/app.py +75 -22
  2. matlab_proxy/app_state.py +74 -53
  3. matlab_proxy/constants.py +15 -2
  4. matlab_proxy/gui/asset-manifest.json +6 -6
  5. matlab_proxy/gui/index.html +1 -1
  6. matlab_proxy/gui/static/css/{main.aa888962.css → main.47712126.css} +2 -2
  7. matlab_proxy/gui/static/css/{main.aa888962.css.map → main.47712126.css.map} +1 -1
  8. matlab_proxy/gui/static/js/{main.fbc5c728.js → main.ea1ebdce.js} +3 -3
  9. matlab_proxy/gui/static/js/main.ea1ebdce.js.map +1 -0
  10. matlab_proxy/matlab/startup.m +2 -2
  11. matlab_proxy/settings.py +17 -8
  12. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/METADATA +3 -2
  13. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/RECORD +18 -18
  14. matlab_proxy/gui/static/js/main.fbc5c728.js.map +0 -1
  15. /matlab_proxy/gui/static/js/{main.fbc5c728.js.LICENSE.txt → main.ea1ebdce.js.LICENSE.txt} +0 -0
  16. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/LICENSE.md +0 -0
  17. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/WHEEL +0 -0
  18. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/entry_points.txt +0 -0
  19. {matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/top_level.txt +0 -0
matlab_proxy/matlab/startup.m CHANGED
@@ -1,4 +1,4 @@
1
- % Copyright (c) 2020-2022 The MathWorks, Inc.
1
+ % Copyright (c) 2020-2023 The MathWorks, Inc.
2
2
 
3
3
  % Configure logged in user if possible
4
4
  if ~isempty(getenv('MW_LOGIN_USER_ID'))
@@ -29,7 +29,7 @@ evalc('connector.internal.Worker.start');
29
29
  % The following settings instructs it to display appropriate error messages when used.
30
30
  matlab_settings = settings;
31
31
  if ~matlab_settings.matlab.addons.explorer.hasSetting('isExplorerSupported')
32
- matlab_settings.matlab.addons.explorer.addSetting('isExplorerSupported');
32
+ matlab_settings.matlab.addons.explorer.addSetting('isExplorerSupported', 'PersonalValue', true);
33
33
  end
34
34
  matlab_settings.matlab.addons.explorer.isExplorerSupported.TemporaryValue = false;
35
35
 
matlab_proxy/settings.py CHANGED
@@ -1,6 +1,5 @@
1
- # Copyright 2020-2023 The MathWorks, Inc.
1
+ # Copyright 2020-2024 The MathWorks, Inc.
2
2
 
3
- from pathlib import Path
4
3
  import os
5
4
  import shutil
6
5
  import socket
@@ -8,6 +7,7 @@ import ssl
8
7
  import tempfile
9
8
  import uuid
10
9
  import xml.etree.ElementTree as ET
10
+ from pathlib import Path
11
11
 
12
12
  import matlab_proxy
13
13
  from matlab_proxy import constants
@@ -199,6 +199,8 @@ def get_dev_settings(config):
199
199
  "mwi_use_existing_license": mwi.validators.validate_use_existing_licensing(
200
200
  os.getenv(mwi_env.get_env_name_mwi_use_existing_license(), "")
201
201
  ),
202
+ "warnings": [],
203
+ "is_xvfb_available": False,
202
204
  }
203
205
 
204
206
 
@@ -243,13 +245,21 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
243
245
  settings["nlm_conn_str"] = "123@nlm"
244
246
 
245
247
  else:
246
- settings = {"error": None}
248
+ settings = {"error": None, "warnings": []}
247
249
 
248
250
  # Initializing server settings separately allows us to return
249
251
  # a minimal set of settings required to launch the server even if
250
252
  # there is an exception thrown when creating the matlab specific settings.
251
253
  settings.update(get_server_settings(config_name))
252
254
 
255
+ settings["is_xvfb_available"] = True if shutil.which("Xvfb") else False
256
+
257
+ # Warn user if xvfb is not available on system path.
258
+ if system.is_linux() and not settings["is_xvfb_available"]:
259
+ warning = " Unable to find Xvfb on the system PATH. Xvfb enables graphical abilities like plots and figures in the MATLAB desktop.\nConsider adding Xvfb to the system PATH and restart matlab-proxy. See https://github.com/mathworks/matlab-proxy#requirements for information."
260
+ logger.warning(warning)
261
+ settings["warnings"].append(warning)
262
+
253
263
  try:
254
264
  # Update settings with matlab specific values.
255
265
  settings.update(get_matlab_settings())
@@ -350,11 +360,9 @@ def get_matlab_settings():
350
360
  )
351
361
  matlab_lic_mode = ["-licmode", "file"] if nlm_conn_str else ""
352
362
  # flag to hide MATLAB Window
353
- flag_to_hide_desktop = (
354
- ["-noDisplayDesktop", "-wait", "-log"]
355
- if system.is_windows()
356
- else ["-nodesktop"]
357
- )
363
+ flag_to_hide_desktop = ["-nodesktop"]
364
+ if system.is_windows():
365
+ flag_to_hide_desktop.extend(["-noDisplayDesktop", "-wait", "-log"])
358
366
  matlab_startup_file = str(Path(__file__).resolve().parent / "matlab" / "startup.m")
359
367
 
360
368
  matlab_version = get_matlab_version(matlab_root_path)
@@ -380,6 +388,7 @@ def get_matlab_settings():
380
388
  return {
381
389
  "matlab_path": matlab_root_path,
382
390
  "matlab_version": matlab_version,
391
+ "matlab_version_determined_on_startup": True if matlab_version else False,
383
392
  "matlab_cmd": [
384
393
  matlab_executable_path,
385
394
  "-nosplash",
{matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: matlab-proxy
3
- Version: 0.10.1
3
+ Version: 0.12.0
4
4
  Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
5
5
  Home-page: https://github.com/mathworks/matlab-proxy/
6
6
  Author: The MathWorks, Inc.
@@ -82,9 +82,10 @@ The MATLAB Proxy is under active development. For support or to report issues, s
82
82
 
83
83
  $ sudo yum install xorg-x11-server-Xvfb
84
84
  ```
85
+
86
+ *Note: The installation of Xvfb is **optional** (w.e.f. v0.11.0 of matlab-proxy). However, we highly recommend installing it.*
85
87
  * Python versions: **3.8** | **3.9** | **3.10** | **3.11**
86
88
  * [Browser Requirements](https://www.mathworks.com/support/requirements/browser-requirements.html)
87
-
88
89
  * Supported Operating Systems:
89
90
  * Linux®
90
91
  * Windows® Operating System ( starting v0.4.0 of matlab-proxy )
{matlab_proxy-0.10.1.dist-info → matlab_proxy-0.12.0.dist-info}/RECORD RENAMED
@@ -1,24 +1,24 @@
1
1
  matlab_proxy/__init__.py,sha256=6cwi8buKCMtw9OeWaOYUHEoqwl5MyJ_s6GxgNuqPuNg,1673
2
- matlab_proxy/app.py,sha256=pMLiSfUbes04boTqjmmV2OZrzTmIJA5wtn5mK8jQAnY,28681
3
- matlab_proxy/app_state.py,sha256=OXk7-SR83CSn-BlZflu679TwuPDjviA6Vta5FvZqEF0,54552
4
- matlab_proxy/constants.py,sha256=mtIZmO8MVbKoHqu0jTDB0R3c8tNw_2csm4dM0vNRDIE,620
2
+ matlab_proxy/app.py,sha256=hvZCP97xQ_XLlKZ_MUuL79gm7zsVUfXQkxmU8uL2P1M,31027
3
+ matlab_proxy/app_state.py,sha256=kDAS4QxFuft-yWxApO7NE66mehKuN5makbG66PrT0PU,55381
4
+ matlab_proxy/constants.py,sha256=GTuIP6ibk1HcoxVihBRcy7SOfoQdb4hy0vhj2nH99sc,910
5
5
  matlab_proxy/default_configuration.py,sha256=DxQaHzAivzstiPl_nDfxs8SOyP9oaK9v3RP4LtroJl4,843
6
6
  matlab_proxy/devel.py,sha256=nR6XPVBUEdQ-RZGtYvX1YHTp8gj9cuw5Hp8ahasMBc8,14310
7
- matlab_proxy/settings.py,sha256=FyctpBa9SaQEnItfFi6gF4SZ_d2Qm1ojonGug4bwRt4,19738
7
+ matlab_proxy/settings.py,sha256=0LH5JwJ2kPRAEXlxEdjE7YJaMU4QN81T2XLjvQ9YNu0,20485
8
8
  matlab_proxy/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
- matlab_proxy/gui/asset-manifest.json,sha256=ULnp89obzlSF90igCa2cFhgmBTKJwe4WOeBhrlydUjs,3516
9
+ matlab_proxy/gui/asset-manifest.json,sha256=nmNapqqun_wMXxqO_n1ysscwbwnpX1_vrQEKamgcOqI,3516
10
10
  matlab_proxy/gui/favicon.ico,sha256=7w7Ki1uQP2Rgwc64dOV4-NrTu97I3WsZw8OvRSoY1A0,130876
11
- matlab_proxy/gui/index.html,sha256=PGUXqpG-bX2JI35hPaOsauUR6y1z84AQJPQTkRwI-ik,637
11
+ matlab_proxy/gui/index.html,sha256=rOgCK7HGnf8hdU3gven3nl556ck7Ieiv4D0l7OS8t-0,637
12
12
  matlab_proxy/gui/manifest.json,sha256=NwDbrALM5auYyj2bbEf4aGwAUDqNl1FzMFQpPiG2Ty4,286
13
13
  matlab_proxy/gui/robots.txt,sha256=kNJLw79pisHhc3OVAimMzKcq3x9WT6sF9IS4xI0crdI,67
14
14
  matlab_proxy/gui/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  matlab_proxy/gui/static/css/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
- matlab_proxy/gui/static/css/main.aa888962.css,sha256=pIXlQZlx2Xn0N5a7Wvh9UBBrKOZr0DOr9eEzmEAbAeM,274104
17
- matlab_proxy/gui/static/css/main.aa888962.css.map,sha256=8he7DI95fPkvfLbdbx77QEcqFjuNBz4YpX3HDzFNNGw,350274
16
+ matlab_proxy/gui/static/css/main.47712126.css,sha256=OT5ccyC0a6fVg956C-8b6uDVbZZVgcpXbHjdO6v4ZBI,274313
17
+ matlab_proxy/gui/static/css/main.47712126.css.map,sha256=RdfmXfQvzvvh4XZuDWShm8CD8pA2Gb2K6MtMzrgJyKM,350495
18
18
  matlab_proxy/gui/static/js/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
19
- matlab_proxy/gui/static/js/main.fbc5c728.js,sha256=CTUnx095f0hFy9BKYU_IokVIRoIrNwu3BFVfWNzpmLo,288746
20
- matlab_proxy/gui/static/js/main.fbc5c728.js.LICENSE.txt,sha256=3cj3DrwM51esz1ogL9VVU1ZyXyXJ6u-Ec2CI9CCcI_A,1689
21
- matlab_proxy/gui/static/js/main.fbc5c728.js.map,sha256=6JF-lxxluIkr1Cc8Teyf9SUzFfKBup1IV13KFuuxGac,913905
19
+ matlab_proxy/gui/static/js/main.ea1ebdce.js,sha256=W4WI9Vy7-XuaKiSqfxijCHjCBOlVdN77foIrCWzEEe8,294036
20
+ matlab_proxy/gui/static/js/main.ea1ebdce.js.LICENSE.txt,sha256=3cj3DrwM51esz1ogL9VVU1ZyXyXJ6u-Ec2CI9CCcI_A,1689
21
+ matlab_proxy/gui/static/js/main.ea1ebdce.js.map,sha256=HWQn01YWh5YXmhmVbDEKwwRCX7fMFmPdthNg5QNjLf0,934124
22
22
  matlab_proxy/gui/static/media/MATLAB-env-blur.4fc94edbc82d3184e5cb.png,sha256=QpmQTLDvBu2-b7ev83Rvpt0Q72R6wdQGkuJMPPpjv7M,220290
23
23
  matlab_proxy/gui/static/media/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
24
24
  matlab_proxy/gui/static/media/arrow.0c2968b90bd9a64c8c3f.svg,sha256=XtmvDWzGZnwCZm08TKBnqt5hc1wphJnNupG0Fx_faAY,327
@@ -52,7 +52,7 @@ matlab_proxy/gui/static/media/terminate.7ea1363ee0fa72344ef6.svg,sha256=LDLYNWk_
52
52
  matlab_proxy/gui/static/media/trigger-error.3f1c4ef23ab8f3e60b0e.svg,sha256=3zzT0uTrl4M_HlAjjVy_9F6fJDY9TifdQCFYX36LCOY,5017
53
53
  matlab_proxy/gui/static/media/trigger-ok.7b9c238be42f685c4fa7.svg,sha256=mD-7N9cc4ARdMBFcplnogJv6nA4Yh3jQuYbZDUi18LU,4997
54
54
  matlab_proxy/icons/matlab.svg,sha256=xh5uYebQd8I-ISvenjU9A-PkClzW_lU9wvm3doXOFKM,13366
55
- matlab_proxy/matlab/startup.m,sha256=SFExQrMeSpbV6s-tQQxePavTZZlmkfYfxh2J8VQW08s,1535
55
+ matlab_proxy/matlab/startup.m,sha256=YRtI8P2flDJSDcPxJ2008B2l1T9JpqiUbzhQxA0frbc,1558
56
56
  matlab_proxy/util/__init__.py,sha256=7Qz_HwhNXDFMgO4DVQK1fwlc83TJ671mfzb3w6cLqRA,7714
57
57
  matlab_proxy/util/event_loop.py,sha256=Zqd282jlvPHHyc4kg8IjIzlzh9zLM_SAc5xjqUOrm04,1144
58
58
  matlab_proxy/util/list_servers.py,sha256=M93coVZjyQCdIvCCxsNOU_XDWNjBSysOJ5tWXaTjP8Y,1369
@@ -69,9 +69,9 @@ matlab_proxy/util/mwi/validators.py,sha256=Do0w8pjzCpYg9EiWqUtDojnBw8iwqkMR7K3ZQ
69
69
  matlab_proxy/util/mwi/embedded_connector/__init__.py,sha256=SVSckEJ4zQQ2KkNPT_un8ndMAImcMOTrai7ShAbmFY4,114
70
70
  matlab_proxy/util/mwi/embedded_connector/helpers.py,sha256=SfrwpCnZ6QGJBko-sR2bIG4-_qZOn29zCZV9qwVBnkM,3395
71
71
  matlab_proxy/util/mwi/embedded_connector/request.py,sha256=0NyfnE7-0g3BBPTPmjbkDrTOGiTNqFDrqKDObcRc2Jw,3716
72
- matlab_proxy-0.10.1.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
73
- matlab_proxy-0.10.1.dist-info/METADATA,sha256=cgDn7iW9yn-jCdRhfdspK5Ne7Xj1NM3aZIMBFJNXs-k,9780
74
- matlab_proxy-0.10.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
75
- matlab_proxy-0.10.1.dist-info/entry_points.txt,sha256=DbBLYgnRt8UGiOpd0zHigRTyyMdZYhMdvCvSYP7wPN0,244
76
- matlab_proxy-0.10.1.dist-info/top_level.txt,sha256=3-Lxje1LZvSfK__TVoRksU4th_PCj6cMMJwhH8P0_3I,13
77
- matlab_proxy-0.10.1.dist-info/RECORD,,
72
+ matlab_proxy-0.12.0.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
73
+ matlab_proxy-0.12.0.dist-info/METADATA,sha256=SABX3xJX8d-X-eQxe7G_VFP-5XCdBYIdLc1M6DZ-MpQ,9909
74
+ matlab_proxy-0.12.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
75
+ matlab_proxy-0.12.0.dist-info/entry_points.txt,sha256=DbBLYgnRt8UGiOpd0zHigRTyyMdZYhMdvCvSYP7wPN0,244
76
+ matlab_proxy-0.12.0.dist-info/top_level.txt,sha256=3-Lxje1LZvSfK__TVoRksU4th_PCj6cMMJwhH8P0_3I,13
77
+ matlab_proxy-0.12.0.dist-info/RECORD,,