Upload 2 files

app.py

@@ -32,38 +32,35 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", css="") as app:
     gr.Markdown("""# Natural Text to SD Prompt Translator With LLM alpha
                     Text in natural language (English, Japanese, ...) => Prompt
                 """)
-    with gr.Column(scale=1):
+    with gr.Column():
         with gr.Group():
-            chatbot = gr.Chatbot(likeable=False, show_copy_button=True, show_share_button=False, layout="panel", container=True, )
+            chatbot = gr.Chatbot(likeable=False, show_copy_button=True, show_share_button=False, layout="bubble", container=True)
             with gr.Row():
                 chat_msg = gr.Textbox(show_label=False, placeholder="Input text in English, Japanese, or any other languages and press Enter or click Send.", scale=4)
                 chat_submit = gr.Button("Send", scale=1)
                 chat_clear = gr.Button("Clear", scale=1)
-            with gr.Accordion("Additional inputs", open=False):
-                chat_format = gr.Dropdown(choices=get_llm_formats(), value=get_dolphin_model_format(get_dolphin_models()[0][1]), label="Message format")
-                chat_sysmsg = gr.Textbox(value=get_dolphin_sysprompt(), label="System message")
-                chat_tokens = gr.Slider(minimum=1, maximum=4096, value=1024, step=1, label="Max tokens")
-                chat_temperature = gr.Slider(minimum=0.1, maximum=4.0, value=0.7, step=0.1, label="Temperature")
-                chat_topp = gr.Slider(minimum=0.1, maximum=1.0, value=0.95, step=0.05, label="Top-p")
-                chat_topk = gr.Slider(minimum=0, maximum=100, value=40, step=1, label="Top-k")
-                chat_rp = gr.Slider(minimum=0.0, maximum=2.0, value=1.1, step=0.1, label="Repetition penalty")
-                with gr.Accordion("Add models", open=True):
-                    chat_add_text = gr.Textbox(label="URL or Repo ID", placeholder="http://huggingface.co/.../...gguf or author/model", lines=1)
-                    chat_add_format = gr.Dropdown(choices=get_llm_formats(), value=get_llm_formats()[0], label="Message format")
-                    chat_add_submit = gr.Button("Update lists of models")
-            with gr.Accordion("Modes", open=True):
-                chat_model = gr.Dropdown(choices=get_dolphin_models(), value=get_dolphin_models()[0][1], allow_custom_value=True, label="Model")
-                chat_model_info = gr.Markdown(value=get_dolphin_model_info(get_dolphin_models()[0][1]), label="Model info")
-                with gr.Row():
-                    chat_mode = gr.Dropdown(choices=get_dolphin_sysprompt_mode(), value=get_dolphin_sysprompt_mode()[0], allow_custom_value=False, label="Mode")
-                    chat_lang = gr.Dropdown(choices=get_dolphin_languages(), value="English", allow_custom_value=True, label="Output language")
-
-    with gr.Column(scale=1):
+        with gr.Accordion("Additional inputs", open=False):
+            chat_format = gr.Dropdown(choices=get_llm_formats(), value=get_dolphin_model_format(get_dolphin_models()[0][1]), label="Message format")
+            chat_sysmsg = gr.Textbox(value=get_dolphin_sysprompt(), label="System message")
+            chat_tokens = gr.Slider(minimum=1, maximum=4096, value=1024, step=1, label="Max tokens")
+            chat_temperature = gr.Slider(minimum=0.1, maximum=4.0, value=0.7, step=0.1, label="Temperature")
+            chat_topp = gr.Slider(minimum=0.1, maximum=1.0, value=0.95, step=0.05, label="Top-p")
+            chat_topk = gr.Slider(minimum=0, maximum=100, value=40, step=1, label="Top-k")
+            chat_rp = gr.Slider(minimum=0.0, maximum=2.0, value=1.1, step=0.1, label="Repetition penalty")
+            with gr.Accordion("Add models", open=True):
+                chat_add_text = gr.Textbox(label="URL or Repo ID", placeholder="http://huggingface.co/.../...gguf or author/model", lines=1)
+                chat_add_format = gr.Dropdown(choices=get_llm_formats(), value=get_llm_formats()[0], label="Message format")
+                chat_add_submit = gr.Button("Update lists of models")
+        with gr.Accordion("Modes", open=True):
+            chat_model = gr.Dropdown(choices=get_dolphin_models(), value=get_dolphin_models()[0][1], allow_custom_value=True, label="Model")
+            chat_model_info = gr.Markdown(value=get_dolphin_model_info(get_dolphin_models()[0][1]), label="Model info")
+            with gr.Row():
+                chat_mode = gr.Dropdown(choices=get_dolphin_sysprompt_mode(), value=get_dolphin_sysprompt_mode()[0], allow_custom_value=False, label="Mode")
+                chat_lang = gr.Dropdown(choices=get_dolphin_languages(), value="English", allow_custom_value=True, label="Output language")
         with gr.Row():
             with gr.Group():
                 output_text = gr.TextArea(label="Output tags", interactive=False, show_copy_button=True)
                 copy_btn = gr.Button(value="Copy to clipboard", size="sm", interactive=False)
