mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Drop v2 from automodel code

Browse Source
This commit is contained in:
Charis Kyriakou
2023-08-10 16:04:03 +00:00
parent 2a5b6ea95b
commit feb4bb61fe
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/data-extensions-editor/auto-model-api-v2.ts → extensions/ql-vscode/src/data-extensions-editor/auto-model-api.ts
View File

@@ -17,7 +17,7 @@ export interface ModelResponse {
models: string;
}
export async function autoModelV2(
export async function autoModel(
credentials: Credentials,
request: ModelRequest,
): Promise<ModelResponse> {

4
extensions/ql-vscode/src/data-extensions-editor/auto-model-v2.ts → extensions/ql-vscode/src/data-extensions-editor/auto-model.ts
View File

@@ -1,4 +1,4 @@
import { AutomodelMode, ModelRequest } from "./auto-model-api-v2";
import { AutomodelMode, ModelRequest } from "./auto-model-api";
import { Mode } from "./shared/mode";
import { AutoModelQueriesResult } from "./auto-model-codeml-queries";
import { assertNever } from "../common/helpers-pure";
@@ -66,7 +66,7 @@ export async function encodeSarif(log: Sarif.Log): Promise<string> {
return compressed.toString("base64");
}
export async function createAutoModelV2Request(
export async function createAutoModelRequest(
mode: Mode,
result: AutoModelQueriesResult,
): Promise<ModelRequest> {

8
extensions/ql-vscode/src/data-extensions-editor/auto-modeler.ts
View File

@@ -3,10 +3,10 @@ import { ModeledMethod } from "./modeled-method";
import { extLogger } from "../common/logging/vscode";
import { load as loadYaml } from "js-yaml";
import { ProgressCallback, withProgress } from "../common/vscode/progress";
import { createAutoModelV2Request, getCandidates } from "./auto-model-v2";
import { createAutoModelRequest, getCandidates } from "./auto-model";
import { runAutoModelQueries } from "./auto-model-codeml-queries";
import { loadDataExtensionYaml } from "./yaml";
import { ModelRequest, ModelResponse, autoModelV2 } from "./auto-model-api-v2";
import { ModelRequest, ModelResponse, autoModel } from "./auto-model-api";
import { RequestError } from "@octokit/request-error";
import { showAndLogExceptionWithTelemetry } from "../common/logging";
import { redactableError } from "../common/errors";
@@ -183,7 +183,7 @@ export class AutoModeler {
return;
}
const request = await createAutoModelV2Request(mode, usages);
const request = await createAutoModelRequest(mode, usages);
void extLogger.log("Calling auto-model API");
@@ -229,7 +229,7 @@ export class AutoModeler {
request: ModelRequest,
): Promise<ModelResponse | null> {
try {
return await autoModelV2(this.app.credentials, request);
return await autoModel(this.app.credentials, request);
} catch (e) {
if (e instanceof RequestError && e.status === 429) {
void showAndLogExceptionWithTelemetry(

4
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
View File

@@ -168,7 +168,7 @@ export class DataExtensionsEditorView extends AbstractWebview<
break;
case "generateExternalApiFromLlm":
await this.generateModeledMethodsFromLlmV2(
await this.generateModeledMethodsFromLlm(
msg.packageName,
msg.externalApiUsages,
msg.modeledMethods,
@@ -374,7 +374,7 @@ export class DataExtensionsEditorView extends AbstractWebview<
);
}
private async generateModeledMethodsFromLlmV2(
private async generateModeledMethodsFromLlm(
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,

12
extensions/ql-vscode/test/unit-tests/data-extensions-editor/auto-model-v2.test.ts → extensions/ql-vscode/test/unit-tests/data-extensions-editor/auto-model.test.ts
View File

@@ -1,17 +1,17 @@
import {
createAutoModelV2Request,
createAutoModelRequest,
encodeSarif,
getCandidates,
} from "../../../src/data-extensions-editor/auto-model-v2";
} from "../../../src/data-extensions-editor/auto-model";
import { Mode } from "../../../src/data-extensions-editor/shared/mode";
import { AutomodelMode } from "../../../src/data-extensions-editor/auto-model-api-v2";
import { AutomodelMode } from "../../../src/data-extensions-editor/auto-model-api";
import { AutoModelQueriesResult } from "../../../src/data-extensions-editor/auto-model-codeml-queries";
import * as sarif from "sarif";
import { gzipDecode } from "../../../src/common/zlib";
import { ExternalApiUsage } from "../../../src/data-extensions-editor/external-api-usage";
import { ModeledMethod } from "../../../src/data-extensions-editor/modeled-method";
describe("createAutoModelV2Request", () => {
describe("createAutoModelRequest", () => {
const createSarifLog = (queryId: string): sarif.Log => {
return {
version: "2.1.0",
@@ -68,14 +68,14 @@ describe("createAutoModelV2Request", () => {
};
it("creates a matching request", async () => {
expect(await createAutoModelV2Request(Mode.Application, result)).toEqual({
expect(await createAutoModelRequest(Mode.Application, result)).toEqual({
mode: AutomodelMode.Application,
candidates: await encodeSarif(result.candidates),
});
});
it("can decode the SARIF", async () => {
const request = await createAutoModelV2Request(Mode.Application, result);
const request = await createAutoModelRequest(Mode.Application, result);
const decoded = Buffer.from(request.candidates, "base64");
const decompressed = await gzipDecode(decoded);
const json = decompressed.toString("utf-8");