Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extensions/ql-vscode/src/common/interface-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -549,14 +549,14 @@ interface GenerateExternalApiMessage {

interface GenerateExternalApiFromLlmMessage {
t: "generateExternalApiFromLlm";
dependencyName: string;
packageName: string;
externalApiUsages: ExternalApiUsage[];
modeledMethods: Record<string, ModeledMethod>;
}

interface StopGeneratingExternalApiFromLlmMessage {
t: "stopGeneratingExternalApiFromLlm";
dependencyName: string;
packageName: string;
}

interface ModelDependencyMessage {
Expand Down
24 changes: 12 additions & 12 deletions extensions/ql-vscode/src/data-extensions-editor/auto-modeler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,34 @@ export class AutoModeler {
}

public async startModeling(
dependency: string,
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
mode: Mode,
): Promise<void> {
if (this.jobs.has(dependency)) {
if (this.jobs.has(packageName)) {
return;
}

const cancellationTokenSource = new CancellationTokenSource();
this.jobs.set(dependency, cancellationTokenSource);
this.jobs.set(packageName, cancellationTokenSource);

try {
await this.modelDependency(
dependency,
await this.modelPackage(
packageName,
externalApiUsages,
modeledMethods,
mode,
cancellationTokenSource,
);
} finally {
this.jobs.delete(dependency);
this.jobs.delete(packageName);
}
}

public async stopModeling(dependency: string): Promise<void> {
void extLogger.log(`Stopping modeling for dependency ${dependency}`);
const cancellationTokenSource = this.jobs.get(dependency);
public async stopModeling(packageName: string): Promise<void> {
void extLogger.log(`Stopping modeling for package ${packageName}`);
const cancellationTokenSource = this.jobs.get(packageName);
if (cancellationTokenSource) {
cancellationTokenSource.cancel();
}
Expand All @@ -81,14 +81,14 @@ export class AutoModeler {
}
}

private async modelDependency(
dependency: string,
private async modelPackage(
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
mode: Mode,
cancellationTokenSource: CancellationTokenSource,
): Promise<void> {
void extLogger.log(`Modeling dependency ${dependency}`);
void extLogger.log(`Modeling package ${packageName}`);
await withProgress(async (progress) => {
const maxStep = 3000;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export class DataExtensionsEditorView extends AbstractWebview<
case "generateExternalApiFromLlm":
if (useLlmGenerationV2()) {
await this.generateModeledMethodsFromLlmV2(
msg.dependencyName,
msg.packageName,
msg.externalApiUsages,
msg.modeledMethods,
);
Expand All @@ -189,7 +189,7 @@ export class DataExtensionsEditorView extends AbstractWebview<
}
break;
case "stopGeneratingExternalApiFromLlm":
await this.autoModeler.stopModeling(msg.dependencyName);
await this.autoModeler.stopModeling(msg.packageName);
break;
case "modelDependency":
await this.modelDependency();
Expand Down Expand Up @@ -459,12 +459,12 @@ export class DataExtensionsEditorView extends AbstractWebview<
}

private async generateModeledMethodsFromLlmV2(
dependency: string,
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
): Promise<void> {
await this.autoModeler.startModeling(
dependency,
packageName,
externalApiUsages,
modeledMethods,
this.mode,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,24 +227,24 @@ export function DataExtensionsEditor({

const onGenerateFromLlmClick = useCallback(
(
dependencyName: string,
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
) => {
vscode.postMessage({
t: "generateExternalApiFromLlm",
dependencyName,
packageName,
externalApiUsages,
modeledMethods,
});
},
[],
);

const onStopGenerateFromLlmClick = useCallback((dependencyName: string) => {
const onStopGenerateFromLlmClick = useCallback((packageName: string) => {
vscode.postMessage({
t: "stopGeneratingExternalApiFromLlm",
dependencyName,
packageName,
});
}, []);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ type Props = {
modeledMethods: Record<string, ModeledMethod>,
) => void;
onGenerateFromLlmClick: (
dependencyName: string,
packageName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
) => void;
onStopGenerateFromLlmClick: (dependencyName: string) => void;
onStopGenerateFromLlmClick: (packageName: string) => void;
onGenerateFromSourceClick: () => void;
onModelDependencyClick: () => void;
};
Expand Down