Auto-sync from GitHub Actions

core/engine.py

@@ -187,8 +187,9 @@ class DanbooruTagger:
         model_path: Optional[str] = None,
         csv_file:   str = 'origin_database/tags_enhanced.csv',
         cache_dir:  str = 'tags_embedding',
-        cooc_file:  str = 'origin_database/cooccurrence_clean.csv',
-        group_file: str = 'origin_database/tag_groups.json',
+        cooc_file:          str = 'origin_database/cooccurrence_clean.csv',
+        group_file:         str = 'origin_database/tag_groups.json',
+        tag_artist_file:    str = 'origin_database/tag_artist_cooc.parquet',
     ):
         # 模型路径：优先使用显式传入，否则交由 platform_utils 解析
         self.model_path = model_path or resolve_model_path()
@@ -198,6 +199,7 @@ class DanbooruTagger:
         self.paths     = _CachePaths(cache_dir)
         self.cooc_file = cooc_file
         self.group_file = group_file
+        self.tag_artist_file = tag_artist_file
 
         self.model:         Optional[SentenceTransformer]         = None
         self.df:            Optional[pd.DataFrame]                = None
@@ -211,6 +213,7 @@ class DanbooruTagger:
         self._tag_to_groups: dict[str, set[str]]                  = {}
         self._group_to_tags_idx: dict[str, np.ndarray]            = {}
         self._group_cn_names: dict[str, str]                      = {}
+        self._tag_artist_index: dict[str, list[tuple]]           = {}
         self.is_loaded:     bool                                  = False
 
         # 预提取的列数组，避免热点路径上反复执行 df.iloc[idx]
@@ -265,6 +268,7 @@ class DanbooruTagger:
 
         self._setup_jieba_from_memory()
         self._load_cooc()
+        self._load_tag_artist_cooc()
         self._name_to_idx = {n: i for i, n in enumerate(self.df['name'])}
         self._tag_names_set: set[str] = set(self._name_to_idx.keys())
         self._rebuild_arrays_from_df()
@@ -324,9 +328,10 @@ class DanbooruTagger:
                 print(f'[Engine] 拉取 {filename} 失败（非致命）: {e}')
                 return filename   # 回退到原始路径，让后续逻辑决定是否重建
 
-        self.csv_path  = pull('origin_database/tags_enhanced.csv')
-        self.cooc_file = pull('origin_database/cooccurrence_clean.parquet')
-        self.group_file = pull('origin_database/tag_groups.json')
+        self.csv_path         = pull('origin_database/tags_enhanced.csv')
+        self.cooc_file        = pull('origin_database/cooccurrence_clean.parquet')
+        self.group_file       = pull('origin_database/tag_groups.json')
+        self.tag_artist_file  = pull('origin_database/tag_artist_cooc.parquet')
 
         meta_path = pull('tags_embedding/tags_metadata.parquet')
         emb_path  = pull('tags_embedding/danbooru_multiview_embeddings.safetensors')
@@ -602,6 +607,36 @@ class DanbooruTagger:
                 self.get_group_candidates, selected_tags, show_nsfw,
             )
 
+    async def search_artists_by_tags_async(
+        self,
+        tags: list[str],
+        limit: int = 30,
+        min_cooc: int = 5,
+    ) -> list:
+        """search_artists_by_tags() 的并发安全异步封装。"""
+        async with self._get_cpu_sem():
+            return await asyncio.to_thread(
+                self.search_artists_by_tags, tags, limit, min_cooc,
+            )
+
+    async def search_artists_pipeline_async(
+        self,
+        query: str,
+        limit: int = 30,
+        min_cooc: int = 5,
+        target_layers: list[str] | None = None,
+        target_categories: list[str] | None = None,
+    ) -> tuple:
+        """search_artists_pipeline() 的并发安全异步封装。"""
+        async with self._get_cpu_sem():
+            return await asyncio.wait_for(
+                asyncio.to_thread(
+                    self.search_artists_pipeline,
+                    query, limit, min_cooc, target_layers, target_categories,
+                ),
+                timeout=120.0,
+            )
+
     def _apply_group_expand(self, final: dict[str, TagResult]) -> None:
         """expand 模式：提升同 group 标签的分数。"""
         BETA = 0.2
@@ -1186,6 +1221,132 @@ class DanbooruTagger:
 
         return results
 
