Merge branch 'main' into robertbrignull/ResultTables-Header

Author: robertbrignull

extensions/ql-vscode/src/config.ts

@@ -704,7 +704,6 @@ export function showQueriesPanel(): boolean {
 
 const DATA_EXTENSIONS = new Setting("dataExtensions", ROOT_SETTING);
 const LLM_GENERATION = new Setting("llmGeneration", DATA_EXTENSIONS);
-const LLM_GENERATION_V2 = new Setting("llmGenerationV2", DATA_EXTENSIONS);
 const FRAMEWORK_MODE = new Setting("frameworkMode", DATA_EXTENSIONS);
 const DISABLE_AUTO_NAME_EXTENSION_PACK = new Setting(
   "disableAutoNameExtensionPack",
@@ -724,10 +723,6 @@ export function showLlmGeneration(): boolean {
   return !!LLM_GENERATION.getValue<boolean>();
 }
 
-export function useLlmGenerationV2(): boolean {
-  return !!LLM_GENERATION_V2.getValue<boolean>();
-}
-
 export function enableFrameworkMode(): boolean {
   return !!FRAMEWORK_MODE.getValue<boolean>();
 }

extensions/ql-vscode/src/data-extensions-editor/auto-model-api-v2.ts

@@ -1,40 +1,20 @@
 import { Credentials } from "../common/authentication";
 import { OctokitResponse } from "@octokit/types";
 
-export enum ClassificationType {
-  Unknown = "CLASSIFICATION_TYPE_UNKNOWN",
-  Neutral = "CLASSIFICATION_TYPE_NEUTRAL",
-  Source = "CLASSIFICATION_TYPE_SOURCE",
-  Sink = "CLASSIFICATION_TYPE_SINK",
-  Summary = "CLASSIFICATION_TYPE_SUMMARY",
-}
-
-export interface Classification {
-  type: ClassificationType;
-  kind: string;
-  explanation: string;
-}
-
-export interface Method {
-  package: string;
-  type: string;
-  name: string;
-  signature: string;
-  usages: string[];
-  classification?: Classification;
-  input?: string;
-  output?: string;
+export enum AutomodelMode {
+  Unspecified = "AUTOMODEL_MODE_UNSPECIFIED",
+  Framework = "AUTOMODEL_MODE_FRAMEWORK",
+  Application = "AUTOMODEL_MODE_APPLICATION",
 }
 
 export interface ModelRequest {
-  language: string;
-  candidates: Method[];
-  samples: Method[];
+  mode: AutomodelMode;
+  // Base64-encoded GZIP-compressed SARIF log
+  candidates: string;
 }
 
 export interface ModelResponse {
-  language: string;
-  predicted?: Method[];
+  models: string;
 }
 
 export async function autoModel(