-                elapsed_time_md = gr.Markdown(label="Elapsed time", value="", visible=False)
             with gr.Group():
                 output_text_pony = gr.TextArea(label="Output tags (Pony e621 style)", interactive=False, show_copy_button=True)
                 copy_btn_pony = gr.Button(value="Copy to clipboard", size="sm", interactive=False)

llmdolphin.py

@@ -17,6 +17,8 @@ llm_models = {
     "MN-12B-Starcannon-v2.i1-Q4_K_M.gguf": ["mradermacher/MN-12B-Starcannon-v2-i1-GGUF", MessagesFormatterType.CHATML],
     "Lumimaid-Magnum-12B.i1-Q4_K_M.gguf": ["mradermacher/Lumimaid-Magnum-12B-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Nemo-12B-Marlin-v1.i1-Q4_K_M.gguf": ["mradermacher/Nemo-12B-Marlin-v1-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Nemo-12B-Marlin-v2.i1-Q4_K_M.gguf": ["mradermacher/Nemo-12B-Marlin-v2-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Evolved-Llama3-8B.i1-Q5_K_M.gguf": ["mradermacher/Evolved-Llama3-8B-i1-GGUF", MessagesFormatterType.LLAMA_3],
     "DarkIdol-Llama-3.1-8B-Instruct-1.2-Uncensored-Q5_K_M.gguf": ["bartowski/DarkIdol-Llama-3.1-8B-Instruct-1.2-Uncensored-GGUF", MessagesFormatterType.LLAMA_3],
     "Llama-3-Swallow-8B-Instruct-v0.1.Q5_K_M.gguf": ["YukiTomita-CC/Llama-3-Swallow-8B-Instruct-v0.1-IMat-GGUF_dolly-15k-ja-prompt", MessagesFormatterType.ALPACA],
     "natsumura-storytelling-rp-1.0-llama-3.1-8B.Q5_K_M.gguf": ["tohur/natsumura-storytelling-rp-1.0-llama-3.1-8b-GGUF", MessagesFormatterType.LLAMA_3],
@@ -703,7 +705,7 @@ def dolphin_parse_simple(
         return ""
     prompts = []
     if dolphin_sysprompt_mode == "Japanese to Danbooru Dictionary" and is_japanese(raw_prompt):
-        prompts = list_uniq(jatags_to_danbooru_tags(to_list_ja(raw_prompt)) + ["nsfw", "explicit"])
+        prompts = list_uniq(jatags_to_danbooru_tags(to_list_ja(raw_prompt)) + ["nsfw", "explicit", "rating_explicit"])
     else:
-        prompts = list_uniq(to_list(raw_prompt) + ["nsfw", "explicit"])
+        prompts = list_uniq(to_list(raw_prompt) + ["nsfw", "explicit", "rating_explicit"])
     return ", ".join(prompts)