+    # ── 画师查找 ──────────────────────────────────────────────────────────
+
+    def search_artists_by_tags(
+        self,
+        tags: list[str],
+        limit: int = 30,
+        min_cooc: int = 5,
+    ) -> list:
+        """按标签查找画师：聚合多个标签的 NPMI 得分，返回排名靠前的画师。"""
+        from .models import ArtistResult
+
+        if not self._tag_artist_index or not tags:
+            return []
+
+        artist_scores: dict[str, float] = {}
+        artist_cooc: dict[str, int] = {}
+        artist_post_count: dict[str, int] = {}
+        artist_sources: dict[str, list[str]] = {}
+        artist_hits: dict[str, int] = {}
+
+        for tag in tags:
+            tag = tag.strip().lower()
+            if not tag or tag not in self._tag_artist_index:
+                continue
+            for artist, npmi, cooc, post_count in self._tag_artist_index[tag]:
+                if cooc < min_cooc:
+                    continue
+                artist_scores[artist] = artist_scores.get(artist, 0.0) + npmi
+                artist_cooc[artist] = artist_cooc.get(artist, 0) + cooc
+                artist_post_count[artist] = max(artist_post_count.get(artist, 0), post_count)
+                artist_sources.setdefault(artist, []).append(tag)
+                artist_hits[artist] = artist_hits.get(artist, 0) + 1
+
+        if not artist_scores:
+            return []
+
+        scored = []
+        for artist, raw_score in artist_scores.items():
+            hit_bonus = 1.0 + 0.3 * (artist_hits[artist] - 1)
+            final_score = raw_score * hit_bonus
+            scored.append((
+                artist, final_score, artist_cooc[artist],
+                artist_post_count[artist], artist_sources[artist],
+                artist_hits[artist],
+            ))
+
+        scored.sort(key=lambda x: -x[1])
+        results = []
+        for artist, score, cooc, post_count, sources, hits in scored[:limit]:
+            results.append(ArtistResult(
+                artist=artist,
+                score=round(score, 4),
+                cooc_count=cooc,
+                post_count=post_count,
+                sources=sources,
+                hit_count=hits,
+            ))
+        return results
+
+    def search_artists_pipeline(
+        self,
+        query: str,
+        limit: int = 30,
+        min_cooc: int = 5,
+        target_layers: list[str] | None = None,
+        target_categories: list[str] | None = None,
+    ) -> tuple[list, list[str], list[str], list[str]]:
+        """画师查找完整管线：自然语言 → 标签搜索 → 提取最佳标签 → 画师查询。
+
+        Returns:
+            (artist_results, seed_tags, found_tags, missing_tags)
+        """
+        if target_layers is None:
+            target_layers = ['英文', '中文扩展词', '释义', '中文核心词']
+        if target_categories is None:
+            target_categories = ['General', 'Character', 'Copyright']
+
+        # Step 1: 自然语言 → 标签搜索
+        tag_request = SearchRequest(
+            query=query,
+            top_k=10,
+            limit=80,
+            popularity_weight=0.15,
+            show_nsfw=True,
+            use_segmentation=True,
+            target_layers=target_layers,
+            target_categories=target_categories,
+        )
+        tag_response = self.search(tag_request)
+
+        if not tag_response.results:
+            return [], [], [], []
+
+        # Step 2: 按 source 分组，每组按分数降序取前 10 个候选，找到能命中画师的第一个
+        tag_artist = self._tag_artist_index
+        source_candidates: dict[str, list[str]] = {}
+        for r in tag_response.results:
+            if r.final_score < 0.45:
+                continue
+            source_candidates.setdefault(r.source, []).append(r.tag)
+
+        seed_tags: list[str] = []
+        seen = set()
+        for candidates in source_candidates.values():
+            for tag in candidates[:10]:
+                tag_lower = tag.strip().lower()
+                if tag_lower in tag_artist and tag_lower not in seen:
+                    seed_tags.append(tag_lower)
+                    seen.add(tag_lower)
+                    break
+
+        if not seed_tags:
+            return [], [], [], []
+
+        # Step 3: 标签 → 画师查找
+        artist_results = self.search_artists_by_tags(seed_tags, limit, min_cooc)
+
+        # 统计 found / missing（seed_tags 中哪些匹配到了画师）
+        matched = {s for r in artist_results for s in r.sources}
+        found_tags = [t for t in seed_tags if t in matched]
+        missing_tags = [t for t in seed_tags if t not in matched]
+
+        return artist_results, seed_tags, found_tags, missing_tags
+
+    # ── 共现数据加载 ──────────────────────────────────────────────────────
+
     def _load_cooc(self) -> None:
         csv_path     = Path(self.cooc_file)
         parquet_path = csv_path.with_suffix('.parquet')
@@ -1242,6 +1403,32 @@ class DanbooruTagger:
         except Exception as e:
             print(f'[Engine] 共现表加载失败: {e}')
 
