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.

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

Removing buttons from builtin operators #3817

Merged
merged 4 commits into from
Nov 17, 2023
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
7 changes: 5 additions & 2 deletions app/packages/operators/src/built-in-operators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,10 @@ class SetSelectedSamples extends Operator {
};
}
async execute({ hooks, params }: ExecutionContext) {
hooks.setSelected(params.samples);
const { samples } = params || {};
if (!Array.isArray(samples))
throw new Error("param 'samples' must be an array of string");
hooks.setSelected(new Set(samples));
}
}

Expand Down Expand Up @@ -539,7 +542,7 @@ class ShowSamples extends Operator {
]
: []),
];
hooks.setView(fos.view, newView);
hooks.setView(newView);
}
}

Expand Down
60 changes: 21 additions & 39 deletions fiftyone/operators/builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,46 +24,34 @@ def config(self):

def resolve_input(self, ctx):
inputs = types.Object()
sample_ids = ctx.selected
count = len(sample_ids)
header = "Clone sample"

count = len(ctx.selected)
if count > 0:
sample_text = "sample" if count == 1 else "samples"
header = f"Clone {count} {sample_text}?"
inputs.str(
"msg",
label=f"Press 'Execute' to clone {count} selected {sample_text}",
view=types.Notice(space=6),
)
inputs.str(
"btn",
label="Show selected samples",
view=types.Button(operator="show_selected_samples", space=3),
label=f"Clone {count} selected {sample_text}?",
view=types.Warning(),
)
else:
header = "No selected samples"
inputs.str(
"msg",
label="You must select samples in the grid to clone",
view=types.Warning(),
)

return types.Property(inputs, view=types.View(label=header))
view = types.View(label="Clone selected samples")
return types.Property(inputs, view=view)

def execute(self, ctx):
sample_ids = ctx.selected
if len(sample_ids) > 0:
samples = ctx.dataset.select(sample_ids)
cloned_samples = [
fo.Sample.from_dict(dict(**sample.to_dict(), id=None))
for sample in samples
]
ctx.dataset.add_samples(cloned_samples)
ctx.trigger("reload_samples")
ctx.trigger(
"show_samples",
{"samples": [sample.id for sample in cloned_samples]},
)
if not ctx.selected:
return

samples = ctx.dataset.select(ctx.selected)
sample_ids = ctx.dataset.add_collection(samples, new_ids=True)

ctx.trigger("clear_selected_samples")
ctx.trigger("reload_samples")


class CloneSampleField(foo.Operator):
Expand Down Expand Up @@ -232,38 +220,32 @@ def config(self):

def resolve_input(self, ctx):
inputs = types.Object()
sample_ids = ctx.selected
count = len(sample_ids)
header = "Delete samples"

count = len(ctx.selected)
if count > 0:
sample_text = "sample" if count == 1 else "samples"
header = f"Delete {count} {sample_text}?"
inputs.str(
"msg",
label=f"Press 'Execute' to delete {count} selected {sample_text}",
view=types.Notice(space=6),
)
inputs.str(
"btn",
label="Show selected samples",
view=types.Button(operator="show_selected_samples", space=3),
label=f"Delete {count} selected {sample_text}s?",
view=types.Warning(),
)
else:
header = "No selected samples"
inputs.str(
"msg",
label="You must select samples in the grid to delete",
view=types.Warning(),
)

return types.Property(inputs, view=types.View(label=header))
view = types.View(label="Delete selected samples")
return types.Property(inputs, view=view)

def execute(self, ctx):
num_samples = len(ctx.selected)
if num_samples == 0:
return

ctx.dataset.delete_samples(ctx.selected)

ctx.trigger("clear_selected_samples")
ctx.trigger("reload_samples")

Expand Down