matlab-proxy 0.22.0__py3-none-any.whl → 0.23.3__py3-none-any.whl

matlab_proxy/settings.py

@@ -103,7 +103,7 @@ def get_matlab_executable_and_root_path():
     # 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.info(error_message)
+    logger.error(error_message)
     raise MatlabInstallError(error_message)
 
 

matlab_proxy/util/__init__.py

@@ -98,7 +98,7 @@ def prepare_site(app, runner):
                 )
                 break
             except:
-                logger.info(f"Failed to launch the site on port {p}")
+                logger.error(f"Failed to launch the site on port {p}")
 
     return site
 

matlab_proxy/util/mwi/validators.py

@@ -179,30 +179,31 @@ def validate_env_config(config):
     Returns:
         Dict: Containing data specific to the environment in which MATLAB proxy is being used in.
     """
-    available_configs = __get_configs()
+    from matlab_proxy.default_configuration import get_required_config
+
+    available_configs: dict = __get_configs()
     config = config.lower()
 
     # Check if supplied config is present in the available configs
     if config in available_configs:
-        # Check if all keys are present in the supplied config
-        default_config_keys = available_configs[
-            matlab_proxy.get_default_config_name()
-        ].keys()
         env_config = available_configs[config]
+        required_keys = get_required_config()
 
-        for key in default_config_keys:
-            if not key in env_config:
-                error_message = f"{key} missing in the provided {config} configuration"
-                logger.error(error_message)
-                raise FatalError(error_message)
+        # Check if all required keys are present in the supplied config
+        valid = all(key in env_config for key in required_keys)
+        if not valid:
+            error_message = (
+                f"Required key/s missing in the provided {config} configuration"
+            )
+            logger.error(error_message)
+            raise FatalError(error_message)
 
-        logger.debug(f"Successfully validated provided {config} configuration")
+        logger.debug("Successfully validated provided %s configuration", config)
         return env_config
 
-    else:
-        error_message = f"{config} is not a valid config. Available configs are : {list(available_configs.keys())}"
-        logger.error(error_message)
-        raise FatalError(error_message)
+    error_message = f"{config} is not a valid config. Available configs are : {list(available_configs.keys())}"
+    logger.error(error_message)
+    raise FatalError(error_message)
 
 
 def __get_configs():
@@ -325,7 +326,7 @@ def validate_matlab_root_path(matlab_root: Path, is_custom_matlab_root: bool):
 
     try:
         __validate_if_paths_exist([matlab_root])
-        logger.info(
+        logger.debug(
             f"MATLAB root path: {matlab_root} exists, continuing to verify its validity..."
         )
 

{matlab_proxy-0.22.0.dist-info → matlab_proxy-0.23.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: matlab-proxy
-Version: 0.22.0
+Version: 0.23.3
 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.
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: ~=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: aiohttp>=3.7.4
+Requires-Dist: aiohttp<=3.10.5,>=3.7.4
 Requires-Dist: aiohttp-session[secure]
 Requires-Dist: importlib-metadata
 Requires-Dist: importlib-resources

{matlab_proxy-0.22.0.dist-info → matlab_proxy-0.23.3.dist-info}/RECORD

@@ -1,24 +1,24 @@
 matlab_proxy/__init__.py,sha256=6cwi8buKCMtw9OeWaOYUHEoqwl5MyJ_s6GxgNuqPuNg,1673
 matlab_proxy/app.py,sha256=7BsHSM3PxTjN6eN10HLj74Y1wtu-Gl92g1RLbaTGz9U,34698
-matlab_proxy/app_state.py,sha256=pt6s3Yy6NV6LB-GxT1Y4cOpeDaTFMm_ItN_qPstDTwE,71296
+matlab_proxy/app_state.py,sha256=fGZjhY8ZupX54Q6gEbXjfrxR8svDBicnsO97vetjpo4,71015
 matlab_proxy/constants.py,sha256=L9fhXdcGH7Eu56h0aB_TNm3d6aNFr2nP6-HyQJ96TAA,1175
-matlab_proxy/default_configuration.py,sha256=DxQaHzAivzstiPl_nDfxs8SOyP9oaK9v3RP4LtroJl4,843
+matlab_proxy/default_configuration.py,sha256=tBHaEq_bYsX2uC9pPA9mi_8M6o94ij-rxq8mbvcYpFc,1874
 matlab_proxy/devel.py,sha256=nR6XPVBUEdQ-RZGtYvX1YHTp8gj9cuw5Hp8ahasMBc8,14310
-matlab_proxy/settings.py,sha256=63pyCUvT7WLBRUpUr3F4r4nL13pQ2Hn6-oZODAhuGLo,26722
+matlab_proxy/settings.py,sha256=ni-9zNbWF3cy4v0X8vAwAiM5WcC8U_t3a-s7GXIkyBA,26723
 matlab_proxy/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-matlab_proxy/gui/asset-manifest.json,sha256=YkEfNW24kpJZ_PoGlR8THdaAQvYutFAs_wEq1ZvCJXU,3516
+matlab_proxy/gui/asset-manifest.json,sha256=VW67P_Jg7RPTCNDkMCWmphyXKJvv-KE-DjFQvQxm8aM,3516
 matlab_proxy/gui/favicon.ico,sha256=7w7Ki1uQP2Rgwc64dOV4-NrTu97I3WsZw8OvRSoY1A0,130876
-matlab_proxy/gui/index.html,sha256=NnOkBgjxfhXFum5bQF6xZ2SIfTJc7YccmLyqpYJIfVk,637
+matlab_proxy/gui/index.html,sha256=QFS6XN-j7nMc8qNT6m9nJzC73St0zo76PS2e__HS5BM,637
 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/main.6cd0caba.css,sha256=Ks90yx_8kQC9UQXlkvh5ecz2vk2jEN2FKkMCLn0hTb8,269168
-matlab_proxy/gui/static/css/main.6cd0caba.css.map,sha256=-pczDWw0U0T9Yd7pVYDklDlsc6OJqxCYlGmS6qtAhqU,350517
+matlab_proxy/gui/static/css/main.efa05ff9.css,sha256=dOvmpZ0-Xez2_dwxue5yb0el7o7btgZTzzbuQZ3hnSg,269167
+matlab_proxy/gui/static/css/main.efa05ff9.css.map,sha256=y9dh-GxZmqmtSCOwW6szE68iuVhO7gEhm80yqvRX4oU,350512
 matlab_proxy/gui/static/js/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-matlab_proxy/gui/static/js/main.77e6cbaf.js,sha256=gKag4fSgMd4NoDEIYWDmxAPqAUjdrPT3qCP0FCXf_AA,283174
-matlab_proxy/gui/static/js/main.77e6cbaf.js.LICENSE.txt,sha256=uJRPpXtA1Wzfw2dMAUGOPgwqYk2GvDcIafoGMMNLECQ,1539
-matlab_proxy/gui/static/js/main.77e6cbaf.js.map,sha256=QxEP96Qq3AEySDSK1PnVJdvvYVFjwYgRrDAWGJYscpw,911437
+matlab_proxy/gui/static/js/main.ce0f5505.js,sha256=yK_ZQcKt2MrEb4BAcFeeWmSxD82N8dmhGhxrPxNBTeE,283625
+matlab_proxy/gui/static/js/main.ce0f5505.js.LICENSE.txt,sha256=uJRPpXtA1Wzfw2dMAUGOPgwqYk2GvDcIafoGMMNLECQ,1539
+matlab_proxy/gui/static/js/main.ce0f5505.js.map,sha256=drUlJe9d8w69Djdw-LIdrt7sRRjZl9Zw_PaZd-MlSdo,912523
 matlab_proxy/gui/static/media/MATLAB-env-blur.4fc94edbc82d3184e5cb.png,sha256=QpmQTLDvBu2-b7ev83Rvpt0Q72R6wdQGkuJMPPpjv7M,220290
 matlab_proxy/gui/static/media/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matlab_proxy/gui/static/media/arrow.0c2968b90bd9a64c8c3f.svg,sha256=XtmvDWzGZnwCZm08TKBnqt5hc1wphJnNupG0Fx_faAY,327
@@ -54,7 +54,7 @@ matlab_proxy/gui/static/media/trigger-ok.7b9c238be42f685c4fa7.svg,sha256=mD-7N9c
 matlab_proxy/icons/matlab.svg,sha256=xh5uYebQd8I-ISvenjU9A-PkClzW_lU9wvm3doXOFKM,13366
 matlab_proxy/matlab/evaluateUserMatlabCode.m,sha256=R8w6nPdGtadR4UUFJaspcrGQL7cJwUItdrfc531w3bM,2420
 matlab_proxy/matlab/startup.m,sha256=Rgb1Y3F2pFgByKAaXxWWcYOA2594D7V2HXuyuVmGYjs,653
-matlab_proxy/util/__init__.py,sha256=CoH6sfgrQ1phhO1FXeyQwTjtl7PPgeZOCGNrkyGv-5o,11711
+matlab_proxy/util/__init__.py,sha256=JkVIsTOae5giDK0cQ7jcxQSHa8zo1umdq-1C0grDZwk,11712
 matlab_proxy/util/event_loop.py,sha256=sX_0tKlirCY5ImLxkss_XO4Ksj65u6JHtwMj25oGL94,1816
 matlab_proxy/util/list_servers.py,sha256=M93coVZjyQCdIvCCxsNOU_XDWNjBSysOJ5tWXaTjP8Y,1369
 matlab_proxy/util/mw.py,sha256=dLGSdfcTZiwKR1MMZA-39o-8na13IEPZOGBqcaHmKVI,11086
@@ -67,27 +67,27 @@ 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=EHHr6OWlXe6yVX0RPh57HSE7lz6MhWmwLQIpe_SlsC0,3803
 matlab_proxy/util/mwi/token_auth.py,sha256=UbIWqo7qADaZdijFvorLYsZbxzaB8TycGP8nk305ru0,9997
-matlab_proxy/util/mwi/validators.py,sha256=br-22Gyef_vxVSSH2Qkb97Nfph9sfl7fyhQ8-LWkBP4,12600
+matlab_proxy/util/mwi/validators.py,sha256=iXPR7b3jtnwx2i15YxKQgmOm2pt3ujJeMGYNxY0oGGw,12633
 matlab_proxy/util/mwi/embedded_connector/__init__.py,sha256=Vfl2hNC7V1IwoK9_wrwfENs4BC8P-Mvvqh4BNGi2n48,119
 matlab_proxy/util/mwi/embedded_connector/helpers.py,sha256=aOn-AvcDy6jBQJIffiv_agIa4UVldAIl3--QnDpXWDM,3656
 matlab_proxy/util/mwi/embedded_connector/request.py,sha256=-IzTDjy3qViHfLJpK3OnFtEyV7dgwJKPQAfav9lqILc,4317
 matlab_proxy_manager/__init__.py,sha256=CMqm2aSYUWo5sxV3vyqWudrQU31muouSqZRDesJNJSA,178
 matlab_proxy_manager/lib/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
-matlab_proxy_manager/lib/api.py,sha256=IBAYvrTCA2TQ1pBzz8mkn1GQXUpIC1mUwaqVktvl4aE,10639
+matlab_proxy_manager/lib/api.py,sha256=_ukL8ZeQg8E5s9uPeNjYAuCc_1BR08GSlom0VQclt84,12549
 matlab_proxy_manager/storage/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
 matlab_proxy_manager/storage/file_repository.py,sha256=U4FAw0zFN9z7YNlaMsYZXWm5ccs3rp3bzZL-W2BNhxA,5187
 matlab_proxy_manager/storage/interface.py,sha256=pnRRD0Ku3gzbruAOM3J3NI2Kk8do3-_yRw9Pag1IqnE,1883
-matlab_proxy_manager/storage/server.py,sha256=kQ4jtG2xqCa8c7zqDBFYxOhxMxwZwqTIITBxcJRDcvE,4848
+matlab_proxy_manager/storage/server.py,sha256=MjTw5-CRb3jF57wUXnVJmOyezM6peBOAyBfMfEqSzBc,4848
 matlab_proxy_manager/utils/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
 matlab_proxy_manager/utils/auth.py,sha256=60vi16eQ7LWp3I4CNv2easTjObw50irEm518fiMA5YI,2526
 matlab_proxy_manager/utils/constants.py,sha256=pyg-bkk6wWfmy60nvhroZDMZt__FcbZbuvU-b9m2Fkg,163
 matlab_proxy_manager/utils/environment_variables.py,sha256=rbDeWnyJp77Yr6btK3eXKZQ5thwiwhOGZcvDetGPOH8,1436
-matlab_proxy_manager/utils/helpers.py,sha256=8RlUe2WfhJ65YEVlhfU6ivpjpy4AAyA70vzmnJh0ypA,9267
+matlab_proxy_manager/utils/helpers.py,sha256=vgbWDTGmHpI_IMEy67UMfExxmbjMskhdEadCmbbvav8,9983
 matlab_proxy_manager/utils/logger.py,sha256=GSRGD-yf518o-2b1BxEeJYuNiEz2eEqpl0Solqbwpb4,1869
 matlab_proxy_manager/web/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
-matlab_proxy_manager/web/app.py,sha256=Lu6sl3Mft98oL-Z1NwBdmmG1OvnwYEN31pU2bOdzFi0,16572
-matlab_proxy_manager/web/monitor.py,sha256=Gj0DxwX0c1PEAly5jWmuIGqNJYGDDjTkQIzbVXu4zCQ,1589
-matlab_proxy_manager/web/watcher.py,sha256=aNa_UDwvzaZrIdHyvWGX7dILH199uc6xVH4odrKU5-E,1817
+matlab_proxy_manager/web/app.py,sha256=a_fCQS1rDGCuQ7iE1J2oaFrKSeBUyk_9lYeuyZo-MVc,18174
+matlab_proxy_manager/web/monitor.py,sha256=PWkwV0kP3XHCxDRHpurPh74Zg-SgaIXnCnX2xZSW_R8,1541
+matlab_proxy_manager/web/watcher.py,sha256=89JHjBAQtOrllstaJFxqrjHwckpRmu3qfUqeqPLmH2Q,2130
 tests/integration/__init__.py,sha256=ttzJ8xKWGxOJZz56qOiWOn6sp5LGomkZMn_w4KJLRMU,42
 tests/integration/integration_tests_with_license/__init__.py,sha256=vVYZCur-QhmIGCxUmn-WZjIywtDQidaLDmlmrRHRlgY,37
 tests/integration/integration_tests_with_license/conftest.py,sha256=sCaIXB8d4vf05C7JWSVA7g5gnPjbpRq3dftuBpWyp1s,1599
@@ -100,8 +100,8 @@ tests/integration/utils/integration_tests_utils.py,sha256=IbJ9CedFHiz3k85FBY-8Gw
 tests/integration/utils/licensing.py,sha256=rEBjvMXO8R3mL6KnePu2lojmOsjD4GXl9frf9N0Wacs,4842
 tests/unit/__init__.py,sha256=KfwQxxM5a1kMRtNbhz8tb7YfHp8e2d0tNLB55wYvDS8,37
 tests/unit/conftest.py,sha256=Hfxq3h8IZuLJkRMh5jdEFiq78CIAdKvm-6KryRDZ0FY,1918
-tests/unit/test_app.py,sha256=15kSWsfIEQpGzr6QoDoFpV501SYA5XkszrwDp8pJi74,38442
-tests/unit/test_app_state.py,sha256=ZtM79HAe5W6pVVWV-NICjDJBlmuxJ4NnZn-urGGtH-E,33429
+tests/unit/test_app.py,sha256=pM8zVyXWLx8nP8RePusXH4admEBYKc5JC8eE2t8xIQE,38487
+tests/unit/test_app_state.py,sha256=mq0qDWY3k2-_8job9g3BY52aT3ciNxji5_HVG1VhVBw,37112
 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
@@ -115,15 +115,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=2VFoVlMLgsSWtDn0iVxHNArGBfN-IgWehuoaLvWlS6U,3151
 tests/unit/util/mwi/test_token_auth.py,sha256=-eBsaQ5JC7pyd9PXt48Rqs4cWjg6I-eOkp_gFVEwYhk,10538
-tests/unit/util/mwi/test_validators.py,sha256=rzSmifQdPWZ5ZjecShBpC_RYL55_smCsG248h2JzUDU,11467
+tests/unit/util/mwi/test_validators.py,sha256=lJy9rEXCULRrp9wxv9KXUjtlTFbchqTefxGLUg_n3S8,11452
 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.22.0.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
-matlab_proxy-0.22.0.dist-info/METADATA,sha256=oSpSLAsT_HNS-Gg6WiaM0EGv8Dg_g2-GfY6Lv8yPdNY,10190
-matlab_proxy-0.22.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-matlab_proxy-0.22.0.dist-info/entry_points.txt,sha256=ZAlCUsgKzGcAeQaMZOq31FrTB5tQ8Ypq8Op_8U600-A,305
-matlab_proxy-0.22.0.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
-matlab_proxy-0.22.0.dist-info/RECORD,,
+matlab_proxy-0.23.3.dist-info/LICENSE.md,sha256=oF0h3UdSF-rlUiMGYwi086ZHqelzz7yOOk9HFDv9ELo,2344
+matlab_proxy-0.23.3.dist-info/METADATA,sha256=l32qvymxSsGA0amtHFIGVvMQDMFMBs6758Qm2_YSq-A,10199
+matlab_proxy-0.23.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+matlab_proxy-0.23.3.dist-info/entry_points.txt,sha256=ZAlCUsgKzGcAeQaMZOq31FrTB5tQ8Ypq8Op_8U600-A,305
+matlab_proxy-0.23.3.dist-info/top_level.txt,sha256=KF-347aoRGsfHTpiSqfIPUZ95bzK5-oMIu8S_TUcu-w,40
+matlab_proxy-0.23.3.dist-info/RECORD,,

{matlab_proxy-0.22.0.dist-info → matlab_proxy-0.23.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

matlab_proxy_manager/lib/api.py

@@ -3,7 +3,7 @@ import asyncio
 import os
 import secrets
 import subprocess
-from typing import Optional
+from typing import List, Optional, Tuple
 
 import matlab_proxy
 import matlab_proxy.util.system as mwi_sys
@@ -20,7 +20,7 @@ log = logger.get(init=True)
 
 
 async def start_matlab_proxy_for_kernel(
-    caller_id: str, parent_id: str, is_isolated_matlab: bool
+    caller_id: str, parent_id: str, is_shared_matlab: bool
 ):
     """
     Starts a MATLAB proxy server specifically for MATLAB Kernel.