+    def _load_tag_artist_cooc(self) -> None:
+        """加载标签-画师共现数据（tag_artist_cooc.parquet）。"""
+        path = Path(self.tag_artist_file)
+        if not path.is_file():
+            print(f'[Engine] 未找到标签-画师共现表 ({self.tag_artist_file})，画师查找功能不可用。')
+            return
+
+        print(f'[Engine] 加载标签-画师共现表 ({path.name})...')
+        t0 = time.time()
+        try:
+            df = pd.read_parquet(str(path))
+            index: dict[str, list[tuple]] = {}
+            for _, row in df.iterrows():
+                tag = str(row["tag"])
+                index.setdefault(tag, []).append(
+                    (str(row["artist"]), float(row["npmi"]),
+                     int(row["cooc_count"]), int(row["artist_post_count"]))
+                )
+            self._tag_artist_index = index
+            print(
+                f'[Engine] 标签-画师共现表加载完成，{len(index):,} 个标签，'
+                f'耗时 {time.time() - t0:.2f}s'
+            )
+        except Exception as e:
+            print(f'[Engine] 标签-画师共现表加载失败: {e}')
+
     def _load_groups(self) -> None:
         """加载 Tag Group 数据，构建 tag→group 和 group→idx 索引。"""
         if not Path(self.group_file).is_file():

core/models.py

@@ -34,6 +34,17 @@ class RelatedTag:
     wiki: str = ""        # 标签 wiki 描述
 
 
+@dataclass
+class ArtistResult:
+    """单条画师搜索结果。"""
+    artist: str           # 画师名
+    score: float          # 综合 NPMI 得分
+    cooc_count: int       # 累计共现次数
+    post_count: int       # 画师在 Danbooru 的作品数
+    sources: list[str]    # 命中标签列表
+    hit_count: int        # 命中标签数
+
+
 @dataclass
 class SearchRequest:
     """搜索参数"""

ui_nicegui.py

@@ -177,6 +177,12 @@ class DanbooruSearchUI:
         self.prompt_format: str = 'sdxl'
         self.format_toggle_btn = None
 
+        # 画师查找模式
+        self.artist_search_mode: bool = False
+        self.artist_search_btn = None
+        self.artist_results_container = None
+        self.current_artist_seed_tags: list[str] = []  # 本次画师搜索使用的种子标签
+
         self.init_banner = None
         self.input_top_k = None
         self.input_limit = None
@@ -292,6 +298,7 @@ class DanbooruSearchUI:
             'search_mode': self.input_search_mode.value if self.input_search_mode else '自定义',
             'group_mode': self.input_group_mode.value if self.input_group_mode else 'off',
             'max_per_group': int(self.input_max_per_group.value) if self.input_max_per_group else 2,
+            'artist_search_mode': self.artist_search_mode,
         }
         js = _json.dumps(cfg, ensure_ascii=False)
         ui.run_javascript(f"localStorage.setItem('{_CONFIG_LS_KEY}', {_json.dumps(js)});")
@@ -388,6 +395,10 @@ class DanbooruSearchUI:
         if self.mcp_notice and cfg.get('mcp_notice_dismissed'):
             self.mcp_notice.set_visibility(False)
 
+        # 恢复画师查找模式
+        if cfg.get('artist_search_mode'):
+            self._on_search_type_change(True)
+
         # 若高级选项列有变更，同步更新表格列
         self._update_table_columns()
 
@@ -457,6 +468,60 @@ class DanbooruSearchUI:
                         max-width: 100% !important;
                     }
                 }
+
+                /* 画师查找模式 — 暗色主题 */
+                body[data-search-mode="artist"] .artist-card-row {
+                    background: rgba(245, 158, 11, 0.06);
+                    border-color: rgba(245, 158, 11, 0.15);
+                }
+                .artist-card-row {
+                    transition: background-color 0.2s, border-color 0.2s;
+                }
+                .artist-card-row:hover {
+                    background: rgba(245, 158, 11, 0.12) !important;
+                }
+                .mode-toggle-btn {
+                    transition: all 0.25s ease;
+                }
+
+                /* 暗色模式下文字颜色覆盖 */
+                body[data-search-mode="artist"] .text-gray-800,
+                body[data-search-mode="artist"] .text-gray-700,
+                body[data-search-mode="artist"] .text-gray-600 {
+                    color: #cbd5e1 !important;
+                }
+                body[data-search-mode="artist"] .text-gray-500 {
+                    color: #94a3b8 !important;
+                }
+                body[data-search-mode="artist"] .text-gray-400 {
+                    color: #64748b !important;
+                }
+
+                /* 暗色模式下公告栏 / 注意事项卡片适配 */
+                body[data-search-mode="artist"] .bg-green-50 {
+                    background: rgba(16, 185, 129, 0.1) !important;
+                    border-color: rgba(16, 185, 129, 0.3) !important;
+                }
+                body[data-search-mode="artist"] .text-green-800,
+                body[data-search-mode="artist"] .text-green-900,
+                body[data-search-mode="artist"] .text-green-700 {
+                    color: #6ee7b7 !important;
+                }
+                body[data-search-mode="artist"] .bg-orange-50 {
+                    background: rgba(249, 115, 22, 0.1) !important;
+                    border-color: rgba(249, 115, 22, 0.3) !important;
+                }
+                body[data-search-mode="artist"] .text-orange-800 {
+                    color: #fdba74 !important;
+                }
+                body[data-search-mode="artist"] .bg-blue-50 {
+                    background: rgba(59, 130, 246, 0.1) !important;
+                    border-color: rgba(59, 130, 246, 0.3) !important;
+                }
+                body[data-search-mode="artist"] .text-blue-700,
+                body[data-search-mode="artist"] .text-blue-600 {
+                    color: #93c5fd !important;
+                }
             </style>
             <script async src="https://www.googletagmanager.com/gtag/js?id=G-QPB7EEPR5G"></script>
             <script>
