changes to make VSCode work

Author: craigbarratt

hass_pyscript_kernel/shim.py

@@ -191,6 +191,9 @@ async def forward_data_task(
             while True:
                 data = await reader.read(8192)
                 if len(data) == 0:
+                    print(
+                        f"{PKG_NAME}: {self.name} {dir_str}: read EOF; shutdown with exit_status={exit_status}"
+                    )
                     await exit_q.put(exit_status)
                     return
                 if self.verbose >= 4:
@@ -210,17 +213,15 @@ async def forward_data_task(
 # exit since Jupyter thinks the kernel has stopped.  We sit in the
 # middle of the heartbeat loop so we know when the kernel is stopped.
 #
-async def kernel_run(config_filename: str, verbose: int) -> None:
+async def kernel_run(config: dict, verbose: int) -> None:
     """Start a new pyscript kernel."""
     port_names = ["hb_port", "stdin_port", "shell_port", "iopub_port", "control_port"]
     hass_host = CONFIG_SETTINGS["hass_host"]
     hass_url = CONFIG_SETTINGS["hass_url"].rstrip("/")
     hass_proxy = CONFIG_SETTINGS["hass_proxy"]
 
     connector = proxy.ProxyConnector.from_url(hass_proxy) if hass_proxy else None
-    headers = {
-        "Authorization": f'Bearer {CONFIG_SETTINGS["hass_token"]}',
-    }
+    headers = {"Authorization": f'Bearer {CONFIG_SETTINGS["hass_token"]}'}
     session = aiohttp.ClientSession(connector=connector, headers=headers, raise_for_status=True)
 
     async def do_request(
@@ -237,17 +238,13 @@ async def do_request(
             print(
                 f"{PKG_NAME}: request failed with {err.status}: {err.message} (url={err.request_info.url})"
             )
+            await session.close()
             sys.exit(1)
         except Exception as err:
             print(f"{PKG_NAME}: got error {err} (url={url})")
+            await session.close()
             sys.exit(1)
 
-    with open(config_filename, "r") as fdesc:
-        config = json.load(fdesc)
-
-    if verbose >= 1:
-        print(f"{PKG_NAME}: got jupyter client config={config}")
-
     #
     # The kernel generates its own port numbers since it might be on another host,
     # so we delete the client ports.  Also, it needs the name of a state variable to
@@ -349,18 +346,74 @@ async def do_request(
     sys.exit(exit_status)
 
 
+def remove_quotes(string):
+    """Strip leading/trailing quotes from string, which VSCode strangely adds to arguments."""
+    if string[0] == string[-1] and string[0] in ('"', "'"):
+        return string[1:-1]
+    if len(string) > 1 and string[0] == "b" and string[1] == string[-1] and string[1] in ('"', "'"):
+        return string[2:-1]
+    return string
+
+
 def main() -> None:
     """Main function: start a new pyscript kernel."""
+
     parser = argparse.ArgumentParser(prog=PKG_NAME)
-    parser.add_argument("config_file", type=str, help="json kernel config file generated by Jupyter")
     parser.add_argument(
-        "-v", "--verbose", action="count", help="increase output verbosity (repeat up to 4x)",
+        "-v", "--verbose", action="count", help="increase verbosity (repeat up to 4x)", default=0
     )
     parser.add_argument(
         "-k", "--kernel-name", type=str, help="kernel name", default="pyscript", dest="kernel_name"
     )
+    parser.add_argument("-f", "--f", type=str, help="json config file", dest="config_file")
+    parser.add_argument("--ip", type=str, help="ip address")
+    parser.add_argument("--stdin", type=int, help="stdin port")
+    parser.add_argument("--control", type=int, help="control port")
+    parser.add_argument("--hb", type=int, help="hb port")
+    parser.add_argument("--shell", type=int, help="shell port")
+    parser.add_argument("--iopub", type=int, help="iopub port")
+    parser.add_argument(
+        "--Session.signature_scheme", dest="signature_scheme", type=str, help="signature scheme"
+    )
+    parser.add_argument("--Session.key", type=str, dest="key", help="session key")
+    parser.add_argument("--transport", type=str, help="transport")
+
     args = parser.parse_args()
 
     load_config(args.kernel_name)
 
-    asyncio.run(kernel_run(args.config_file, args.verbose if args.verbose else 0))
+    if args.config_file is not None and args.ip is None and args.stdin is None:
+        #
+        # read the json config file (-f or --f) to get the connection parameters
+        #
+        with open(args.config_file, "r") as fdesc:
+            config = json.load(fdesc)
+    else:
+        #
+        # no json config file, so use the command-line arguments instead
+        #
+        config = {
+            "ip": args.ip,
+            "stdin_port": args.stdin,
+            "control_port": args.control,
+            "hb_port": args.hb,
+            "iopub_port": args.iopub,
+            "shell_port": args.shell,
+            "transport": remove_quotes(args.transport),
+            "signature_scheme": remove_quotes(args.signature_scheme),
+            "key": remove_quotes(args.key),
+        }
+        missing = []
+        for arg, value in sorted(config.items()):
+            if value is None:
+                missing.append(arg)
+        if missing:
+            print(
+                f"{PKG_NAME}: missing arguments: --{', --'.join(missing)}, (or specify --f config_file instead)"
+            )
+            sys.exit(1)
+
+    if args.verbose >= 1:
+        print(f"{PKG_NAME}: got jupyter client config={config}")
+
+    asyncio.run(kernel_run(config, args.verbose))