Merge pull request #81 from jataware/dev

v1.6.8 release changes

Author: mattprintz

Makefile

@@ -6,7 +6,8 @@ init:
 	make .env beaker-vue/node_modules
 
 .PHONY:build
-build:beaker_kernel/server/ui/index.html
+build:
+	rm -r beaker-ts/dist/* beaker-vue/dist/* beaker_kernel/server/ui/* || true
 	make beaker_kernel/server/ui/index.html
 	hatch build
 
@@ -44,7 +45,7 @@ beaker-vue/node_modules:beaker-vue/package*.json
 beaker_kernel/server/ui/index.html:beaker-vue/node_modules beaker-vue/**
 	rm -r beaker_kernel/server/ui/* || true; \
 	(cd beaker-ts/ && npm install && npm run build) && \
-	(cd beaker-vue/ && npm run build) && \
+	(cd beaker-vue/ && npm install && npm run build) && \
 	cp -r beaker-vue/dist/html/* beaker_kernel/server/ui/
 
 .PHONY:changed-files

beaker-ts/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "beaker-kernel",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "Beaker kernel library",
   "repository": {
     "url": "https://github.com/jataware/beaker-kernel"

beaker-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beaker-vue",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "declaration": true,
   "scripts": {
     "serve": "vue-cli-service serve",

beaker-vue/package-lock.json

@@ -14,20 +14,9 @@ const baseUrl = PageConfig.getBaseUrl();
 
 (async () => {
 
-  let config;
-  if (process.env.NODE_ENV === "development") {
-    config = {
-      baseUrl: baseUrl,
-      appUrl: baseUrl,
-      wsUrl: baseUrl.replace("http", "ws"),
-      token: "89f73481102c46c0bc13b2998f9a4fce",
-    }
-  }
-  else {
-    const confUrl = URLExt.join(baseUrl, '/config')
-    const configResponse = await fetch(confUrl);
-    config = await configResponse.json();
-  }
+  const confUrl = URLExt.join(baseUrl, '/config')
+  const configResponse = await fetch(confUrl);
+  const config = await configResponse.json();
 
   const app = createApp(BeakerAdmin, {config});
 

beaker-vue/package.json

@@ -18,20 +18,9 @@ const baseUrl = PageConfig.getBaseUrl();
 
 (async () => {
 
-  let config;
-  if (process.env.NODE_ENV === "development") {
-    config = {
-      baseUrl: baseUrl,
-      appUrl: baseUrl,
-      wsUrl: baseUrl.replace("http", "ws"),
-      token: "89f73481102c46c0bc13b2998f9a4fce",
-    }
-  }
-  else {
-    const confUrl = URLExt.join(baseUrl, '/config')
-    const configResponse = await fetch(confUrl);
-    config = await configResponse.json();
-  }
+  const confUrl = URLExt.join(baseUrl, '/config')
+  const configResponse = await fetch(confUrl);
+  const config = await configResponse.json();
 
   const app = createApp(ChatInterface, {config});
 
@@ -43,4 +32,4 @@ const baseUrl = PageConfig.getBaseUrl();
   app.directive('keybindings', vKeybindings);
   app.directive('autoscroll', vAutoScroll);
   app.mount('#app');
-})();
+})();

beaker-vue/src/pages/admin.ts

@@ -19,20 +19,9 @@ const baseUrl = PageConfig.getBaseUrl();
 
 (async () => {
 
-  let config;
-  if (process.env.NODE_ENV === "development") {
-    config = {
-      baseUrl: baseUrl,
-      appUrl: baseUrl,
-      wsUrl: baseUrl.replace("http", "ws"),
-      token: "89f73481102c46c0bc13b2998f9a4fce",
-    }
-  }
-  else {
-    const confUrl = URLExt.join(baseUrl, '/config')
-    const configResponse = await fetch(confUrl);
-    config = await configResponse.json();
-  }
+  const confUrl = URLExt.join(baseUrl, '/config')
+  const configResponse = await fetch(confUrl);
+  const config = await configResponse.json();
 
   const app = createApp(DevInterface, {config});
 

beaker-vue/src/pages/chat-interface.ts

@@ -4,6 +4,9 @@ import NotebookInterface from './NotebookInterface.vue';
 import Tooltip from 'primevue/tooltip';
 import ToastService from 'primevue/toastservice';
 import FocusTrap from 'primevue/focustrap';
+import { vKeybindings } from '../directives/keybindings';
+import { vAutoScroll } from '../directives/autoscroll';
+import BeakerThemePlugin from '../plugins/theme';
 
 import 'primeicons/primeicons.css';
 import '../index.scss';
@@ -14,20 +17,9 @@ const baseUrl = PageConfig.getBaseUrl();
 
 (async () => {
 
-  let config;
-  if (process.env.NODE_ENV === "development") {
-    config = {
-      baseUrl: baseUrl,
-      appUrl: baseUrl,
-      wsUrl: baseUrl.replace("http", "ws"),
-      token: "89f73481102c46c0bc13b2998f9a4fce",
-    }
-  }
-  else {
-    const confUrl = URLExt.join(baseUrl, '/config')
-    const configResponse = await fetch(confUrl);
-    config = await configResponse.json();
-  }
+  const confUrl = URLExt.join(baseUrl, '/config')
+  const configResponse = await fetch(confUrl);
+  const config = await configResponse.json();
 
   const app = createApp(NotebookInterface, {
     connectionSettings: config,
@@ -39,7 +31,10 @@ const baseUrl = PageConfig.getBaseUrl();
 
   app.use(PrimeVue);
   app.use(ToastService);
+  app.use(BeakerThemePlugin);
   app.directive('tooltip', Tooltip);
   app.directive('focustrap', FocusTrap);
+  app.directive('keybindings', vKeybindings);
+  app.directive('autoscroll', vAutoScroll);
   app.mount('#app');
 })();

beaker-vue/src/pages/dev-interface.ts

@@ -1,10 +1,12 @@
 import os
+import toml
 from dataclasses import MISSING
+from pathlib import Path
 
 import click
 import dotenv
 
-from beaker_kernel.lib.config import locate_envfile, config
+from beaker_kernel.lib.config import locate_envfile, locate_config, config, ConfigClass
 from beaker_kernel.lib.autodiscovery import LIB_LOCATIONS
 
 
@@ -24,11 +26,11 @@ def find():
     """
     Locate the configuration file for currently in use
     """
-    envfile = locate_envfile()
-    if os.path.isfile(envfile):
-        click.echo(f"Configuration location: {envfile}\n")
+    config_file = locate_config()
+    if os.path.isfile(config_file):
+        click.echo(f"Configuration location: {config_file}\n")
     else:
-        click.echo(f"No configuration file located.\nDefault location is: {envfile}\n")
+        click.echo(f"No configuration file located.\nDefault location is: {config_file}\n")
 
 
 @config_group.command()
@@ -37,28 +39,29 @@ def show(sensitive):
     """
     Displays the current Beaker configuration
     """
-    envfile: str = locate_envfile()
-    if os.path.isfile(envfile):
-        dotenv_config = dotenv.dotenv_values(envfile)
+    config_file: Path|None = locate_config()
+    if config_file and config_file.exists():
+        config_data = toml.loads(config_file.read_text())
     else:
-        dotenv_config = {}
+        config_data = {}
     has_sensitive = False
 
     click.echo(f"Current Beaker configuration:\n")
     for field_name, field in config.__dataclass_fields__.items():
-        env_var: str = field.metadata.get("env_var", None)
+        config_var: str = field.metadata.get("config_var", None)
         description: str = field.metadata.get("description", "(No description provided)")
         is_sensitive: bool = field.metadata.get("sensitive", False)
         aliases: list[str] = field.metadata.get("aliases", None) or []
 
         value = getattr(config, field_name)
 
         exists_in_config_file = False
-        env_vars_to_check = [env_var, *aliases]
-        for env_var in env_vars_to_check:
-            if env_var in dotenv_config:
+
+        vars_to_check = [field_name, *aliases]
+        for config_name in vars_to_check:
+            if config_name in config_data:
                 exists_in_config_file = True
-                dotenv_config.pop(env_var)
+                config_data.pop(config_var)
                 break
 
         if is_sensitive and not sensitive:
@@ -73,13 +76,20 @@ def show(sensitive):
         click.echo(f"# {field_name}: {description}")
         click.echo(f"{field_name}={display_value}", nl= False)
         if not exists_in_config_file:
-            click.echo("  # default  not defined in config file", nl=False)
+            click.echo("  # (default) - Not defined in config file", nl=False)
         click.echo("\n")
 
-    if dotenv_config:
-        click.echo("\nThe following environment variables are defined in the configuration file but not defined in the "
-                   "Beaker configuration:")
-        for var_name, value in dotenv_config.items():
+    tools_enabled = config_data.pop('tools_enabled', {})
+    if tools_enabled:
+        click.echo("The following tools' have are enabled if true or disabled if false:")
+        for tool, enabled in tools_enabled.items():
+            click.echo(f"  {tool} - {enabled}" )
+        click.echo("")
+
+    if config_data:
+        click.echo("\nThe following config variables are defined in the configuration file but are not defined "
+                   "in the Beaker configuration class:")
+        for var_name, value in config_data.items():
             if sensitive:
                 click.echo(f"  {var_name}={value}")
             else:
@@ -97,22 +107,21 @@ def update(envfile):
     Iterate through available options, prompting for new or updated values.
     """
     updates = {}
-    if envfile is None:
-        envfile = locate_envfile()
-    envfile_exists = os.path.isfile(envfile)
-    if envfile_exists:
-        dotenv_config = dotenv.dotenv_values(envfile)
+
+    config_file = locate_config()
+    if config_file and config_file.exists():
+        config_data = toml.loads(config_file.read_text())
     else:
-        dotenv_config = {}
+        config_data = {}
 
     for field_name, field in config.__dataclass_fields__.items():
-        env_var = field.metadata.get("env_var", None)
+        config_var = field.metadata.get("config_var", None)
         description = field.metadata.get("description", "(No description provided)")
         is_sensitive = field.metadata.get("sensitive", False)
-        if not env_var:
-            click.echo(f"Skipping config option '{field_name} as no environment variable has been defined.")
-        if env_var in dotenv_config:
-            default = dotenv_config.get(env_var)
+        save_default_value = field.metadata.get("save_default_value", False)
+
+        if config_var in config_data:
+            default = config_data.get(config_var)
         else:
             if field.default is not MISSING:
                 default = field.default
@@ -131,20 +140,21 @@ def update(envfile):
 Description: {description}
 
 {field_name}"""
-        value = click.prompt(prompt, default=default_display,)
-        if value == SENSITIVE_STR_REPR:
-            value = default
-        if value != dotenv_config.get(env_var, MISSING):
-            updates[env_var] = value
+        value = click.prompt(prompt, default=default_display)
+        was_value_entered = (value != default_display)
+        is_value_different = (value != config_data.get(config_var, MISSING))
+        if was_value_entered and is_value_different:
+            updates[config_var] = value
+        elif save_default_value and is_value_different:
+            updates[config_var] = default
 
     if updates:
         click.echo("Updated values:")
         click.echo(f"\n".join(f"  {varname}={value}" for varname, value in updates.items()))
-        approval = click.prompt(f"Save above values to file {envfile}?", default="y", type=bool)
+        approval = click.prompt(f"Save above values to file {config_file}?", default="y", type=bool)
         if isinstance(approval, bool) and approval:
             click.echo("Saving...")
-            for varname, value in updates.items():
-                dotenv.set_key(envfile, varname, value, quote_mode="never")
+            config.update(updates, config_file)
             click.echo("Done.")
         else:
             click.echo("Aborting without saving.")