skip_prompt fixes

voxel51 · Oct 28, 2024 · cf5a33d · cf5a33d
1 parent 78f3a19
commit cf5a33d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/app/packages/operators/src/built-in-operators.ts b/app/packages/operators/src/built-in-operators.ts
@@ -1027,7 +1027,7 @@ class PromptUserForOperation extends Operator {
     inputs.obj("params", { label: "Params" });
     inputs.str("on_success", { label: "On success" });
     inputs.str("on_error", { label: "On error" });
-    inputs.str("skip_prompt", { label: "Skip prompt", default: false });
+    inputs.bool("skip_prompt", { label: "Skip prompt", default: false });
     return new types.Property(inputs);
   }
   useHooks(ctx: ExecutionContext): {} {
@@ -1038,23 +1038,27 @@ class PromptUserForOperation extends Operator {
     const { params, operator_uri, on_success, on_error } = ctx.params;
     const { triggerEvent } = ctx.hooks;
     const panelId = ctx.getCurrentPanelId();
-    const shouldPrompt = !params.skip_prompt;
+    const shouldPrompt = !ctx.params.skip_prompt;
 
     triggerEvent(panelId, {
       operator: operator_uri,
       params,
       prompt: shouldPrompt,
       callback: (result: OperatorResult) => {
         if (result.error) {
-          triggerEvent(panelId, {
-            operator: on_error,
-            params: { error: result.error },
-          });
+          if (on_error) {
+            triggerEvent(panelId, {
+              operator: on_error,
+              params: { error: result.error },
+            });
+          }
         } else {
-          triggerEvent(panelId, {
-            operator: on_success,
-            params: { result: result.result },
-          });
+          if (on_success) {
+            triggerEvent(panelId, {
+              operator: on_success,
+              params: { result: result.result },
+            });
+          }
         }
       },
     });

diff --git a/fiftyone/operators/executor.py b/fiftyone/operators/executor.py
@@ -769,6 +769,7 @@ def prompt(
                     "params": params,
                     "on_success": on_success,
                     "on_error": on_error,
+                    "skip_prompt": skip_prompt,
                 }
             ),
         )