Update app.py

app.py

@@ -36,6 +36,8 @@ def tag_image(pil_image: Image.Image, output_format: str) -> str:
     results_by_cat = {}  # to store tags per category (for verbose output)
     prompt_tags = []     # to store tags for prompt-style output
     # Collect tags above thresholds
+    artist_tags_with_probs = []
+    non_artist_tags_with_probs = []
     for idx, prob in enumerate(probs):
         tag = idx_to_tag[str(idx)]
         cat = tag_to_category.get(tag, "unknown")
@@ -43,14 +45,21 @@ def tag_image(pil_image: Image.Image, output_format: str) -> str:
         if float(prob) >= thresh:
             # add to category dictionary
             results_by_cat.setdefault(cat, []).append((tag, float(prob)))
-            # add to prompt list
-            prompt_tags.append(tag.replace("_", " "))
+            if cat == 'artist':
+                artist_tags_with_probs.append((tag, float(prob)))
+            else:
+                non_artist_tags_with_probs.append((tag, float(prob)))
+
     if output_format == "Prompt-style Tags":
+        artist_tags_with_probs.sort(key=lambda x: x[1], reverse=True)
+        non_artist_tags_with_probs.sort(key=lambda x: x[1], reverse=True)
+
+        artist_prompt_tags = [tag.replace("_", " ") for tag, prob in artist_tags_with_probs]
+        non_artist_prompt_tags = [tag.replace("_", " ") for tag, prob in non_artist_tags_with_probs]
+        prompt_tags = artist_prompt_tags + non_artist_prompt_tags
+
         if not prompt_tags:
             return "No tags predicted."
-        # Join tags with commas (sorted by probability for relevance)
-        # Sort prompt_tags by probability from results_by_cat (for better prompts ordering)
-        prompt_tags.sort(key=lambda t: max([p for (tg, p) in results_by_cat[tag_to_category.get(t.replace(' ', '_'), 'unknown')] if tg == t.replace(' ', '_')]), reverse=True)
         return ", ".join(prompt_tags)
     else:  # Detailed output
         if not results_by_cat:
@@ -87,7 +96,7 @@ with demo:
     # Link the button click to the function
     tag_button.click(fn=tag_image, inputs=[image_in, format_choice], outputs=output_box)
     # Footer/Info
-    gr.Markdown("----\n**Model:** [Camie Tagger ONNX](https://huggingface.co/AngelBottomless/camie-tagger-onnxruntime)   •   **Base Model:** Camais03/camie-tagger (61% F1 on 70k tags)   •   **ONNX Runtime:** for efficient CPU inference​:contentReference[oaicite:6]{index=6}   •   *Demo built with Gradio Blocks.*")
+    gr.Markdown("----\n**Model:** [Camie Tagger ONNX](https://huggingface.co/AngelBottomless/camie-tagger-onnxruntime)   •   **Base Model:** Camais03/camie-tagger (61% F1 on 70k tags)   •   **ONNX Runtime:** for efficient CPU inference​:contentReference[oaicite:6]{index=6}   •   *Demo built with Gradio Blocks.*")
 
 # Launch the app (automatically handled in Spaces)
-demo.launch()
+demo.launch()