Include output from interactive cells in Foyle requests

src/extension/ai/converters.ts

@@ -9,6 +9,31 @@ import { ServerLifecycleIdentity, getServerConfigurationValue } from '../../util
 import { Serializer } from '../../types'
 import * as serializerTypes from '../grpc/serializerTypes'
 import * as serializer from '../serializer'
+import { Kernel } from '../kernel'
+
+import * as protos from './protos'
+
+// Converter provides converstion routines from vscode data types to protocol buffer types.
+// It is a class because in order to handle the conversion we need to keep track of the kernel
+// because we need to add execution information to the cells before serializing.
+export class Converter {
+  kernel: Kernel
+  constructor(kernel: Kernel) {
+    this.kernel = kernel
+  }
+
+  // notebokDataToProto converts a VSCode NotebookData to a RunMe Notebook proto.
+  // It adds execution information to the cells before converting.
+  public async notebookDataToProto(notebookData: vscode.NotebookData): Promise<parser_pb.Notebook> {
+    // We need to add the execution info to the cells so that the AI model can use that information.
+    const cellDataWithExec = await serializer.SerializerBase.addExecInfo(notebookData, this.kernel)
+    let notebookDataWithExec = new vscode.NotebookData(cellDataWithExec)
+    // marshalNotebook returns a protocol buffer using the ts client library from buf we need to
+    // convert it to es
+    let notebookProto = serializer.GrpcSerializer.marshalNotebook(notebookDataWithExec)
+    return protos.notebookTSToES(notebookProto)
+  }
+}
 
 // cellToCellData converts a NotebookCell to a NotebookCellData.
 // NotebookCell is an interface used by the editor.

src/extension/ai/generate.ts

@@ -6,9 +6,9 @@ import {
   GenerateCellsResponse,
 } from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
 
-import * as serializer from '../serializer'
 import getLogger from '../logger'
 
+import { Converter } from './converters'
 import * as protos from './protos'
 import * as converters from './converters'
 const log = getLogger('AIGenerate')
