Skip to content

Commit f712c69

Browse files
lumburovskalinalumburovskalina
committed
Removed filters for modelcallbacks on data browser and on labeling page
1 parent d749918 commit f712c69

File tree

16 files changed

+6
-94
lines changed

16 files changed

+6
-94
lines changed

‎src/components/projects/projectId/data-browser/SearchGroups.tsx‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export default function SearchGroups() {
6565
const [saveAttributeType, setSaveAttributeType] = useState(null);
6666
const [manualLabels, setManualLabels] = useState([]);
6767
const [weakSupervisionLabels, setWeakSupervisionLabels] = useState([]);
68-
const [modelCallBacksLabels, setModelCallBacksLabels] = useState([]);
6968
const [backgroundColors, setBackgroundColors] = useState<string[]>([]);
7069
const [currentWeakSupervisionRun, setCurrentWeakSupervisionRun] = useState(null);
7170
const [selectedHeuristicsWS, setSelectedHeuristicsWS] = useState<string[]>([]);
@@ -729,34 +728,6 @@ export default function SearchGroups() {
729728
</div>
730729
</div>
731730

732-
<div className="mt-2">Model callback</div>
733-
{fullSearchStore[group.key].groupElements['modelCallbackLabels'] && fullSearchStore[group.key].groupElements['modelCallbackLabels'].length == 0 ? (<ButtonLabelsDisabled />) : (
734-
<KernDropdown options={fullSearchStore[group.key].groupElements['modelCallbackLabels'] ?? []} buttonName={modelCallBacksLabels.length == 0 ? 'None selected' : modelCallBacksLabels.join(', ')} hasCheckboxesThreeStates={true}
735-
dropdownWidth="w-80" selectedOption={(option: any) => {
736-
const labels = [...modelCallBacksLabels, option.name]
737-
setModelCallBacksLabels(labels);
738-
updateLabelsFullSearch(option, group.key, 'modelCallbackLabels');
739-
}} />
740-
)}
741-
<div className="flex-grow min-w-0 mt-1">
742-
<div className="flex flex-row items-center whitespace-nowrap">
743-
<span className="text-sm mr-0.5 font-dmMono">CONFIDENCE BETWEEN</span>
744-
<input disabled={fullSearchStore[group.key].groupElements['modelCallbackLabels'].length == 0}
745-
onChange={(e) => changeConfidence(e, 'lower', group.key, 'modelCallbackConfidence')}
746-
value={fullSearchStore[group.key].groupElements['modelCallbackConfidence'] ? fullSearchStore[group.key].groupElements['modelCallbackConfidence']['lower'] : 0}
747-
className="h-8 w-11 text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-2 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100 disabled:opacity-50 disabled:cursor-not-allowed" />
748-
<span className="text-sm mx-0.5 font-dmMono">% AND</span>
749-
<input disabled={fullSearchStore[group.key].groupElements['modelCallbackLabels'].length == 0}
750-
onChange={(e) => changeConfidence(e, 'upper', group.key, 'modelCallbackConfidence')}
751-
value={fullSearchStore[group.key].groupElements['modelCallbackConfidence'] ? fullSearchStore[group.key].groupElements['modelCallbackConfidence']['upper'] : 0}
752-
className="h-8 w-11 text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-2 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100 disabled:opacity-50 disabled:cursor-not-allowed" />
753-
<span className="text-sm mx-0.5 font-dmMono">%</span>
754-
{fullSearchStore[group.key].groupElements['modelCallbackConfidence'] && fullSearchStore[group.key].groupElements['modelCallbackConfidence']['active'] && <Tooltip content={TOOLTIPS_DICT.DATA_BROWSER.CLEAR_MC_CONFIDENCE} color="invert">
755-
<IconFilterOff className="text-red-700 cursor-pointer" onClick={() => clearConfidence(group.key, 'modelCallbackConfidence')} />
756-
</Tooltip>}
757-
</div>
758-
</div>
759-
760731
<div className="mt-2 font-semibold">Heuristics</div>
761732
{fullSearchStore[group.key].groupElements['heuristics'] && fullSearchStore[group.key].groupElements['heuristics'].length == 0 ? (<div className="text-sm text-gray-400">No heuristics associated with this task</div>) : (<div className="flex flex-col">
762733
<div className="flex items-center cursor-pointer border-t border-t-gray-300 border-b border-b-gray-300" onClick={() => updateIsDifferent(group.key, fullSearchStore[group.key].groupElements['isWithDifferentResults'])}>

‎src/components/projects/projectId/labeling/sessionId/sub-components/HeaderDisplay.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ export default function HeaderDisplay(props: HeaderDisplayProps) {
140140
{settings.task[projectId] && settings.task[projectId][task.id] && settings.task[projectId][task.id][labelId] && <div className="grid grid-cols-2 gap-0.5">
141141
<div className={`w-2.5 h-2.5 border rounded-full ${settings.task[projectId][task.id][labelId].showManual ? task.labels[labelId].color.backgroundColor : 'bg-white'} ${task.labels[labelId].color.borderColor}`}></div>
142142
<div className={`w-2.5 h-2.5 border rounded-full ${settings.task[projectId][task.id][labelId].showWeakSupervision ? task.labels[labelId].color.backgroundColor : 'bg-white'} ${task.labels[labelId].color.borderColor}`}></div>
143-
<div className={`w-2.5 h-2.5 border rounded-full ${settings.task[projectId][task.id][labelId].showModel ? task.labels[labelId].color.backgroundColor : 'bg-white'} ${task.labels[labelId].color.borderColor}`}></div>
144143
<div className={`w-2.5 h-2.5 border rounded-full ${settings.task[projectId][task.id][labelId].showHeuristics ? task.labels[labelId].color.backgroundColor : 'bg-white'} ${task.labels[labelId].color.borderColor}`}></div>
145144
</div>}
146145
<div className="truncate" style={{ maxWidth: '260px' }}>{task.labels[labelId].name}</div>

‎src/components/projects/projectId/labeling/sessionId/sub-components/InfoLabelBoxModal.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ export default function InfoLabelBoxModal(props: InfoLabelBoxModalProps) {
3232
<span className="text-sm text-gray-500">Weakly supervised labels</span>
3333
<span className="cursor-pointer justify-self-center h-5 w-5"><input type="checkbox" onChange={() => props.toggleLabelDisplaySetting('showWeakSupervision')}
3434
checked={settings.task[projectId][modalInfo.labelSettingsLabel.taskId][modalInfo.labelSettingsLabel.id].showWeakSupervision} /></span>
35-
<span className="text-sm text-gray-500">MC</span>
36-
<span className="text-sm text-gray-500">Model callback labels</span>
37-
<span className="cursor-pointer justify-self-center h-5 w-5"><input type="checkbox" onChange={() => props.toggleLabelDisplaySetting('showModel')}
38-
checked={settings.task[projectId][modalInfo.labelSettingsLabel.taskId][modalInfo.labelSettingsLabel.id].showModel} /></span>
3935
<span className="text-sm text-gray-500">H</span>
4036
<span className="text-sm text-gray-500">Heuristic labels</span>
4137
<span className="cursor-pointer justify-self-center h-5 w-5"><input type="checkbox" onChange={() => props.toggleLabelDisplaySetting('showHeuristics')}

‎src/components/projects/projectId/labeling/sessionId/sub-components/LabelSettingsBox.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ export default function LabelSettingsBox(props: LabelSettingsBoxProps) {
5454
<input className="h-4 w-4 cursor-pointer" type="checkbox" onChange={() => toggleLabelDisplaySetting('showWeakSupervision')}
5555
checked={settings.task[projectId][props.labelSettingsLabel.taskId][props.labelSettingsLabel.id].showWeakSupervision} />
5656
</div>
57-
<div className="flex flex-row flex-nowrap items-center gap-x-1 cursor-pointer">
58-
<span className="font-semibold text-sm text-gray-500">MC</span>
59-
<input className="h-4 w-4 cursor-pointer" type="checkbox" onChange={() => toggleLabelDisplaySetting('showModel')}
60-
checked={settings.task[projectId][props.labelSettingsLabel.taskId][props.labelSettingsLabel.id].showModel} />
61-
</div>
6257
<div className="flex flex-row flex-nowrap items-center gap-x-1 cursor-pointer">
6358
<span className="font-semibold text-sm text-gray-500">H</span>
6459
<input className="h-4 w-4 cursor-pointer" type="checkbox" onChange={() => toggleLabelDisplaySetting('showHeuristics')}

‎src/components/projects/projectId/labeling/sessionId/sub-components/QuickButtons.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export default function QuickButtons(props: QuickButtonsProps) {
3939
return (<div className="flex flex-row flex-wrap gap-2 items-center">
4040
<QuickButton attributeName="showManual" caption="Manual" dataTipCaption="manual" hoverClass="labelOverlayManual" setAllLabelDisplaySetting={() => setAllLabelDisplaySetting(true, 'showManual')} />
4141
<QuickButton attributeName="showWeakSupervision" caption="Weak Supervision" dataTipCaption="weak supervision" hoverClass="labelOverlayWeakSupervision" setAllLabelDisplaySetting={() => setAllLabelDisplaySetting(true, 'showWeakSupervision')} />
42-
<QuickButton attributeName="showModel" caption="Model Callback" dataTipCaption="model callback" hoverClass="labelOverlayHeuristic" setAllLabelDisplaySetting={() => setAllLabelDisplaySetting(true, 'showModel')} />
4342
<QuickButton attributeName="showHeuristics" caption="Heuristic" dataTipCaption="heuristic" hoverClass="labelOverlayModel" setAllLabelDisplaySetting={() => setAllLabelDisplaySetting(true, 'showHeuristics')} />
4443
<button onClick={() => setAllLabelDisplaySetting(true)}
4544
className="text-sm font-medium px-2 py-0.5 rounded-md border focus:outline-none cursor-pointer flex flex-row flex-no-wrap gap-x-1 items-center">

‎src/styles/tailwind.css‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@
9292
background-repeat: repeat;
9393
}
9494

95-
.labelOverlayModel {
96-
background-color: #ffffff;
97-
background-image: repeating-linear-gradient(45deg, #e2e8f0 25%, transparent 25%, transparent 75%, #e2e8f0 75%, #e2e8f0), repeating-linear-gradient(45deg, #e2e8f0 25%, #ffffff 25%, #ffffff 75%, #e2e8f0 75%, #e2e8f0);
98-
background-position: 0 0, 10px 10px;
99-
background-size: 20px 20px;
100-
}
101-
10295
.label-text {
10396
font-size: 0.875rem;
10497
line-height: 1.25rem;

‎src/types/components/projects/projectId/labeling/settings.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export type LabelingSuiteTaskHeaderTaskSettings = {
4949
export type LabelingSuiteTaskHeaderLabelSettings = {
5050
showManual: boolean;
5151
showWeakSupervision: boolean;
52-
showModel: boolean;
5352
showHeuristics: boolean;
5453
}
5554

‎src/types/components/projects/projectId/labeling/task-header.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ export type LabelingSuiteTaskHeaderLabelDisplayData = {
2626
},
2727
showHeuristics: boolean;
2828
showManual: boolean;
29-
showModel: boolean;
3029
showWeakSupervision: boolean;
3130
}
3231

3332
export type QuickButtonConfig = {
3433
showManual: string[];
3534
showWeakSupervision: string[];
36-
showModel: string[];
3735
showHeuristics: string[];
3836
all: string[];
3937
nothing: string[];

‎src/util/components/projects/projectId/data-browser/filter-parser-helper.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,9 @@ function appendBlackAndWhiteListLabelingTask(appendTo, searchElement, labelingTa
103103
const labelingTask = labelingTasks.find(l => l.id == searchElement.values.taskId);
104104
appendTo.push(appendBlackAndWhiteListLabelingTaskForArray(appendTo, searchElement.values.manualLabels, LabelSource.MANUAL, drillDown));
105105
appendTo.push(appendBlackAndWhiteListLabelingTaskForArray(appendTo, searchElement.values.weakSupervisionLabels, LabelSource.WEAK_SUPERVISION, drillDown));
106-
appendTo.push(appendBlackAndWhiteListLabelingTaskForArray(appendTo, searchElement.values.modelCallbackLabels, LabelSource.MODEL_CALLBACK, drillDown));
107106
appendTo.push(appendBlackAndWhiteListLabelingTaskForArray(appendTo, searchElement.values.heuristics, LabelSource.INFORMATION_SOURCE, drillDown));
108107
if (labelingTask) {
109108
appendTo.push(appendBlackAndWhiteListLabelingTaskForConfidence(appendTo, searchElement.values.weakSupervisionConfidence, labelingTask.labels.map(l => l.id), true));
110-
appendTo.push(appendBlackAndWhiteListLabelingTaskForConfidence(appendTo, searchElement.values.modelCallbackConfidence, labelingTask.labels.map(l => l.id), false));
111109
}
112110

113111
if (!appendTo) return;
@@ -208,8 +206,10 @@ function appendBlackAndWhiteListLabelingTaskForConfidence(
208206
forWeakSupervision: boolean = true
209207
): any {
210208
if (!confidence || !confidence.active) return;
211-
212-
const source = forWeakSupervision ? LabelSource.WEAK_SUPERVISION : LabelSource.MODEL_CALLBACK;
209+
let source;
210+
if (forWeakSupervision) {
211+
source = LabelSource.WEAK_SUPERVISION;
212+
}
213213
let whitelist = {
214214
SUBQUERY_TYPE: 'WHITELIST',
215215
SUBQUERIES: [{

‎src/util/components/projects/projectId/data-browser/prefill-values-helper.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ export function addGroupToSearchElement(searchElement, labelingTasks) {
3535
active: saveEl.active,
3636
manualLabels: saveEl.manualLabels,
3737
weakSupervisionLabels: saveEl.weakSupervisionLabels,
38-
modelCallbackLabels: saveEl.modelCallbackLabels,
3938
sortByWeakSupervisionConfidence: saveEl.sortByWeakSupervisionConfidence,
40-
sortByModelCallbackConfidence: saveEl.sortByModelCallbackConfidence,
4139
weakSupervisionConfidence: saveEl.weakSupervisionConfidence,
42-
modelCallbackConfidence: saveEl.modelCallbackConfidence,
4340
heuristics: saveEl.informationSources,
4441
isWithDifferentResults: saveEl.isWithDifferentResults,
4542
}
@@ -140,17 +137,6 @@ export function prefillActiveValues(parse: any, fullSearchStoreCopy: any, usersM
140137
fullSearchStoreCopy[key].groupElements.weakSupervisionLabels[index].id = weakSupervisionLabel.id;
141138
}
142139
});
143-
} else if (groupItem.hasOwnProperty('modelCallbackLabels')) {
144-
const modelCallbackLabels = groupItem.modelCallbackLabels;
145-
modelCallbackLabels.forEach((modelCallbackLabel: any, index: number) => {
146-
if (modelCallbackLabel.active) {
147-
const key = SearchGroup.LABELING_TASKS + '_' + groupItem.taskId;
148-
fullSearchStoreCopy[key].groupElements.modelCallbackLabels[index].active = true;
149-
fullSearchStoreCopy[key].groupElements.modelCallbackLabels[index].negate = modelCallbackLabel.negate;
150-
fullSearchStoreCopy[key].groupElements.modelCallbackLabels[index].name = modelCallbackLabel.name;
151-
fullSearchStoreCopy[key].groupElements.modelCallbackLabels[index].id = modelCallbackLabel.id;
152-
}
153-
});
154140
} else if (groupItem.hasOwnProperty('informationSources') || groupItem.hasOwnProperty('heuristics')) {
155141
const heuristics = groupItem.informationSources;
156142
heuristics.forEach((heuristic: any, index: number) => {
@@ -201,14 +187,10 @@ export function checkActiveGroups(group: any, searchGroup: any) {
201187
} else if (val2.groupElements.hasOwnProperty('weakSupervisionLabels')) {
202188
const findActive = val2.groupElements.weakSupervisionLabels.filter((item: any) => item.active);
203189
if (findActive.length > 0) searchGroup[key].isOpen = true;
204-
} else if (val2.groupElements.hasOwnProperty('modelCallbackLabels')) {
205-
const findActive = val2.groupElements.modelCallbackLabels.filter((item: any) => item.active);
206-
if (findActive.length > 0) searchGroup[key].isOpen = true;
207190
} else if (val2.groupElements.hasOwnProperty('heuristics')) {
208191
const findActive = val2.groupElements.heuristics.filter((item: any) => item.active);
209192
if (findActive.length > 0) searchGroup[key].isOpen = true;
210193
} else if ((val2.groupElements.weakSupervisionConfidence && val2.groupElements.weakSupervisionConfidence.active) ||
211-
(val2.groupElements.modelCallbackConfidence && val2.groupElements.modelCallbackConfidence.active) ||
212194
(val2.groupElements.isWithDifferentResults && val2.groupElements.isWithDifferentResults.active)) {
213195
searchGroup[key].isOpen = true;
214196
}

0 commit comments

Comments
 (0)