Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update provenance when inputs change #3064

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Update provenance when inputs change #3064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa5953b
Update provenance when inputs change
charisk Nov 10, 2023
bb09771
Add comments and remove left-over console.log
charisk Nov 13, 2023
590e79c
Fix typo
charisk Nov 13, 2023
e17c7d4
Fix broken tests and add a new one
charisk Nov 13, 2023
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
21 changes: 21 additions & 0 deletions extensions/ql-vscode/src/model-editor/modeled-method.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,24 @@ export function isModelAccepted(
modeledMethod.provenance !== "ai-generated"
);
}

export function calculateNewProvenance(
modeledMethod: ModeledMethod | undefined,
) {
if (!modeledMethod || !modeledMethodSupportsProvenance(modeledMethod)) {
return "manual";
}

switch (modeledMethod.provenance) {
norascheuch marked this conversation as resolved.
Show resolved Hide resolved
case "df-generated":
return "df-generated";
case "df-manual":
return "df-manual";
case "ai-generated":
return "ai-manual";
case "ai-manual":
return "ai-manual";
default:
return "manual";
}
}
2 changes: 2 additions & 0 deletions extensions/ql-vscode/src/view/model-editor/ModelInputDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from "react";
import { ChangeEvent, useCallback, useMemo } from "react";
import {
ModeledMethod,
calculateNewProvenance,
isModelAccepted,
modeledMethodSupportsInput,
} from "../../model-editor/modeled-method";
Expand Down Expand Up @@ -53,6 +54,7 @@ export const ModelInputDropdown = ({

onChange({
...modeledMethod,
provenance: calculateNewProvenance(modeledMethod),
input: target.value,
});
},
Expand Down
2 changes: 2 additions & 0 deletions extensions/ql-vscode/src/view/model-editor/ModelKindDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ModeledMethodKind,
modeledMethodSupportsKind,
isModelAccepted,
calculateNewProvenance,
} from "../../model-editor/modeled-method";
import { getModelsAsDataLanguage } from "../../model-editor/languages";
import { QueryLanguage } from "../../common/query-language";
Expand Down Expand Up @@ -52,6 +53,7 @@ export const ModelKindDropdown = ({

onChange({
...modeledMethod,
provenance: calculateNewProvenance(modeledMethod),
kind,
});
},
Expand Down
2 changes: 2 additions & 0 deletions extensions/ql-vscode/src/view/model-editor/ModelOutputDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from "react";
import { ChangeEvent, useCallback, useMemo } from "react";
import {
ModeledMethod,
calculateNewProvenance,
isModelAccepted,
modeledMethodSupportsOutput,
} from "../../model-editor/modeled-method";
Expand Down Expand Up @@ -54,6 +55,7 @@ export const ModelOutputDropdown = ({

onChange({
...modeledMethod,
provenance: calculateNewProvenance(modeledMethod),
output: target.value,
});
},
Expand Down
15 changes: 3 additions & 12 deletions extensions/ql-vscode/src/view/model-editor/ModelTypeDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import * as React from "react";
import { ChangeEvent, useCallback } from "react";
import {
calculateNewProvenance,
isModelAccepted,
ModeledMethod,
modeledMethodSupportsProvenance,
ModeledMethodType,
Provenance,
} from "../../model-editor/modeled-method";
import { Method } from "../../model-editor/method";
import { createEmptyModeledMethod } from "../../model-editor/modeled-method-empty";
Expand Down Expand Up @@ -43,15 +42,6 @@ export const ModelTypeDropdown = ({
(e: ChangeEvent<HTMLSelectElement>) => {
const modelsAsDataLanguage = getModelsAsDataLanguage(language);

let newProvenance: Provenance = "manual";
if (modeledMethod && modeledMethodSupportsProvenance(modeledMethod)) {
if (modeledMethod.provenance === "df-generated") {
newProvenance = "df-manual";
} else if (modeledMethod.provenance === "ai-generated") {
newProvenance = "ai-manual";
}
}

const emptyModeledMethod = createEmptyModeledMethod(
e.target.value as ModeledMethodType,
method,
Expand All @@ -67,7 +57,8 @@ export const ModelTypeDropdown = ({
updatedModeledMethod.output = "ReturnValue";
}
if ("provenance" in updatedModeledMethod) {
updatedModeledMethod.provenance = newProvenance;
console.log("** model-type-dropdown modeled method", modeledMethod);
charisk marked this conversation as resolved.
Show resolved Hide resolved
updatedModeledMethod.provenance = calculateNewProvenance(modeledMethod);
}
if ("kind" in updatedModeledMethod) {
updatedModeledMethod.kind = "value";
Expand Down