matlab-proxy 0.12.1__py3-none-any.whl → 0.14.0__py3-none-any.whl

matlab_proxy/app.py

@@ -546,7 +546,9 @@ async def matlab_view(req):
         await ws_server.prepare(req)
 
         async with aiohttp.ClientSession(
-            cookies=req.cookies, connector=aiohttp.TCPConnector(verify_ssl=False)
+            trust_env=True,
+            cookies=req.cookies,
+            connector=aiohttp.TCPConnector(verify_ssl=False),
         ) as client_session:
             try:
                 async with client_session.ws_connect(
@@ -610,6 +612,7 @@ async def matlab_view(req):
     else:
         # Proxy, injecting request header
         async with aiohttp.ClientSession(
+            trust_env=True,
             connector=aiohttp.TCPConnector(verify_ssl=False),
         ) as client_session:
             try:
@@ -846,15 +849,31 @@ def create_app(config_name=matlab_proxy.get_default_config_name()):
     return app
 
 
-def main():
-    """Starting point of the integration. Creates the web app and runs indefinitely."""
+def configure_no_proxy_in_env():
+    """Update the environment variable no_proxy to allow communication between processes on the local machine."""
+    import os
 
-    # The integration needs to be called with --config flag.
-    # Parse the passed cli arguments.
-    desired_configuration_name = util.parse_cli_args()["config"]
+    no_proxy_whitelist = ["0.0.0.0", "localhost", "127.0.0.1"]
+
+    no_proxy_env = os.environ.get("no_proxy")
+    if no_proxy_env is None:
+        os.environ["no_proxy"] = ",".join(no_proxy_whitelist)
+    else:
+        # Create set with leading and trailing whitespaces stripped
+        existing_no_proxy_env = [
+            val.lstrip().rstrip() for val in no_proxy_env.split(",")
+        ]
+        os.environ["no_proxy"] = ",".join(
+            set(existing_no_proxy_env + no_proxy_whitelist)
+        )
+    logger.info(f"Setting no_proxy to: {os.environ.get('no_proxy')}")
+
+
+def create_and_start_app(config_name):
+    configure_no_proxy_in_env()
 
     # Create, configure and start the app.
-    app = create_app(config_name=desired_configuration_name)
+    app = create_app(config_name)
     app = configure_and_start(app)
 
     loop = util.get_event_loop()
@@ -884,3 +903,25 @@ def main():
     logger.info("Finished shutting down. Thank you for using the MATLAB proxy.")
     loop.close()
     sys.exit(0)
+
+
+def print_version_and_exit():
+    """prints the version of the package and exits"""
+    from importlib.metadata import version
+
+    matlab_proxy_version = version(__name__.split(".")[0])
+    print(f"{matlab_proxy_version}")
+    sys.exit(0)
+
+
+def main():
+    """Starting point of the integration. Creates the web app and runs indefinitely."""
+
+    if util.parse_cli_args()["version"]:
+        print_version_and_exit()
+
+    # The integration needs to be called with --config flag.
+    # Parse the passed cli arguments.
+    desired_configuration_name = util.parse_cli_args()["config"]
+
+    create_and_start_app(config_name=desired_configuration_name)

matlab_proxy/app_state.py

@@ -606,7 +606,7 @@ class AppState:
             util.prettify(
                 boundary_filler="=",
                 text_arr=[
-                    f"MATLAB can be accessed at:",
+                    f"Access MATLAB at:",
                     self.settings["mwi_server_url"].replace("0.0.0.0", "localhost")
                     + mwi_auth_token_str,
                 ],
@@ -735,9 +735,9 @@ class AppState:
             logger.info(
                 f"Writing MATLAB process logs to: {matlab_env['MW_DIAGNOSTIC_DEST']}"
             )
-            matlab_env[
-                "MW_DIAGNOSTIC_SPEC"
-            ] = "connector::http::server=all;connector::lifecycle=all"
+            matlab_env["MW_DIAGNOSTIC_SPEC"] = (
+                "connector::http::server=all;connector::lifecycle=all"
+            )
 
         # TODO Introduce a warmup flag to enable this?
         # matlab_env["CONNECTOR_CONFIGURABLE_WARMUP_TASKS"] = "warmup_hgweb"

matlab_proxy/gui/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.47712126.css",
-    "main.js": "./static/js/main.b7862305.js",
+    "main.js": "./static/js/main.14aa7840.js",
     "static/media/mathworks-pictograms.svg?20181009": "./static/media/mathworks-pictograms.f6f087b008b5a9435f26.svg",
     "static/media/MATLAB-env-blur.png": "./static/media/MATLAB-env-blur.4fc94edbc82d3184e5cb.png",
     "static/media/mathworks.svg?20181004": "./static/media/mathworks.80a3218e1ba29f0573fb.svg",
@@ -35,10 +35,10 @@
     "static/media/gripper.svg": "./static/media/gripper.9defbc5e76d0de8bb6e0.svg",
     "static/media/arrow.svg": "./static/media/arrow.0c2968b90bd9a64c8c3f.svg",
     "main.47712126.css.map": "./static/css/main.47712126.css.map",
-    "main.b7862305.js.map": "./static/js/main.b7862305.js.map"
+    "main.14aa7840.js.map": "./static/js/main.14aa7840.js.map"
   },
   "entrypoints": [
     "static/css/main.47712126.css",
-    "static/js/main.b7862305.js"
+    "static/js/main.14aa7840.js"
   ]
 }

matlab_proxy/gui/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MATLAB"/><meta name="internal_mw_identifier" content="MWI_MATLAB_PROXY_IDENTIFIER"/><link rel="manifest" href="./manifest.json"/><title>MATLAB</title><script defer="defer" src="./static/js/main.b7862305.js"></script><link href="./static/css/main.47712126.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MATLAB"/><meta name="internal_mw_identifier" content="MWI_MATLAB_PROXY_IDENTIFIER"/><link rel="manifest" href="./manifest.json"/><title>MATLAB</title><script defer="defer" src="./static/js/main.14aa7840.js"></script><link href="./static/css/main.47712126.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>