@@ -530,7 +595,11 @@ class DanbooruSearchUI:
                 # ── 4. 分词筛选 chips ──
                 self.keywords_container = ui.row().classes('gap-2 items-center flex-wrap')
 
-                # ── 5. 两栏结果 ──
+                # ── 5. 画师结果容器（画师模式专用）──
+                self.artist_results_container = ui.column().classes('w-full gap-3')
+                self.artist_results_container.set_visibility(False)
+
+                # ── 6. 两栏结果（标签模式）──
                 self._build_results_columns()
 
             # ── 6. 底部 ──
@@ -538,7 +607,7 @@ class DanbooruSearchUI:
                 self.search_count_label = ui.html('正在加载数据...').classes('text-xs text-gray-400')
                 self._update_footer_text()
 
-    # ── MCP 上线通知 ──────────────────────────────────────────────────────
+    # ── 公告栏（画师查找 + 标签组 + MCP）───────────────────────────────────
 
     def _build_group_notice(self):
         self.mcp_notice = ui.card().classes(
@@ -546,18 +615,26 @@ class DanbooruSearchUI:
         )
         with self.mcp_notice:
             with ui.column().classes('px-4 py-3 w-full gap-2'):
+                # ── 画师查找公告 ──
                 with ui.row().classes('items-center justify-between w-full'):
-                    ui.label('🧪 新功能：标签组扩展').classes('text-sm font-bold text-green-800')
+                    with ui.row().classes('items-center gap-1'):
+                        ui.label('🧪 新功能：画师查找（beta）').classes('text-sm font-bold text-green-800')
                     ui.button(icon='close').props('flat dense round color=grey-6') \
                         .on_click(self._dismiss_mcp_notice)
                 ui.html(
-                    '勾选标签后，搜索结果下方会出现<b>同类标签</b>区域，'
-                    '展示已选标签所属分组中的其他标签。<b>勾选复选框</b>即可加入已选，'
-                    '选中的标签会加入已选列表，可直接复制为 Prompt。'
+                    '基于标签共现数据，输入风格描述即可查找对应画师。'
+                    '点击搜索栏上方的 <b>「画师查找（beta）」</b> 按钮即可切换模式。'
+                ).classes('text-xs text-green-900')
+                ui.separator().classes('my-1')
+                # ── 标签组扩展 ──
+                ui.html(
+                    '【标签组扩展】 勾选标签后，搜索结果下方会出现<b>同类标签</b>区域，'
+                    '展示已选标签所属分组中的其他标签，勾选即可加入已选。'
                 ).classes('text-xs text-green-900')
                 ui.separator().classes('my-1')
