fix dot language kernel

Author: colombod

src/DotLanguage.InteractiveExtension/ChooseDotLanguageKernelDirective.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.DotNet.Interactive;
 using Microsoft.DotNet.Interactive.Commands;
+using Microsoft.DotNet.Interactive.Directives;
 using Microsoft.DotNet.Interactive.Http;
 
 namespace DotLanguage.InteractiveExtension;
@@ -15,7 +16,6 @@ public class DotLanguageKernel : Kernel,
 {
     private readonly string _cacheBuster;
 
-    private ChooseDotLanguageKernelDirective? _chooseKernelDirective;
 
     public DotLanguageKernel() : base("dot")
     {
@@ -24,25 +24,49 @@ public DotLanguageKernel() : base("dot")
         _cacheBuster = Guid.NewGuid().ToString("N");
     }
 
+    public override KernelSpecifierDirective KernelSpecifierDirective
+    {
+        get
+        {
+            var directive = base.KernelSpecifierDirective;
+
+            directive.Parameters.Add(new("--width"));
+            directive.Parameters.Add(new("--height"));
+            var layoutEngineParameter = new KernelDirectiveParameter("--layout-engine");
+            layoutEngineParameter.AddCompletions(() => Enum.GetNames(typeof(LayoutEngine)));
+            directive.Parameters.Add(layoutEngineParameter);
+
+            return directive;
+        }
+    }
+
     public Task HandleAsync(SubmitCode command, KernelInvocationContext context)
     {
-        var width = "100%";
-        var height = "600px";
         var layoutEngine = LayoutEngine.dot;
-        if (_chooseKernelDirective is { } chooser)
+        command.Parameters.TryGetValue("--width", out var width);
+        if (string.IsNullOrWhiteSpace(width))
+        {
+            width = "100%";
+        }
+        command.Parameters.TryGetValue("--height", out var height);
+        if (string.IsNullOrWhiteSpace(height))
         {
-            width = command.KernelChooserParseResult?.GetValueForOption(chooser.WidthOption);
-            height = command.KernelChooserParseResult?.GetValueForOption(chooser.HeightOption);
-            layoutEngine = command.KernelChooserParseResult?.GetValueForOption(chooser.LayoutEngineOption) ?? LayoutEngine.dot;
+            height = "600px";
         }
+        command.Parameters.TryGetValue("--layout-engine", out var layoutEngineString);
+        if (string.IsNullOrWhiteSpace(layoutEngineString))
+        {
+            layoutEngineString = "dot";
+        }
+        layoutEngine = Enum.Parse<LayoutEngine>(layoutEngineString, true);
+
 
         var code = GenerateHtml(command.Code, new Uri("https://cdn.jsdelivr.net/npm/@hpcc-js/wasm@1.16.1/dist/index.min.js", UriKind.Absolute), new Uri("https://cdn.jsdelivr.net/npm/@hpcc-js/wasm@1.16.1/dist", UriKind.Absolute), "1.16.1", _cacheBuster, width, height, layoutEngine);
         context.Display(code);
         return Task.CompletedTask;
 
     }
 
-    public override ChooseKernelDirective ChooseKernelDirective => _chooseKernelDirective ??= new ChooseDotLanguageKernelDirective(this);
 
     private IHtmlContent GenerateHtml(string commandCode, Uri libraryUri, Uri wasmFolder, string? libraryVersion,
         string cacheBuster, string? width, string? height, LayoutEngine layoutEngine)

src/DotLanguage.InteractiveExtension/DotLanguageKernel.cs

@@ -0,0 +1,13 @@
+namespace DotLanguage.InteractiveExtension;
+
+public enum LayoutEngine
+{
+    circo,
+    dot,
+    fdp,
+    sfdp,
+    neato,
+    osage,
+    patchwork,
+    twopi,
+}

src/DotLanguage.InteractiveExtension/LayoutEngine.cs

@@ -164,7 +164,7 @@ public async Task It_can_handle_multiple_statements()
         using var _ = CreateInMemoryDuckDB(out var connectionString);
 
         var result = await kernel.SubmitCodeAsync(
-            $"#!connect duckdb --kernel-name mydb  \"{connectionString}\"");
+            $"#!connect duckdb --kernel-name mydb --connection-string \"{connectionString}\"");
 
         result.Events
             .Should()

src/DuckDB.InteractiveExtension.Tests/KernelExtensionTests.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Parsing;
 using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using DuckDB.NET.Data;
 
 using Microsoft.DotNet.Interactive;
 using Microsoft.DotNet.Interactive.Commands;
+using Microsoft.DotNet.Interactive.Directives;
 using Microsoft.DotNet.Interactive.Events;
 using Microsoft.DotNet.Interactive.Formatting.TabularData;
 using Microsoft.DotNet.Interactive.ValueSharing;
@@ -33,11 +32,23 @@ public class DuckDBKernel : Kernel,
 
     public DuckDBKernel(string name, DuckDBConnection connection) : base(name)
     {
-        KernelInfo.LanguageName = "SQL";
+        KernelInfo.LanguageName = "KQL";
         _connection = connection;
         RegisterForDisposal(_connection);
     }
 
+    public override KernelSpecifierDirective KernelSpecifierDirective
+    {
+        get
+        {
+            var directive = base.KernelSpecifierDirective;
+
+            directive.Parameters.Add(new("--name"));
+
+            return directive;
+        }
+    }
+
     public async Task HandleAsync(SubmitCode submitCode, KernelInvocationContext context)
     {
         if (_connection.State != ConnectionState.Open)