Merge branch 'main' into shati-patel/get-current-query

Author: shati-patel

extensions/ql-vscode/package-lock.json

@@ -1759,7 +1759,7 @@
     "prepare": "cd ../.. && husky install"
   },
   "dependencies": {
-    "@octokit/plugin-retry": "^6.0.0",
+    "@octokit/plugin-retry": "^4.1.6",
     "@octokit/rest": "^19.0.4",
     "@vscode/codicons": "^0.0.31",
     "@vscode/debugadapter": "^1.59.0",
@@ -1851,13 +1851,13 @@
     "@vscode/vsce": "^2.19.0",
     "ansi-colors": "^4.1.1",
     "applicationinsights": "^2.3.5",
-    "cosmiconfig": "^7.1.0",
+    "cosmiconfig": "^8.2.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "del": "^6.0.0",
     "esbuild": "^0.15.15",
     "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-etc": "^2.0.2",
     "eslint-plugin-github": "^4.4.1",
     "eslint-plugin-jest-dom": "^5.0.1",
@@ -1881,7 +1881,7 @@
     "markdownlint-cli2-formatter-pretty": "^0.0.4",
     "mini-css-extract-plugin": "^2.6.1",
     "npm-run-all": "^4.1.5",
-    "patch-package": "^7.0.0",
+    "patch-package": "^8.0.0",
     "prettier": "^3.0.0",
     "storybook": "^7.1.0",
     "tar-stream": "^3.0.0",
@@ -1890,7 +1890,7 @@
     "ts-json-schema-generator": "^1.1.2",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.7.0",
-    "ts-unused-exports": "^9.0.5",
+    "ts-unused-exports": "^10.0.0",
     "typescript": "^5.0.2",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.0.1"

extensions/ql-vscode/package.json

@@ -512,6 +512,7 @@ interface AddModeledMethodsMessage {
 
 interface SetInProgressMethodsMessage {
   t: "setInProgressMethods";
+  packageName: string;
   inProgressMethods: string[];
 }
 
@@ -549,11 +550,16 @@ interface GenerateExternalApiMessage {
 
 interface GenerateExternalApiFromLlmMessage {
   t: "generateExternalApiFromLlm";
-  dependencyName: string;
+  packageName: string;
   externalApiUsages: ExternalApiUsage[];
   modeledMethods: Record<string, ModeledMethod>;
 }
 
+interface StopGeneratingExternalApiFromLlmMessage {
+  t: "stopGeneratingExternalApiFromLlm";
+  packageName: string;
+}
+
 interface ModelDependencyMessage {
   t: "modelDependency";
 }
@@ -575,4 +581,5 @@ export type FromDataExtensionsEditorMessage =
   | SaveModeledMethods
   | GenerateExternalApiMessage
   | GenerateExternalApiFromLlmMessage
+  | StopGeneratingExternalApiFromLlmMessage
   | ModelDependencyMessage;

extensions/ql-vscode/src/common/interface-types.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/config.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(

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

@@ -160,6 +160,7 @@ type AutoModelQueriesOptions = {
   queryStorageDir: string;
 
   progress: ProgressCallback;
+  cancellationTokenSource: CancellationTokenSource;
 };
 
 export type AutoModelQueriesResult = {
@@ -174,12 +175,8 @@ export async function runAutoModelQueries({
   databaseItem,
   queryStorageDir,
   progress,
+  cancellationTokenSource,
 }: AutoModelQueriesOptions): Promise<AutoModelQueriesResult | undefined> {
-  // maxStep for this part is 1500
-  const maxStep = 1500;
-
-  const cancellationTokenSource = new CancellationTokenSource();
-
   const qlpack = await qlpackOfDatabase(cliServer, databaseItem);
 
   // CodeQL needs to have access to the database to be able to retrieve the
@@ -208,12 +205,6 @@ export async function runAutoModelQueries({
     await cliServer.resolveQlpacks(additionalPacks, true),
   );
 
-  progress({
-    step: 0,
-    maxStep,
-    message: "Finding candidates and examples",
-  });
-
   const candidates = await runAutoModelQuery({
     mode,
     queryTag: "candidates",
@@ -225,13 +216,7 @@ export async function runAutoModelQueries({
     additionalPacks,
     extensionPacks,
     queryStorageDir,
-    progress: (update) => {
-      progress({
-        step: update.step,
-        maxStep,
-        message: "Finding candidates and examples",
-      });
-    },
+    progress,
     token: cancellationTokenSource.token,
   });