@@ -17,9 +17,11 @@ const log = getLogger('AIGenerate')
 // It generates a single completion
 export class CompletionGenerator {
   client: PromiseClient<typeof AIService>
+  converter: Converter
 
-  constructor(client: PromiseClient<typeof AIService>) {
+  constructor(client: PromiseClient<typeof AIService>, converter: Converter) {
     this.client = client
+    this.converter = converter
   }
 
   public generateCompletion = async () => {
@@ -43,10 +45,10 @@ export class CompletionGenerator {
     let cellData = editor?.notebook.getCells().map((cell) => converters.cellToCellData(cell))
     let notebookData = new vscode.NotebookData(cellData)
 
-    let notebookProto = serializer.GrpcSerializer.marshalNotebook(notebookData)
+    let notebookProto = await this.converter.notebookDataToProto(notebookData)
 
     const req = new GenerateCellsRequest()
-    req.notebook = protos.notebookTSToES(notebookProto)
+    req.notebook = notebookProto
     req.selectedIndex = lastSelectedCell
 
     this.client

src/extension/ai/ghost.ts

@@ -3,7 +3,6 @@ import * as agent_pb from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
 import { StreamGenerateRequest_Trigger } from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
 
 import getLogger from '../logger'
-import * as serializer from '../serializer'
 import { RUNME_CELL_ID } from '../constants'
 
 import * as converters from './converters'
@@ -47,15 +46,16 @@ const ghostDecoration = vscode.window.createTextEditorDecorationType({
 // the cell contents have changed.
 export class GhostCellGenerator implements stream.CompletionHandlers {
   private notebookState: Map<vscode.Uri, NotebookState>
-
+  private converter: converters.Converter
   // contextID is the ID of the context we are generating completions for.
   // It is used to detect whether a completion response is stale and should be
   // discarded because the context has changed.
 
-  constructor() {
+  constructor(converter: converters.Converter) {
     this.notebookState = new Map<vscode.Uri, NotebookState>()
     // Generate a random context ID. This should be unnecessary because presumable the event to change
     // the active cell will be sent before any requests are sent but it doesn't hurt to be safe.
+    this.converter = converter
   }
 
   // Updated method to check and initialize notebook state
@@ -70,10 +70,10 @@ export class GhostCellGenerator implements stream.CompletionHandlers {
   // This is a stateful transformation because we need to decide whether to send the full document or
   // the incremental changes.  It will return a null request if the event should be ignored or if there
   // is an error preventing it from computing a proper request.
-  buildRequest(
+  async buildRequest(
     cellChangeEvent: stream.CellChangeEvent,
     firstRequest: boolean,
-  ): agent_pb.StreamGenerateRequest | null {
+  ): Promise<agent_pb.StreamGenerateRequest | null> {
     // TODO(jeremy): Is there a more efficient way to find the cell and notebook?
     // Can we cache it in the class? Since we keep track of notebooks in NotebookState
     // Is there a way we can go from the URI of the cell to the URI of the notebook directly
@@ -86,7 +86,7 @@ export class GhostCellGenerator implements stream.CompletionHandlers {
     if (notebook === undefined) {
       log.error(`notebook for cell ${cellChangeEvent.notebookUri} NOT found`)
       // TODO(jermey): Should we change the return type to be nullable?
-      return null
+      return Promise.resolve(null)
     }
 
     // Get the notebook state; this will initialize it if this is the first time we
@@ -121,39 +121,34 @@ export class GhostCellGenerator implements stream.CompletionHandlers {
       let cellData = notebook.getCells().map((cell) => converters.cellToCellData(cell))
       let notebookData = new vscode.NotebookData(cellData)
 
-      let notebookProto = serializer.GrpcSerializer.marshalNotebook(notebookData)
+      let notebookProto = await this.converter.notebookDataToProto(notebookData)
       let request = new agent_pb.StreamGenerateRequest({
         contextId: SessionManager.getManager().getID(),
         request: {
           case: 'fullContext',
           value: new agent_pb.FullContext({
-            notebook: protos.notebookTSToES(notebookProto),
+            notebook: notebookProto,
             selected: matchedCell.index,
             notebookUri: notebook.uri.toString(),
           }),
         },
-        trigger: cellChangeEvent.trigger,
       })
-
       return request
     } else {
       let cellData = converters.cellToCellData(matchedCell)
       let notebookData = new vscode.NotebookData([cellData])
 
-      let notebookProto = serializer.GrpcSerializer.marshalNotebook(notebookData)
-      let notebook = protos.notebookTSToES(notebookProto)
       // Generate an update request
+      let notebookProto = await this.converter.notebookDataToProto(notebookData)
       let request = new agent_pb.StreamGenerateRequest({
         contextId: SessionManager.getManager().getID(),
         request: {
           case: 'update',
           value: new agent_pb.UpdateContext({
-            cell: notebook.cells[0],
+            cell: notebookProto.cells[0],
           }),
         },
-        trigger: cellChangeEvent.trigger,
       })
-
       return request
     }
   }
@@ -321,7 +316,7 @@ export class CellChangeEventGenerator {
     this.streamCreator = streamCreator
   }
 
-  handleOnDidChangeNotebookCell = (event: vscode.TextDocumentChangeEvent) => {
+  handleOnDidChangeNotebookCell = async (event: vscode.TextDocumentChangeEvent) => {
     if (![vsCodeCellScheme].includes(event.document.uri.scheme)) {
       return
     }
@@ -347,7 +342,7 @@ export class CellChangeEventGenerator {
       return
     }
 
-    this.streamCreator.handleEvent(
+    await this.streamCreator.handleEvent(
       new stream.CellChangeEvent(
         notebook.uri.toString(),
         matchedCell.index,
@@ -384,7 +379,13 @@ export class CellChangeEventGenerator {
   }
 
   handleOnDidChangeNotebookDocument = (event: vscode.NotebookDocumentChangeEvent) => {
-    event.cellChanges.forEach((change) => {
+    // N.B. For non-interactive cells this will trigger each time the output is updated.
+    // For interactive cells this doesn't appear to trigger each time the cell output is updated.
+    // For example, if you have a long running command (e.g. a bash for loop with a sleep that
+    // echos a message on each iteration) then this won't trigger on each iteration for
+    // an interactive cell but will for non-interactive.
+    event.cellChanges.forEach(async (change) => {
+      log.info(`handleOnDidChangeNotebookDocument: change: ${change}`)
       if (change.outputs !== undefined) {
         // If outputs change then we want to trigger completions.
 
@@ -399,7 +400,8 @@ export class CellChangeEventGenerator {
         // In particular its possible that the cell that changed is not the active cell. Therefore
         // we may not want to generate completions for it. For example, you can have multiple cells
         // running. So in principle the active cell could be different from the cell that changed.
-        this.streamCreator.handleEvent(
+        //
+        await this.streamCreator.handleEvent(
           new stream.CellChangeEvent(
             change.cell.notebook.uri.toString(),
             change.cell.index,

src/extension/ai/manager.ts

@@ -3,8 +3,10 @@ import { createPromiseClient, PromiseClient, Transport } from '@connectrpc/conne
 import { createConnectTransport } from '@connectrpc/connect-node'
 import { AIService } from '@buf/jlewi_foyle.connectrpc_es/foyle/v1alpha1/agent_connect'
 
+import { Kernel } from '../kernel'
 import getLogger from '../logger'
 
+import { Converter } from './converters'
 import * as ghost from './ghost'
 import * as stream from './stream'
 import * as generate from './generate'
@@ -18,14 +20,17 @@ export class AIManager {
   subscriptions: vscode.Disposable[] = []
   client: PromiseClient<typeof AIService>
   completionGenerator: generate.CompletionGenerator
+  converter: Converter
 
-  constructor() {
+  constructor(kernel: Kernel) {
     this.log = getLogger('AIManager')
     this.log.info('AI: Initializing AI Manager')
     const config = vscode.workspace.getConfiguration('runme.experiments')
     const autoComplete = config.get<boolean>('aiAutoCell', false)
     this.client = this.createAIClient()
-    this.completionGenerator = new generate.CompletionGenerator(this.client)
+
+    this.converter = new Converter(kernel)
+    this.completionGenerator = new generate.CompletionGenerator(this.client, this.converter)
     if (autoComplete) {
       this.registerGhostCellEvents()
 
@@ -47,7 +52,7 @@ export class AIManager {
   // as well as when cells change. This is used to create ghost cells.
   registerGhostCellEvents() {
     this.log.info('AI: Enabling AutoCell Generation')
-    let cellGenerator = new ghost.GhostCellGenerator()
+    let cellGenerator = new ghost.GhostCellGenerator(this.converter)
 
     // Create a stream creator. The StreamCreator is a class that effectively windows events
     // and turns each window into an AsyncIterable of streaming requests.
@@ -74,6 +79,8 @@ export class AIManager {
       vscode.window.onDidChangeActiveTextEditor(cellGenerator.handleOnDidChangeActiveTextEditor),
     )
 
+    // We use onDidChangeNotebookDocument to listen for changes to outputs.
+    // We use this to trigger updates in response to a cell's output being updated.
     this.subscriptions.push(
       vscode.workspace.onDidChangeNotebookDocument(
         eventGenerator.handleOnDidChangeNotebookDocument,

src/extension/ai/stream.ts

@@ -21,7 +21,7 @@ export interface CompletionHandlers {
   buildRequest: (
     cellChangeEvent: CellChangeEvent,
     firstRequest: boolean,
-  ) => StreamGenerateRequest | null
+  ) => Promise<StreamGenerateRequest | null>
 
   // processResponse is a function that processes a StreamGenerateResponse
   processResponse: (response: StreamGenerateResponse) => void
@@ -75,15 +75,15 @@ export class StreamCreator {
   // handleEvent processes a request
   // n.b we use arror function definition to ensure this gets properly bound
   // see https://www.typescriptlang.org/docs/handbook/2/classes.html#this-at-runtime-in-classes
-  handleEvent = (event: CellChangeEvent): void => {
+  handleEvent = async (event: CellChangeEvent): Promise<void> => {
     // We need to generate a new request
     let firstRequest = false
     if (this.lastIterator === undefined || this.lastIterator === null) {
       firstRequest = true
     }
 
     log.info('handleEvent: building request')
-    let req = this.handlers.buildRequest(event, firstRequest)
+    let req = await this.handlers.buildRequest(event, firstRequest)
 
     if (req === null) {
       log.info(`Notebook: ${event.notebookUri}; no request generated`)

src/extension/extension.ts

@@ -195,7 +195,7 @@ export class RunmeExtension {
     }
 
     // Start the AIManager. This will enable the AI services if the user has enabled them.
-    const aiManager = new manager.AIManager()
+    const aiManager = new manager.AIManager(kernel)
     // We need to hang onto a reference to the AIManager so it doesn't get garbage collected until the
     // extension is deactivated.
     context.subscriptions.push(aiManager)