anlas fix and director tools optimize

director_tools.py

@@ -54,6 +54,7 @@ def director_ui():
     with gr.Tab("自由调整") as resize:
         width = gr.Slider(label="调整宽度", value=1024, minimum=1, maximum=2048, step=1)
         height = gr.Slider(label="调整高度", value=1024, minimum=1, maximum=2048, step=1)
+        reset = gr.Button("重置")
     with gr.Tab("等比例缩放") as scale:
         hint = gr.HTML('', show_label=False)
         factor = gr.Slider(label="缩放比例", minimum=0.1, maximum=2, step=0.1)
@@ -85,11 +86,14 @@ def director_ui():
     req_type.change(lambda r: "neutral;;" if r == "更改表情" else '', inputs=req_type, outputs=prompt)
     input_image.change(getWH, inputs=[input_image, width, height, factor], outputs=[width, height, hint])
     factor.change(refresh_hint, inputs=[hint, factor], outputs=[hint])
-    tool_btn = gr.Button(value="生成", variant="primary")
+    tool_btn = gr.Button(value="生成", variant="primary", visible=False)
     dtool_stop = gr.Button(value="取消", variant="stop", visible=False)
-    tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True)), inputs=None, outputs=[tool_btn, dtool_stop])
+    input_image.change(lambda i: gr.Button(visible=False) if i is None else gr.Button(visible=True), inputs=input_image, outputs=tool_btn)
+    tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True), gr.Gallery(selected_index=None)), inputs=None, outputs=[tool_btn, dtool_stop, output_image])
     dtool_gen = tool_btn.click(augment_image, inputs=[input_image, width, height, req_type, selection, factor, defry, prompt], outputs=output_image, concurrency_id="generate")
     dtool_stop.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop], cancels=[dtool_gen])
+    output_image.change(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop])
+    reset.click(getWH, inputs=[input_image, width, height, factor], outputs=[width, height, hint])
     width.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     height.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     req_type.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)

utils.py

@@ -40,7 +40,7 @@ def calculate_cost(width, height, steps=28, sm=False, dyn=False, strength=1, rmb
     dyn = sm and dyn
     L = math.ceil(2951823174884865e-21 * pixels + 5.753298233447344e-7 * pixels * steps)
     L *= 1.4 if dyn else (1.2 if sm else 1)
-    L = max(math.ceil(L * strength), 2)
+    L = math.ceil(L * strength)
     return L * 3 + 5 if rmbg else L
 
 def generate_novelai_image(