@@ -29,12 +29,12 @@ async def start_matlab_proxy_for_kernel(
     set to None, for starting the MATLAB proxy server via proxy manager.
     """
     return await _start_matlab_proxy(
-        caller_id=caller_id, ctx=parent_id, is_isolated_matlab=is_isolated_matlab
+        caller_id=caller_id, ctx=parent_id, is_shared_matlab=is_shared_matlab
     )
 
 
 async def start_matlab_proxy_for_jsp(
-    parent_id: str, is_isolated_matlab: bool, mpm_auth_token: str
+    parent_id: str, is_shared_matlab: bool, mpm_auth_token: str
 ):
     """
     Starts a MATLAB proxy server specifically for Jupyter Server Proxy (JSP) - Open MATLAB launcher.
@@ -45,7 +45,7 @@ async def start_matlab_proxy_for_jsp(
     return await _start_matlab_proxy(
         caller_id="jsp",
         ctx=parent_id,
-        is_isolated_matlab=is_isolated_matlab,
+        is_shared_matlab=is_shared_matlab,
         mpm_auth_token=mpm_auth_token,
     )
 
@@ -60,7 +60,7 @@ async def _start_matlab_proxy(**options) -> Optional[dict]:
     Args (keyword arguments):
         - caller_id (str): The identifier for the caller (kernel id for kernels, "jsp" for JSP).
         - ctx (str): The context in which the server is being started (parent pid).
-        - is_isolated_matlab (bool, optional): Whether to start an isolated MATLAB proxy instance.
+        - is_shared_matlab (bool, optional): Whether to start a shared MATLAB proxy instance.
         Defaults to False.
         - mpm_auth_token (str, optional): The MATLAB proxy manager token. If not provided,
         a new token is generated. Defaults to None.
@@ -69,16 +69,23 @@ async def _start_matlab_proxy(**options) -> Optional[dict]:
         ServerProcess: The process representing the MATLAB proxy server.
 
     Raises:
-        ValueError: If `caller_id` is "default" and `is_isolated_matlab` is True.
+        ValueError: If `caller_id` is "default" and `is_shared_matlab` is False.
     """
-    caller_id: str = options.get("caller_id")
-    ctx: str = options.get("ctx")
-    is_isolated_matlab: bool = options.get("is_isolated_matlab", False)
+    # Validate arguments
+    required_args: List[str] = ["caller_id", "ctx", "is_shared_matlab"]
+    missing_args: List[str] = [arg for arg in required_args if arg not in options]
+
+    if missing_args:
+        raise ValueError(f"Missing required arguments: {', '.join(missing_args)}")
+
+    caller_id: str = options["caller_id"]
+    ctx: str = options["ctx"]
+    is_shared_matlab: bool = options.get("is_shared_matlab", True)
     mpm_auth_token: Optional[str] = options.get("mpm_auth_token", None)
 
-    if is_isolated_matlab and caller_id == "default":
+    if not is_shared_matlab and caller_id == "default":
         raise ValueError(
-            "Caller id cannot be default when isolated_matlab is set to true"
+            "Caller id cannot be default when matlab proxy is not shareable"
         )
 
     mpm_auth_token = mpm_auth_token or secrets.token_hex(32)
@@ -86,9 +93,9 @@ async def _start_matlab_proxy(**options) -> Optional[dict]:
     # Cleanup stale entries before starting new instance of matlab proxy server
     helpers._are_orphaned_servers_deleted(ctx)
 
-    ident = caller_id if is_isolated_matlab else "default"
+    ident = caller_id if not is_shared_matlab else "default"
     key = f"{ctx}_{ident}"
-    log.debug("Starting matlab proxy using %s, %s, %s", ctx, ident, is_isolated_matlab)
+    log.debug("Starting matlab proxy using %s, %s, %s", ctx, ident, is_shared_matlab)
 
     data_dir = helpers.create_and_get_proxy_manager_data_dir()
     server_process = ServerProcess.find_existing_server(data_dir, key)
@@ -101,10 +108,8 @@ async def _start_matlab_proxy(**options) -> Optional[dict]:
 
     # Create a new matlab proxy server
     else:
-        server_process: ServerProcess | None = (
-            await _start_subprocess_and_check_for_readiness(
-                ident, ctx, key, is_isolated_matlab, mpm_auth_token
-            )
+        server_process = await _start_subprocess_and_check_for_readiness(
+            ident, ctx, key, is_shared_matlab, mpm_auth_token
         )
 
         # Store the newly created server into filesystem
@@ -115,7 +120,7 @@ async def _start_matlab_proxy(**options) -> Optional[dict]:
 
 
 async def _start_subprocess_and_check_for_readiness(
-    server_id: str, ctx: str, key: str, isolated: bool, mpm_auth_token: str
+    server_id: str, ctx: str, key: str, is_shared_matlab: bool, mpm_auth_token: str
 ) -> Optional[ServerProcess]:
     """
     Starts a MATLAB proxy server.
@@ -136,10 +141,12 @@ async def _start_subprocess_and_check_for_readiness(
     matlab_proxy_cmd, matlab_proxy_env = _prepare_cmd_and_env_for_matlab_proxy()
 
     # Start the matlab proxy process
-    process_id, url, mwi_base_url = await _start_subprocess(
-        matlab_proxy_cmd, matlab_proxy_env, server_id
-    )
+    result = await _start_subprocess(matlab_proxy_cmd, matlab_proxy_env, server_id)
+    if not result:
+        log.error("Could not start matlab proxy")
+        return None
 
+    process_id, url, mwi_base_url = result
     server_process = None
 
     # Check for the matlab proxy server readiness
@@ -151,14 +158,14 @@ async def _start_subprocess_and_check_for_readiness(
             headers=helpers.convert_mwi_env_vars_to_header_format(
                 matlab_proxy_env, "MWI"
             ),
-            pid=process_id,
+            pid=str(process_id),
             parent_pid=ctx,
             id=key,
-            type="named" if isolated else "shared",
+            type="shared" if is_shared_matlab else "named",
             mpm_auth_token=mpm_auth_token,
         )
     else:
-        log.error("Could not start matlab proxy")
+        log.error("matlab-proxy server never became ready")
 
     return server_process
 
@@ -189,7 +196,7 @@ def _prepare_cmd_and_env_for_matlab_proxy():
     return matlab_proxy_cmd, matlab_proxy_env
 
 
-async def _start_subprocess(cmd, env, server_id) -> Optional[int]:
+async def _start_subprocess(cmd, env, server_id) -> Optional[Tuple[int, str, str]]:
     """
     Initializes and starts a subprocess using the specified command and provided environment.
 
@@ -199,33 +206,22 @@ async def _start_subprocess(cmd, env, server_id) -> Optional[int]:
     process = None
     mwi_base_url: str = f"{constants.MWI_BASE_URL_PREFIX}{server_id}"
 
-    # Get a free port, closer to starting the matlab proxy appx
-    port: str = helpers.find_free_port()
-    env.update(
-        {
-            "MWI_APP_PORT": port,
-            "MWI_BASE_URL": mwi_base_url,
-        }
-    )
+    # Get a free port and corresponding bound socket
+    with helpers.find_free_port() as (port, _):
+        env.update(
+            {
+                "MWI_APP_PORT": port,
+                "MWI_BASE_URL": mwi_base_url,
+            }
+        )
 
-    # Using loopback address so that DNS resolution doesn't add latency in Windows
-    url: str = f"http://127.0.0.1:{port}"
+        # Using loopback address so that DNS resolution doesn't add latency in Windows
+        url: str = f"http://127.0.0.1:{port}"
 
-    if mwi_sys.is_posix():
-        process = await asyncio.create_subprocess_exec(
-            *cmd,
-            env=env,
-        )
-        log.debug("Started matlab proxy subprocess for posix")
-    else:
-        process = subprocess.Popen(
-            cmd,
-            env=env,
-        )
-        log.debug("Started matlab proxy subprocess for windows")
+        process = await _initialize_process_based_on_os_type(cmd, env)
 
     if not process:
-        log.error("Matlab proxy process not created %d", process.returncode)
+        log.error("Matlab proxy process not created due to some error")
         return None
 
     process_pid = process.pid
@@ -233,6 +229,51 @@ async def _start_subprocess(cmd, env, server_id) -> Optional[int]:
     return process_pid, url, mwi_base_url
 
 
+async def _initialize_process_based_on_os_type(cmd, env):
+    """
+    Initializes and starts a subprocess based on the operating system.
+
+    This function attempts to create a subprocess using the provided command and
+    environment variables. It handles both POSIX and Windows systems differently.
+
+    Args:
+        cmd (List[str]): The command to execute in the subprocess.
+        env (Dict[str, str]): The environment variables for the subprocess.
+
+    Returns:
+        Union[Process, None, Popen[bytes]]: The created subprocess object if successful,
+        or None if an error occurs during subprocess creation.
+
+    Raises:
+        Exception: If there's an error creating the subprocess (caught and logged).
+    """
+    if mwi_sys.is_posix():
+        log.debug("Starting matlab proxy subprocess for posix")
+        try:
+            return await asyncio.create_subprocess_exec(
+                *cmd,
+                env=env,
+                # kernel sporadically ends up cleaning the child matlab-proxy process during the
+                # restart workflow. This is a workaround to handle that race condition which leads
+                # to starting matlab-proxy in a new process group and is not counted for deletion.
+                # https://github.com/ipython/ipykernel/blob/main/ipykernel/kernelbase.py#L1283
+                start_new_session=True,
+            )
+        except Exception as e:
+            log.error("Failed to create posix subprocess: %s", e)
+            return None
+    else:
+        try:
+            log.debug("Starting matlab proxy subprocess for windows")
+            return subprocess.Popen(
+                cmd,
+                env=env,
+            )
+        except Exception as e:
+            log.error("Failed to create windows subprocess: %s", e)
+            return None
+
+
 async def shutdown(parent_pid: str, caller_id: str, mpm_auth_token: str):
     """
     Shutdown the MATLAB proxy server if the provided authentication token is valid.

matlab_proxy_manager/storage/server.py

@@ -20,8 +20,8 @@ class ServerProcess:
     mwi_base_url: Optional[str] = None
     headers: Optional[dict] = None
     errors: Optional[list] = None
-    pid: Optional[int] = None
-    parent_pid: Optional[int] = None
+    pid: Optional[str] = None
+    parent_pid: Optional[str] = None
     absolute_url: Optional[str] = field(default=None)
     id: Optional[str] = None
     type: Optional[str] = None

matlab_proxy_manager/utils/helpers.py

@@ -1,9 +1,12 @@
 # Copyright 2024 The MathWorks, Inc.
+import http
 import os
 import socket
 import time
+from contextlib import contextmanager
 from pathlib import Path
-from typing import Dict
+from typing import Dict, Generator, Optional, Tuple
+from urllib.parse import urlparse
 
 import psutil
 import requests
@@ -18,7 +21,7 @@ from matlab_proxy_manager.utils import logger
 log = logger.get()
 
 
-def is_server_ready(url: str, retries: int = 2, backoff_factor=None) -> bool:
+def is_server_ready(url: Optional[str], retries: int = 2, backoff_factor=None) -> bool:
     """
     Check if the server at the given URL is ready.
 
@@ -29,13 +32,19 @@ def is_server_ready(url: str, retries: int = 2, backoff_factor=None) -> bool:
         bool: True if the server is ready, False otherwise.
     """
     try:
+        # Validate URL
+        parsed_url = urlparse(url)
+        if not all([parsed_url.scheme, parsed_url.netloc]):
+            log.debug("Invalid URL provided: %s", url)
+            return False
+
         matlab_proxy_index_page_identifier = "MWI_MATLAB_PROXY_IDENTIFIER"
         resp = requests_retry_session(
             retries=retries, backoff_factor=backoff_factor
         ).get(f"{url}", verify=False)
         log.debug("Response status code from server readiness: %s", resp.status_code)
         return (
-            resp.status_code == requests.codes.OK
+            resp.status_code == http.HTTPStatus.OK
             and matlab_proxy_index_page_identifier in resp.text
         )
     except Exception as e:
@@ -71,16 +80,14 @@ def requests_retry_session(
     return session
 
 
-def does_process_exist(pid: int) -> bool:
+def does_process_exist(pid: Optional[str]) -> bool:
     """
     Checks if the parent process is alive.
 
     Returns:
         bool: True if the parent process is alive, False otherwise.
     """
-    parent_status = pid is not None and psutil.pid_exists(int(pid))
-    log.debug("Parent liveness check returned: %s", parent_status)
-    return parent_status
+    return bool(pid and psutil.pid_exists(int(pid)))
 
 
 def convert_mwi_env_vars_to_header_format(
@@ -124,11 +131,11 @@ async def delete_dangling_servers(app: web.Application) -> None:
     Args:
         app (web.Application): aiohttp web application
     """
-    is_delete_successful = _are_orphaned_servers_deleted(None)
+    is_delete_successful = _are_orphaned_servers_deleted()
     log.debug("Deleted dangling matlab proxy servers: %s", is_delete_successful)
 
 
-def _are_orphaned_servers_deleted(predicate: str) -> bool:
+def _are_orphaned_servers_deleted(predicate: Optional[str] = "") -> bool:
     """
     Get all the files under the proxy manager directory, check the status of the servers,
     and delete orphaned servers and their corresponding files.
@@ -146,7 +153,7 @@ def _are_orphaned_servers_deleted(predicate: str) -> bool:
     servers: dict = storage.get_all()
 
     def _matches_predicate(filename: str) -> bool:
-        return filename.split("_")[0] == predicate
+        return filename.split("_")[0] == str(predicate)
 
     # Checks only a subset of servers (that matches the parent_pid of the caller)
     # to reduce the MATLAB proxy startup time
@@ -154,7 +161,7 @@ def _are_orphaned_servers_deleted(predicate: str) -> bool:
         servers = {
             filename: server
             for filename, server in servers.items()
-            if _matches_predicate(filename)
+            if _matches_predicate(Path(filename).stem)
         }
         if not servers:
             log.debug("Parent pid not matched, nothing to cleanup")
@@ -163,7 +170,7 @@ def _are_orphaned_servers_deleted(predicate: str) -> bool:
     return _delete_server_and_file(storage, servers)
 
 
-def _delete_server_and_file(storage, servers):
+def _delete_server_and_file(storage, servers) -> bool:
     is_server_deleted = False
     for filename, server in servers.items():
         if not server.is_server_alive():
@@ -201,7 +208,7 @@ def poll_for_server_deletion() -> None:
     start_time = time.time()
 
     while time.time() - start_time < timeout_in_seconds:
-        is_server_deleted = _are_orphaned_servers_deleted(None)
+        is_server_deleted = _are_orphaned_servers_deleted()
         if is_server_deleted:
             log.debug("Servers deleted, breaking out of loop")
             break
@@ -210,21 +217,31 @@ def poll_for_server_deletion() -> None:
         time.sleep(0.5)
 
 
-def find_free_port() -> str:
+@contextmanager
+def find_free_port() -> Generator[Tuple[str, socket.socket], None, None]:
     """
-    Find a free port on the system.
+    Context manager for finding a free port on the system.
 
-    This function creates a socket, binds it to an available port, retrieves
-    the port number, and then closes the socket.
+    This function creates a socket, binds it to an available port, and yields
+    the port number along with the socket object. The socket is automatically
+    closed when exiting the context.
 
-    Returns:
-        str: The free port number as a string.
+    Yields:
+        Tuple[str, socket.socket]: A tuple containing:
+            - str: The free port number as a string.
+            - socket.socket: The socket object.
     """
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     s.bind(("", 0))
     port = str(s.getsockname()[1])
-    s.close()
-    return port
+    try:
+        yield port, s
+    finally:
+        try:
+            s.close()
+        except OSError as ex:
+            # Socket already closed, log and ignore the exception
+            log.debug("Failed to close socket: %s", ex)
 
 
 def pre_load_from_state_file(data_dir: str) -> Dict[str, str]: