More merge cleanup

Author: tkislan

src/notebooks/controllers/vscodeNotebookController.ts

@@ -71,7 +71,7 @@ import { initializeInteractiveOrNotebookTelemetryBasedOnUserAction } from '../..
 import { NotebookCellLanguageService } from '../languages/cellLanguageService';
 import { IDataScienceErrorHandler } from '../../kernels/errors/types';
 import { ITrustedKernelPaths } from '../../kernels/raw/finder/types';
-import { DeepnoteController } from '../../kernels/deepnote/deepnoteController';
+import { KernelController } from '../../kernels/kernelController';
 import { RemoteKernelReconnectBusyIndicator } from './remoteKernelReconnectBusyIndicator';
 import { LastCellExecutionTracker } from '../../kernels/execution/lastCellExecutionTracker';
 import type { IAnyMessageArgs } from '@jupyterlab/services/lib/kernel/kernel';
@@ -548,7 +548,7 @@ export class VSCodeNotebookController implements Disposable, IVSCodeNotebookCont
         // Creating these execution objects marks the cell as queued for execution (vscode will update cell UI).
         type CellExec = { cell: NotebookCell; exec: NotebookCellExecution };
         const cellExecs: CellExec[] = (this.cellQueue.get(doc) || []).map((cell) => {
-            const exec = this.createCellExecutionIfNecessary(cell, new DeepnoteController(this.controller));
+            const exec = this.createCellExecutionIfNecessary(cell, new KernelController(this.controller));
             return { cell, exec };
         });
         this.cellQueue.delete(doc);
@@ -561,7 +561,7 @@ export class VSCodeNotebookController implements Disposable, IVSCodeNotebookCont
 
         // Connect to a matching kernel if possible (but user may pick a different one)
         let currentContext: 'start' | 'execution' = 'start';
-        let controller: IKernelController = new DeepnoteController(this.controller);
+        let controller: IKernelController = new KernelController(this.controller);
         const lastCellExecutionTracker = this.serviceContainer.get<LastCellExecutionTracker>(LastCellExecutionTracker);
         let kernel: IKernel | undefined;
         try {

src/notebooks/deepnote/deepnoteSchemas.ts

@@ -1,7 +1,5 @@
 import { z } from 'zod';
 
-import { OUTPUT_BLOCK_METADATA_KEY } from './deepnoteConstants';
-
 export const DeepnoteChartBigNumberOutputSchema = z.object({
     title: z.string().nullish(),
     value: z.string().nullish(),
@@ -45,11 +43,5 @@ export const DeepnoteBigNumberMetadataSchema = z.object({
         .transform((val) => val ?? null)
 });
 
-export function getDeepnoteBlockMetadataSchema<T extends z.ZodTypeAny>(schema: T) {
-    return z.object({
-        [OUTPUT_BLOCK_METADATA_KEY]: schema
-    });
-}
-
 export type DeepnoteChartBigNumberOutput = z.infer<typeof DeepnoteChartBigNumberOutputSchema>;
 export type DeepnoteBigNumberMetadata = z.infer<typeof DeepnoteBigNumberMetadataSchema>;