+                # ── MCP 服务 ──
                 ui.html(
-                    '【MCP 服务已上线】 支持通过 MCP 协议接入 AI Agent（如 Claude Desktop）。'
+                    '【MCP 服务】 支持通过 MCP 协议接入 AI Agent（如 Claude Desktop）。'
                     '免配置托管版体验：'
                     '<a href="https://huggingface.co/spaces/SAkizuki/WenQiuYue" '
                     'target="_blank" rel="noopener noreferrer" '
@@ -604,12 +681,20 @@ class DanbooruSearchUI:
 
     def _build_search_card(self):
         with ui.card().classes('w-full'):
+            # ── 模式切换按钮 ──
+            with ui.row().classes('w-full items-center justify-between mb-3'):
+                with ui.row().classes('items-center gap-0'):
+                    self.tag_mode_btn = ui.button('标签搜索', on_click=lambda: self._on_search_type_change(False)) \
+                        .props('unelevated color=primary').classes('mode-toggle-btn rounded-r-none')
+                    self.artist_mode_btn = ui.button('画师查找（beta）', on_click=lambda: self._on_search_type_change(True)) \
+                        .props('flat color=grey-6').classes('mode-toggle-btn rounded-l-none')
+
             with ui.row().classes('items-center gap-2 mb-2'):
                 ui.icon('search', size='2em', color='primary')
-                ui.label('Danbooru 标签模糊搜索').classes('text-2xl font-bold text-gray-800')
-            ui.label('基于语义匹配的标签搜索引擎，支持多维匹配与共现关联推荐。').classes(
-                'text-sm text-gray-500 -mt-1 mb-3'
-            )
+                self.search_title_label = ui.label('Danbooru 标签模糊搜索').classes('text-2xl font-bold text-gray-800')
+            self.search_subtitle_label = ui.label(
+                '基于语义匹配的标签搜索引擎，支持多维匹配与共现关联推荐。'
+            ).classes('text-sm text-gray-500 -mt-1 mb-3')
 
             with ui.row().classes('w-full gap-3 items-stretch'):
                 self.search_input = ui.textarea(
@@ -625,7 +710,8 @@ class DanbooruSearchUI:
                         ui.label('搜索').classes('text-sm mt-1')
                     self.spinner = ui.spinner(size='2em').classes('hidden')
 
-            with ui.row().classes('w-full gap-6 items-center mt-3 flex-wrap'):
+            self.search_params_row = ui.row().classes('w-full gap-6 items-center mt-3 flex-wrap')
+            with self.search_params_row:
                 with ui.row().classes('items-center gap-2'):
                     ui.label('搜索模式 (beta)').classes('text-sm text-gray-600')
                     self.input_search_mode = ui.select(
@@ -670,7 +756,8 @@ class DanbooruSearchUI:
                 self.input_segment = _seg_sw
                 self.input_segment.on('update:model-value', self._on_param_changed)
 
-            with ui.expansion('高级选项', icon='tune').classes('w-full mt-2'):
+            self.advanced_options = ui.expansion('高级选项', icon='tune').classes('w-full mt-2')
+            with self.advanced_options:
                 with ui.column().classes('w-full p-3 gap-4'):
                     with ui.row().classes('w-full gap-8 flex-wrap'):
                         with ui.column().classes('gap-2'):
@@ -711,7 +798,7 @@ class DanbooruSearchUI:
                             self.sw_source.on('update:model-value', self._update_table_columns)
 
                         with ui.column().classes('gap-2'):
-                            ui.label('标签分组模式 (beta)').classes('font-bold text-sm text-gray-700')
+                            ui.label('标签分组模式').classes('font-bold text-sm text-gray-700')
                             self.input_group_mode = ui.select(
                                 ['off', 'expand', 'diverse'], value='off',
                             ).classes('w-40').props('outlined dense')
@@ -728,7 +815,8 @@ class DanbooruSearchUI:
     # ── 已选标签栏 ────────────────────────────────────────────────────────
 
     def _build_selection_bar(self):
-        with ui.card().classes('w-full bg-blue-50 border border-blue-200'):
+        self.selection_bar_card = ui.card().classes('w-full bg-blue-50 border border-blue-200')
+        with self.selection_bar_card:
             with ui.row().classes('w-full items-center justify-between'):
                 with ui.row().classes('items-center gap-2'):
                     ui.icon('check_circle', color='primary')
@@ -912,7 +1000,8 @@ class DanbooruSearchUI:
         # ── 两栏结果（CSS 强制并排）──────────────────────────────────────────
 
     def _build_results_columns(self):
-        with ui.element('div').classes('w-full two-col-layout'):
+        self.two_col_container = ui.element('div').classes('w-full two-col-layout')
+        with self.two_col_container:
             # ── 左栏：语义匹配结果（表格）──
             with ui.card().classes('col-left'):
                 with ui.row().classes('items-center justify-between mb-2 w-full'):
@@ -997,7 +1086,7 @@ class DanbooruSearchUI:
                 ui.separator().classes('my-2')
                 with ui.row().classes('items-center justify-between w-full mb-1'):
                     with ui.row().classes('items-center gap-2'):
-                        ui.label('同类标签 (beta)').classes('font-bold text-sm text-gray-600')
+                        ui.label('同类标签').classes('font-bold text-sm text-gray-600')
                         with ui.icon('info_outline', size='xs', color='grey').classes('cursor-help'):
                             with ui.tooltip().props('content-class="bg-black text-white shadow-4"'):
                                 ui.label('基于标签分组数据，展示已选标签所属分组中的其他标签。勾选可加入已选。').style('font-size:14px;')
@@ -1026,6 +1115,73 @@ class DanbooruSearchUI:
                 with self.related_list_container:
                     ui.label('请先搜索并勾选标签…').classes('text-sm text-gray-400 italic p-4')
 
+    # ══════════════════════════════════════════════════════════════════════
+    # 渲染画师搜索结果
+    # ══════════════════════════════════════════════════════════════════════
+
+    async def _silent_increment_counter(self):
+        try:
+            await counter.increment()
+            self._update_footer_text()
+        except Exception:
+            pass
+
+    def _render_artist_results(self, artist_results, found_tags, missing_tags):
+        if self.artist_results_container is None:
+            return
+        self.artist_results_container.clear()
+
+        if not artist_results:
+            with self.artist_results_container:
+                with ui.card().classes('w-full bg-amber-50 border border-amber-200'):
+                    with ui.row().classes('items-center gap-2 p-4'):
+                        ui.icon('info', color='amber')
+                        ui.label('未找到匹配的画师，请尝试更具体的风格描述。').classes('text-sm text-amber-700')
+            return
+
+        max_score = max(r.score for r in artist_results) if artist_results else 1.0
+
+        with self.artist_results_container:
+            # 种子标签信息
+            if found_tags:
+                tags_display = ', '.join(found_tags)
+                ui.label(f'种子标签: {tags_display}').classes('text-sm text-gray-500 mb-1')
+            if missing_tags:
+                ui.label(f'未匹配画师的标签: {", ".join(missing_tags)}').classes('text-xs text-orange-400')
+
+            with ui.card().classes('w-full p-0'):
+                for i, r in enumerate(artist_results):
+                    pct = min(r.score / max_score * 100, 100) if max_score > 0 else 0
+                    rank = i + 1
+                    sources_str = ', '.join(r.sources[:5])
+                    post_str = f'{r.post_count:,}' if r.post_count else '—'
+
+                    with ui.row().classes(
+                        'w-full items-center gap-3 px-4 py-3 border-b border-gray-200 artist-card-row'
+                    ).style('border-bottom: 1px solid rgba(128,128,128,0.1);'):
+                        # 排名
+                        ui.label(f'#{rank}').classes(
+                            'text-lg font-bold min-w-[42px] text-center'
+                        ).style(f'color: {"#F59E0B" if rank <= 3 else "#9CA3AF"};')
+
+                        # 画师信息
+                        with ui.column().classes('flex-grow gap-0 min-w-0'):
+                            ui.link(r.artist, f'https://danbooru.donmai.us/posts?tags={r.artist}', new_tab=True) \
+                                .classes('text-base font-bold')
+                            with ui.row().classes('items-center gap-4 mt-1'):
+                                ui.label(f'匹配标签: {sources_str}').classes('text-xs text-gray-500')
+                                ui.label(f'Danbooru 作品: {post_str}').classes('text-xs text-gray-400')
+
+                        # 分数条
+                        with ui.column().classes('items-end gap-0 min-w-[80px]'):
+                            ui.label(f'{r.score:.4f}').classes('text-sm font-mono font-bold')
+                            with ui.element('div').classes('w-full h-2 rounded-full overflow-hidden') \
+                                    .style('background: rgba(128,128,128,0.15);'):
+                                ui.element('div').classes('h-full rounded-full').style(
+                                    f'width: {pct:.0f}%;'
+                                    f'background: #F59E0B;'
+                                )
+
     # ══════════════════════════════════════════════════════════════════════
     # 渲染关联推荐列表
     # ══════════════════════════════════════════════════════════════════════
@@ -1167,6 +1323,52 @@ class DanbooruSearchUI:
                     chip_color, text_color = 'grey-4', 'black'
                 child.props(f'color={chip_color} text-color={text_color}')
 
+    # ── 搜索模式切换 ──────────────────────────────────────────────────────
+
+    def _on_search_type_change(self, artist_mode: bool):
+        if artist_mode == self.artist_search_mode:
+            return
+        self.artist_search_mode = artist_mode
+
+        if artist_mode:
+            # 画师查找 → 暗色主题
+            ui.colors(primary='#F59E0B', secondary='#78716C', accent='#10B981')
+            ui.dark_mode().enable()
+            self.tag_mode_btn.props('flat color=grey-6')
+            self.artist_mode_btn.props('unelevated color=primary')
+            self.search_title_label.set_text('画师查找')
+            self.search_subtitle_label.set_text('输入任何元素（如"平涂" "枪" "蔚蓝档案"），自动匹配擅长的画师。')
+            self.search_input.props('placeholder="输入任何元素，如：平涂 枪 蔚蓝档案..."')
+            # 隐藏搜索参数控件
+            self.search_params_row.set_visibility(False)
+            self.advanced_options.set_visibility(False)
+            # 清空旧结果并隐藏标签搜索专属区域
+            if self.results_section:
+                self.results_section.set_visibility(False)
+            if self.artist_results_container:
+                self.artist_results_container.clear()
+        else:
+            # 标签搜索 → 亮色主题
+            ui.colors(primary='#4A90E2', secondary='#5E6C84', accent='#FF6B6B')
+            ui.dark_mode().disable()
+            self.tag_mode_btn.props('unelevated color=primary')
+            self.artist_mode_btn.props('flat color=grey-6')
+            self.search_title_label.set_text('Danbooru 标签模糊搜索')
+            self.search_subtitle_label.set_text('基于语义匹配的标签搜索引擎，支持多维匹配与共现关联推荐。')
+            self.search_input.props('placeholder="输入自然语言描述或模糊概念，例如：一个穿着白色水手服的少女在雨中奔跑..."')
+            # 恢复搜索参数控件
+            self.search_params_row.set_visibility(True)
+            self.advanced_options.set_visibility(True)
+            # 清空旧结果
+            if self.results_section:
+                self.results_section.set_visibility(False)
+            if self.artist_results_container:
+                self.artist_results_container.clear()
+            self.keywords_container.clear()
+
+        ui.run_javascript(f"document.body.setAttribute('data-search-mode', '{'artist' if artist_mode else 'tag'}');")
+        self._save_config()
+
     # ── 搜索 ──────────────────────────────────────────────────────────────
 
     async def perform_search(self):
@@ -1209,97 +1411,134 @@ class DanbooruSearchUI:
         try:
             tagger = await DanbooruTagger.get_instance()
 
-            # NSFW 保护模式：开 = 不显示 NSFW
-            show_nsfw_val = self.input_nsfw.value
-
-            request = SearchRequest(
-                query=query,
-                top_k=int(self.input_top_k.value),
-                limit=int(self.input_limit.value),
-                popularity_weight=float(self.input_weight.value),
-                show_nsfw=show_nsfw_val,
-                use_segmentation=self.input_segment.value if self.input_segment else True,
-                target_layers=target_layers_list,
-                target_categories=target_cats_list,
-                group_mode=self.input_group_mode.value if self.input_group_mode else 'off',
-                max_per_group=int(self.input_max_per_group.value) if self.input_max_per_group else 2,
-            )
-            response = await tagger.search_async(request)
-
-            # 后台计数
-            async def silent_counter_update():
-                try:
-                    await counter.increment()
-                    if response.keywords:
-                        await counter.add_keywords(response.keywords)
-                    self._update_footer_text()
-                except Exception as e:
-                    print(f"[UI] 后台静默更新计数失败: {e}", flush=True)
-            asyncio.create_task(silent_counter_update())
-
-            if not self._client_alive():
-                return
+            if self.artist_search_mode:
+                # ── 画师查找模式 ──
+                artist_results, seed_tags, found_tags, missing_tags = \
+                    await tagger.search_artists_pipeline_async(
+                        query,
+                        limit=30,
+                        target_layers=target_layers_list,
+                        target_categories=target_cats_list,
+                    )
 
-            table_data = [result_to_row(r, show_nsfw_val) for r in response.results]
-            self.full_table_data = table_data
-            self.full_tags_str = response.tags_all
-            self.full_tags_str_sfw = response.tags_sfw
-            self.current_segments = list(response.segments) if response.segments else []
+                # 后台计数
+                asyncio.create_task(self._silent_increment_counter())
 
-            # 显示结果区域
-            self.results_section.set_visibility(True)
+                if not self._client_alive():
+                    return
 
-            _saved_rpp = self._get_rows_per_page()
-            self.result_table.rows = apply_nsfw_filter(table_data, show_nsfw_val)
-            self._set_rows_per_page(_saved_rpp)
-            # 搜索时保留已选标签（跨搜索积累）
-            all_selected = self._get_selected_tags()
-            self.chip_extra_selected.clear()
-            self.chip_extra_selected.update(all_selected)
-            self.result_table.selected = []
-            self._render_selected_chips()
-            self._update_selection_display(None)
-            self._save_staged_tags()
+                self.current_artist_seed_tags = seed_tags
+                self.results_section.set_visibility(True)
+                # 隐藏标签搜索专属区域
+                self.selection_bar_card.set_visibility(False)
+                self.two_col_container.set_visibility(False)
+                # 显示画师结果
+                self.artist_results_container.set_visibility(True)
 
-            # 清空关联推荐
-            self._refresh_related([], show_nsfw_val)
+                self.keywords_container.clear()
+                with self.keywords_container:
+                    ui.label('匹配种子标签:').classes('text-sm text-gray-500 font-bold mr-2')
+                    for tag in seed_tags:
+                        ui.chip(tag).props('color=amber-2 text-color=amber-9 clickable')
+                    if not seed_tags:
+                        ui.label('无').classes('text-xs text-gray-400 italic')
 
-            # 分词筛选 chips
-            self.current_filter_keyword = 'ALL'   # 新搜索默认选中"全部"
-            self.keywords_container.clear()
-            cached_set = set(response.cached_queries) if response.cached_queries else set()
-            with self.keywords_container:
-                ui.label('分词筛选:').classes('text-sm text-gray-500 font-bold mr-2')
-                ui.chip('全部', on_click=lambda: self._filter_by_source('ALL')) \
-                    .props('color=primary text-color=white clickable')
-                use_seg = self.input_segment.value if self.input_segment else True
-                if use_seg:
-                    whole = ui.chip('整句',
-                            on_click=lambda: self._filter_by_source(self.current_query_str))
-                    whole.props('color=grey-4 text-color=black clickable')
-                    if self.current_query_str in cached_set:
-                        whole.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
-                    # 从句级原始片段（分隔符切分后未 jieba 的长片段，区别于关键词）
-                    for seg in response.segments:
-                        sc = ui.chip(seg,
-                                on_click=lambda s=seg: self._filter_by_source(s))
-                        sc.props('color=blue-1 text-color=blue-8 clickable')
-                        if seg in cached_set:
-                            sc.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
-                    for kw in response.keywords:
-                        kc = ui.chip(kw,
-                                on_click=lambda k=kw: self._filter_by_source(k))
-                        kc.props('color=grey-4 text-color=black clickable')
-                        if kw in cached_set:
-                            kc.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
-                else:
-                    ui.label('(分词已关闭)').classes('text-xs text-gray-400')
-
-            ui.notify(f'找到 {len(table_data)} 个标签', type='positive')
-            self.current_search_interacted = False
+                self._render_artist_results(artist_results, found_tags, missing_tags)
+                ui.notify(f'找到 {len(artist_results)} 位画师', type='positive')
+                self.current_search_interacted = False
 
-            if self.bad_case_btn is not None:
-                self.bad_case_btn.enable()
+            else:
+                # ── 标签搜索模式 ──
+                show_nsfw_val = self.input_nsfw.value
+
+                request = SearchRequest(
+                    query=query,
+                    top_k=int(self.input_top_k.value),
+                    limit=int(self.input_limit.value),
+                    popularity_weight=float(self.input_weight.value),
+                    show_nsfw=show_nsfw_val,
+                    use_segmentation=self.input_segment.value if self.input_segment else True,
+                    target_layers=target_layers_list,
+                    target_categories=target_cats_list,
+                    group_mode=self.input_group_mode.value if self.input_group_mode else 'off',
+                    max_per_group=int(self.input_max_per_group.value) if self.input_max_per_group else 2,
+                )
+                response = await tagger.search_async(request)
+
+                # 后台计数
+                async def silent_counter_update():
+                    try:
+                        await counter.increment()
+                        if response.keywords:
+                            await counter.add_keywords(response.keywords)
+                        self._update_footer_text()
+                    except Exception as e:
+                        print(f"[UI] 后台静默更新计数失败: {e}", flush=True)
+                asyncio.create_task(silent_counter_update())
+
+                if not self._client_alive():
+                    return
+
+                table_data = [result_to_row(r, show_nsfw_val) for r in response.results]
+                self.full_table_data = table_data
+                self.full_tags_str = response.tags_all
+                self.full_tags_str_sfw = response.tags_sfw
+                self.current_segments = list(response.segments) if response.segments else []
+
+                self.results_section.set_visibility(True)
+                # 显示标签搜索专属区域
+                self.selection_bar_card.set_visibility(True)
+                self.two_col_container.set_visibility(True)
+                self.artist_results_container.set_visibility(False)
+
+                _saved_rpp = self._get_rows_per_page()
+                self.result_table.rows = apply_nsfw_filter(table_data, show_nsfw_val)
+                self._set_rows_per_page(_saved_rpp)
+                all_selected = self._get_selected_tags()
+                self.chip_extra_selected.clear()
+                self.chip_extra_selected.update(all_selected)
+                self.result_table.selected = []
+                self._render_selected_chips()
+                self._update_selection_display(None)
+                self._save_staged_tags()
+
+                self._refresh_related([], show_nsfw_val)
+
+                # 分词筛选 chips
+                self.current_filter_keyword = 'ALL'
+                self.keywords_container.clear()
+                cached_set = set(response.cached_queries) if response.cached_queries else set()
+                with self.keywords_container:
+                    ui.label('分词筛选:').classes('text-sm text-gray-500 font-bold mr-2')
+                    ui.chip('全部', on_click=lambda: self._filter_by_source('ALL')) \
+                        .props('color=primary text-color=white clickable')
+                    use_seg = self.input_segment.value if self.input_segment else True
+                    if use_seg:
+                        whole = ui.chip('整句',
+                                on_click=lambda: self._filter_by_source(self.current_query_str))
+                        whole.props('color=grey-4 text-color=black clickable')
+                        if self.current_query_str in cached_set:
+                            whole.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
+                        for seg in response.segments:
+                            sc = ui.chip(seg,
+                                    on_click=lambda s=seg: self._filter_by_source(s))
+                            sc.props('color=blue-1 text-color=blue-8 clickable')
+                            if seg in cached_set:
+                                sc.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
+                        for kw in response.keywords:
+                            kc = ui.chip(kw,
+                                    on_click=lambda k=kw: self._filter_by_source(k))
+                            kc.props('color=grey-4 text-color=black clickable')
+                            if kw in cached_set:
+                                kc.style('outline: 1px dashed rgba(128,128,128,0.3); outline-offset: 1px;')
+                    else:
+                        ui.label('(分词已关闭)').classes('text-xs text-gray-400')
+
+                ui.notify(f'找到 {len(table_data)} 个标签', type='positive')
+                self.current_search_interacted = False
+
+                if self.bad_case_btn is not None:
+                    self.bad_case_btn.enable()
 
         except RuntimeError as e:
             if 'deleted' in str(e).lower() or 'client' in str(e).lower():