Merge branch 'master' into search-box-in-header

Author: nikochiko

daras_ai_v2/language_model.py

@@ -122,6 +122,8 @@ class LargeLanguageModels(Enum):
         price=1,
         is_vision_model=True,
         supports_json=True,
+        is_deprecated=True,
+        redirect_to="gpt_4_o",
     )
 
     # https://platform.openai.com/docs/models/o4-mini

recipes/CompareText2Img.py

@@ -269,7 +269,6 @@ def _render_outputs(self, state):
 
     def get_raw_price(self, state: dict) -> int:
         selected_models = state.get("selected_models", [])
-        grouped_costs = self.get_grouped_linked_usage_cost_in_credits()
         total = 0
         for name in selected_models:
             match name:
@@ -278,6 +277,7 @@ def get_raw_price(self, state: dict) -> int:
                 case Text2ImgModels.dall_e.name | Text2ImgModels.dall_e_3.name:
                     total += 15
                 case Text2ImgModels.gpt_image_1.name:
+                    grouped_costs = self.get_grouped_linked_usage_cost_in_credits()
                     if cost := grouped_costs.get(Text2ImgModels.gpt_image_1.name):
                         total += math.ceil(float(cost) * 2.5)
                         continue

recipes/Functions.py

@@ -236,7 +236,7 @@ def render_variables(self):
     def render_output(self):
         if error := gui.session_state.get("error"):
             with gui.tag("pre", className="bg-danger bg-opacity-25"):
-                gui.html(error)
+                gui.html(html.escape(error))
 
         if return_value := gui.session_state.get("return_value"):
             gui.write("**Return value**")

widgets/workflow_search.py

@@ -70,8 +70,11 @@ def render_search_bar(
     search_filters: SearchFilters,
     key: str = "search_query",
     current_user: AppUser | None = None,
+    id: str | None = None,
     **props,
 ) -> str:
+    id = id or f"--search_bar:{key}"
+
     with (
         gui.styled(
             r"""
@@ -118,11 +121,20 @@ def render_search_bar(
             ),
             key=key,
             value=search_filters.search,
+            id=id,
             **props,
         )
 
         # add a hidden submit button to allow form submission on pressing Enter
-        gui.html('<input type="submit" hidden />')
+        gui.button(
+            "",
+            className="m-0 p-0",
+            hidden=True,
+            onClick=f"""
+            event.preventDefault();
+            document.getElementById("{id}").blur();
+            """,
+        )
 
         if search_query and gui.button(
             icons.cancel, type="link", className="clear_button"