Update ModelStep

Bugfix: Disallow removing rows when the last one is left
Reordered the placement of var, name, description
Suggest name when variable is selected and name is empty.

src/components/model_pipeline/model_pipeline.py

@@ -119,7 +119,7 @@ class PipelineInterface:
                 return step_interface
 
             is_multi_step = n_steps > 1
-            logger.debug(f"Rendering step {position} of {n_steps}")
+            # logger.debug(f"Rendering step {position} of {n_steps}")
 
             # Add step controls below
             with gr.Row(elem_classes="step-controls", visible=is_multi_step):

src/components/model_step/model_step.py

@@ -4,6 +4,7 @@ from typing import Any
 import gradio as gr
 from gradio.components import FormComponent
 
+from app_configs import UNSELECTED_VAR_NAME
 from components.model_pipeline.state_manager import ModelStepUIState, PipelineState, PipelineStateManager
 from utils import get_full_model_name
 from workflows.structs import ModelStep
@@ -50,7 +51,7 @@ class ModelStepComponent(FormComponent):
             "output": max_output_fields,
         }
         self.model_options = model_options
-        self.input_variables = input_variables
+        self.input_variables = [UNSELECTED_VAR_NAME] + input_variables
         self.sm = ModelStepStateManager(max_input_fields, max_output_fields)
         self.pipeline_sm: PipelineStateManager = pipeline_state_manager
 
@@ -100,26 +101,13 @@ class ModelStepComponent(FormComponent):
         inputs = self.model_step.input_fields
         is_visible = i < len(inputs)
         label_visible = i == 0
+        disable_delete = i == 0 and len(inputs) == 1
         initial_name = inputs[i].name if is_visible else ""
         initial_desc = inputs[i].description if is_visible else ""
-        initial_var = inputs[i].variable if is_visible else "question_text"
+        initial_var = inputs[i].variable or UNSELECTED_VAR_NAME if is_visible else UNSELECTED_VAR_NAME
 
         with gr.Row(visible=is_visible, elem_classes="field-row form") as row:
-            button_group = InputRowButtonGroup()
-
-            inp_name = gr.Textbox(
-                label="Input Name",
-                placeholder="Field name",
-                value=initial_name,
-                elem_classes="field-name",
-                scale=1,
-                show_label=label_visible,
-            )
-
-            # Get variable choices safely
-            # variable_choices = []
-            # if self.pipeline_sm is not None:
-            #     variable_choices = self.pipeline_sm.get_all_variables(self.step_id)
+            button_group = InputRowButtonGroup(disable_delete=disable_delete)
 
             inp_var = gr.Dropdown(
                 choices=self.input_variables,
@@ -129,6 +117,14 @@ class ModelStepComponent(FormComponent):
                 scale=1,
                 show_label=label_visible,
             )
+            inp_name = gr.Textbox(
+                label="Input Name",
+                placeholder="Field name",
+                value=initial_name,
+                elem_classes="field-name",
+                scale=1,
+                show_label=label_visible,
+            )
             inp_desc = gr.Textbox(
                 label="Description",
                 placeholder="Field description",
@@ -146,11 +142,12 @@ class ModelStepComponent(FormComponent):
         outputs = self.model_step.output_fields
         is_visible = i < len(outputs)
         label_visible = i == 0
+        disable_delete = i == 0 and len(outputs) == 1
         initial_name = outputs[i].name if is_visible else ""
         initial_desc = outputs[i].description if is_visible else ""
         initial_type = outputs[i].type if is_visible else "str"
         with gr.Row(visible=is_visible, elem_classes="field-row") as row:
-            button_group = OutputRowButtonGroup()
+            button_group = OutputRowButtonGroup(disable_delete=disable_delete)
 
             out_name = gr.Textbox(
                 label="Output Field",
@@ -334,7 +331,7 @@ class ModelStepComponent(FormComponent):
 
             inp_var.change(
                 fn=self.sm.update_input_field_variable,
-                inputs=[self.model_step_state, inp_var, row_index],
+                inputs=[self.model_step_state, inp_var, inp_name, row_index],
                 outputs=[self.model_step_state],
             )
 

src/components/model_step/state_manager.py

@@ -1,7 +1,9 @@
 from typing import Any, Literal, Union
 
 import gradio as gr
+from loguru import logger
 
+from app_configs import UNSELECTED_VAR_NAME
 from components.model_pipeline.state_manager import ModelStepUIState
 from components.utils import DIRECTIONS, move_item
 from utils import get_model_and_provider
@@ -41,8 +43,14 @@ class ModelStepStateManager:
         """Update a specific field of an input field at the given index."""
         return model_step.update_field("input", index, "name", value)
 
-    def update_input_field_variable(self, model_step: ModelStep, value: str, index: int) -> ModelStep:
+    def update_input_field_variable(self, model_step: ModelStep, value: str, name: str, index: int) -> ModelStep:
         """Update a specific field of an input field at the given index."""
+        if value == UNSELECTED_VAR_NAME:
+            return model_step.update_field("input", index, "variable", "")
+        if name == "":
+            suggested_name = value.split(".", 1)[-1]
+            logger.info(f"Updating input field variable to {value}. Suggested name: {suggested_name}")
+            model_step = model_step.update_field("input", index, "name", suggested_name)
         return model_step.update_field("input", index, "variable", value)
 
     def update_input_field_description(self, model_step: ModelStep, value: str, index: int) -> ModelStep:
@@ -115,7 +123,7 @@ class ModelStepStateManager:
 
     # Field add/delete functions
     def add_input_field(self, model_step: ModelStep, index: int = -1):
-        updates = self._add_field(model_step, "input", index, input_var="question_text")
+        updates = self._add_field(model_step, "input", index, input_var=UNSELECTED_VAR_NAME)
         return *updates, *self.make_input_field_updates(model_step)
 
     def add_output_field(self, model_step: ModelStep, index: int = -1):

src/components/model_step/ui_components.py

@@ -45,11 +45,14 @@ class InputRowButtonGroup(ButtonGroup):
     EVENTS = ["delete", "add"]
 
     def __init__(self, *args, **kwargs):
+        self.disable_delete = kwargs.pop("disable_delete", False)
         super().__init__(self.EVENTS, *args, **kwargs)
 
     def render(self):
         with gr.Column(scale=0, min_width=40, elem_classes="button-column"):
-            self.buttons["delete"] = gr.Button("❌", elem_classes="icon-button delete-button", scale=0)
+            self.buttons["delete"] = gr.Button(
+                "❌", elem_classes="icon-button delete-button", scale=0, interactive=not self.disable_delete
+            )
             self.buttons["add"] = gr.Button("➕", elem_classes="icon-button add-field-button", scale=0)
         super().render()
 
@@ -66,11 +69,14 @@ class OutputRowButtonGroup(ButtonGroup):
     EVENTS = ["delete", "add", "up", "down"]
 
     def __init__(self, *args, **kwargs):
+        self.disable_delete = kwargs.pop("disable_delete", False)
         super().__init__(self.EVENTS, *args, **kwargs)
 
     def render(self):
         with gr.Column(scale=0, elem_classes="button-column", min_width=40):
-            self.buttons["delete"] = gr.Button("❌", elem_classes="icon-button delete-button", scale=0)
+            self.buttons["delete"] = gr.Button(
+                "❌", elem_classes="icon-button delete-button", scale=0, interactive=not self.disable_delete
+            )
             self.buttons["add"] = gr.Button("➕", elem_classes="icon-button add-field-button", scale=0)
 
         with gr.Column(scale=0, elem_classes="button-column", min_width=40):