entari-plugin-hyw 3.3.6__py3-none-any.whl → 3.3.7__py3-none-any.whl

entari_plugin_hyw/core/pipeline.py

@@ -647,12 +647,7 @@ class ProcessingPipeline:
         except Exception:
             pass
 
-        # 2. Remove the original references block if present (we will rebuild it)
-        ref_block_match = re.search(r'```references\s*(.*?)\s*```', remaining_text, re.DOTALL | re.IGNORECASE)
-        if ref_block_match:
-            remaining_text = remaining_text.replace(ref_block_match.group(0), "").strip()
-
-        # 3. Scan text for [type:id] tags and rebuild references in order of appearance
+        # 2. Extract references from text first (Order by appearance)
         # Pattern matches [search:123], [page:123], [image:123]
         pattern = re.compile(r'\[(search|page|image):(\d+)\]', re.IGNORECASE)
         
@@ -662,24 +657,12 @@ class ProcessingPipeline:
         page_map = {}
         image_map = {}
         
-        for m in matches:
-            tag_type = m.group(1).lower()
-            old_id_str = m.group(2)
-            try:
-                old_id = int(old_id_str)
-            except ValueError:
-                continue
-            
-            # Check if we already processed this ID for this type
-            if tag_type == "search" and old_id_str in search_map: continue
-            if tag_type == "page" and old_id_str in page_map: continue
-            if tag_type == "image" and old_id_str in image_map: continue
-            
+        def process_ref(tag_type, old_id):
             # Find in all_web_results
             result_item = next((r for r in self.all_web_results if r.get("_id") == old_id and r.get("_type") == tag_type), None)
             
             if not result_item:
-                continue
+                return
                 
             entry = {
                 "title": result_item.get("title", ""),
@@ -690,15 +673,56 @@ class ProcessingPipeline:
                  entry["thumbnail"] = result_item.get("thumbnail", "")
 
             # Add to respective list and map
+            # Check maps to avoid duplicates
             if tag_type == "search":
-                parsed["references"].append(entry)
-                search_map[old_id_str] = len(parsed["references"])
+                if str(old_id) not in search_map:
+                    parsed["references"].append(entry)
+                    search_map[str(old_id)] = len(parsed["references"])
             elif tag_type == "page":
-                parsed["page_references"].append(entry)
-                page_map[old_id_str] = len(parsed["page_references"])
+                if str(old_id) not in page_map:
+                    parsed["page_references"].append(entry)
+                    page_map[str(old_id)] = len(parsed["page_references"])
             elif tag_type == "image":
-                parsed["image_references"].append(entry)
-                image_map[old_id_str] = len(parsed["image_references"])
+                if str(old_id) not in image_map:
+                    parsed["image_references"].append(entry)
+                    image_map[str(old_id)] = len(parsed["image_references"])
+
+        # Pass 1: Text Body
+        for m in matches:
+            try:
+                process_ref(m.group(1).lower(), int(m.group(2)))
+            except ValueError:
+                continue
+
+        # 3. Pass 2: References Block (Capture items missed in text)
+        ref_block_match = re.search(r'```references\s*(.*?)\s*```', remaining_text, re.DOTALL | re.IGNORECASE)
+        if ref_block_match:
+            ref_content = ref_block_match.group(1).strip()
+            remaining_text = remaining_text.replace(ref_block_match.group(0), "").strip()
+            
+            for line in ref_content.split("\n"):
+                line = line.strip()
+                if not line: continue
+                # Match [id] [type]
+                # e.g. [1] [image] ... or [image:1] ...
+                
+                # Check for [id] [type] format
+                id_match = re.match(r"^\[(\d+)\]\s*\[(search|page|image)\]", line, re.IGNORECASE)
+                if id_match:
+                    try:
+                         process_ref(id_match.group(2).lower(), int(id_match.group(1)))
+                    except ValueError:
+                        pass
+                else:
+                    # Check for [type:id] format in list
+                    alt_match = re.match(r"^\[(search|page|image):(\d+)\]", line, re.IGNORECASE)
+                    if alt_match:
+                        try:
+                            process_ref(alt_match.group(1).lower(), int(alt_match.group(2)))
+                        except ValueError:
+                            pass
+
+        # 4. Replace tags in text with new sequential IDs
 
         # 4. Replace tags in text with new sequential IDs
         def replace_tag(match):

entari_plugin_hyw/core/render.py

@@ -441,6 +441,33 @@ class ContentRenderer:
                             **stage_children # Merge children
                         })
 
+                # Ensure references are displayed even if no "Search" stage was present
+                has_search_stage = any(s.get("name") == "Search" for s in processed_stages)
+                if not has_search_stage and (processed_refs or processed_image_refs):
+                    # Create a virtual Search stage
+                    virtual_search = {
+                        "name": "Search",
+                        "model": "DuckDuckGo", # Default assumption
+                        "model_short": "DuckDuckGo",
+                        "provider": "Reference",
+                        "icon_html": SEARCH_ICON,
+                        "time_str": "0.00s",
+                        "cost_str": "$0",
+                    }
+                    if processed_refs:
+                        virtual_search['references'] = processed_refs
+                    if processed_image_refs:
+                        virtual_search['image_references'] = processed_image_refs
+                    
+                    # Insert after Vision/Instruct (usually index 0 or 1), or at start
+                    insert_idx = 0
+                    if processed_stages and processed_stages[0]["name"] in ["Vision", "Instruct"]:
+                        insert_idx = 1
+                        if len(processed_stages) > 1 and processed_stages[1]["name"] == "Instruct":
+                            insert_idx = 2
+                    
+                    processed_stages.insert(insert_idx, virtual_search)
+
                 # 4. Stats Footer Logic
                 processed_stats = {}
                 stats_dict = {}

entari_plugin_hyw-3.3.7.dist-info/METADATA

@@ -0,0 +1,142 @@
+Metadata-Version: 2.4
+Name: entari_plugin_hyw
+Version: 3.3.7
+Summary: Use large language models to interpret chat messages
+Author-email: kumoSleeping <zjr2992@outlook.com>
+License: MIT
+Project-URL: Homepage, https://github.com/kumoSleeping/entari-plugin-hyw
+Project-URL: Repository, https://github.com/kumoSleeping/entari-plugin-hyw
+Project-URL: Issue Tracker, https://github.com/kumoSleeping/entari-plugin-hyw/issues
+Keywords: entari,llm,ai,bot,chat
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: arclet-entari[full]>=0.16.5
+Requires-Dist: openai
+Requires-Dist: httpx
+Requires-Dist: markdown>=3.10
+Requires-Dist: crawl4ai>=0.7.8
+Requires-Dist: jinja2>=3.0
+Requires-Dist: ddgs>=9.10.0
+Provides-Extra: dev
+Requires-Dist: entari-plugin-server>=0.5.0; extra == "dev"
+Requires-Dist: satori-python-adapter-onebot11>=0.2.5; extra == "dev"
+
+
+# Entari Plugin HYW
+
+
+[![PyPI version](https://badge.fury.io/py/entari-plugin-hyw.svg)](https://badge.fury.io/py/entari-plugin-hyw)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Python Versions](https://img.shields.io/pypi/pyversions/entari-plugin-hyw.svg)](https://pypi.org/project/entari-plugin-hyw/)
+
+**Entari Plugin HYW** is an advanced agentic chat plugin for the [Entari](https://github.com/entari-org/entari) framework. It leverages Large Language Models (LLMs) to provide intelligent, context-aware, and multi-modal responses within instant messaging environments (OneBot 11, Satori).
+
+**Entari Plugin HYW** 是 Entari 框架的高级智能体聊天插件。它利用大语言模型（LLM）在即时通讯环境（OneBot 11, Satori）中提供智能、上下文感知和多模态的回复体验。
+
+The plugin implements a three-stage pipeline (**Vision**, **Instruct**, **Agent**) to autonomously decide when to search the web, crawl pages, or analyze images to answer user queries effectively.
+
+插件实现了三阶段流水线（**视觉**、**指令**、**代理**），能够自主决定何时搜索网络、抓取网页或分析图片，从而高效地回答用户问题。
+
+<img src="demo.jpg" width="300" />
+
+## Features / 功能特性
+
+- 📖 **Agentic Workflow (智能工作流)**  
+  Autonomous decision-making process to search, browse, and reason.  
+  具备自主决策能力，能够自动进行搜索、网页浏览和逻辑推理。
+
+- 🎑 **Multi-Modal Support (多模态支持)**  
+  Native support for image analysis using Vision Language Models (VLMs).  
+  原生支持图片分析，利用视觉语言模型（VLM）理解图像内容。
+
+- 🔍 **Web Search & Crawling (搜索与抓取)**  
+  Integrated **DuckDuckGo** and **Crawl4AI** for real-time information retrieval.  
+  集成 DuckDuckGo 搜索与 Crawl4AI 网页抓取，实时获取互联网信息。
+
+- 🎨 **Rich Rendering (富媒体渲染)**  
+  Responses are rendered as images containing Markdown, syntax-highlighted code, LaTeX math, and citation badges.  
+  回答将渲染为包含 Markdown、代码高亮、LaTeX 公式及引用角标的精美图片。
+
+- 🔌 **Protocol Support (多协议适配)**  
+  Deep integration with OneBot 11 and Satori protocols.  
+  深度适配 OneBot 11 和 Satori 协议，完美处理回复上下文与 JSON 卡片。
+
+## Installation / 安装
+
+```bash
+pip install entari-plugin-hyw
+```
+
+## Configuration / 配置
+
+Configure the plugin in your `entari.yml`.  
+在 `entari.yml` 中进行配置。
+
+### Minimal Configuration / 最小配置
+
+```yaml
+plugins:
+  entari_plugin_hyw:
+    # Trigger command / 触发指令
+    question_command: ".q"
+    
+    # Main Model (Required) / 主模型（必需）
+    model_name: "google/gemini-2.0-flash-exp"
+    api_key: "your-api-key-here"
+    base_url: "https://generativelanguage.googleapis.com/v1beta/openai/"
+```
+
+### Configuration Reference / 配置详解
+
+| Option (选项) | Type | Default | Description (说明) |
+| :--- | :--- | :--- | :--- |
+| **Basic** | | | |
+| `question_command` | `str` | `/q` | The command to trigger the bot. <br> 触发机器人的指令前缀。 |
+| `reaction` | `bool` | `true` | React with emoji on start(now only lagrange ob extension). <br> 收到指令时是否回应表情(目前只支持拉格兰ob扩展)。 |
+| `quote` | `bool` | `true` | Quote the user's message in reply. <br> 回复时是否引用原消息。 |
+| **Models** | | | |
+| `model_name` | `str` | *None* | **Required.** Main Agent model ID. <br> **必需。** 主代理模型 ID。 |
+| `api_key` | `str` | *None* | **Required.** API key. <br> **必需。** API 密钥。 |
+| `base_url` | `str` | `...` | OpenAI-compatible API base URL. <br> 兼容 OpenAI 的 API 地址。 |
+| `extra_body` | `dict` | `null` | Extra parameters (e.g. `reasoning_effort`). <br> 传递给 LLM 的额外参数。 |
+| **Specialized** | | | |
+| `vision_model_name`| `str` | *None* | Model for images. Defaults to `model_name`. <br> 处理图片的模型，默认同主模型。 |
+| `intruct_model_name`| `str` | *None* | Model for intent. Defaults to `model_name`. <br> 意图识别模型，默认同主模型。 |
+| **Tools** | | | |
+| `search_provider` | `str` | `ddgs`| `ddgs` (DuckDuckGo), `crawl4ai`, `httpx`. <br> 搜索后端提供商。 |
+| `search_limit` | `int` | `8` | Max search results. <br> 搜索结果数量限制。 |
+| `headless` | `bool` | `true` | Browser headless mode. <br> 浏览器无头模式。 |
+
+## Usage / 使用方法
+
+### Commands / 指令
+
+- **Text Query (文本问答)**
+  ```text
+  .q What's the latest news on Rust 1.83?
+  .q Rust 1.83 有什么新特性？
+  ```
+
+- **Image Analysis (图片分析)**
+  *(Send an image with command, or reply to an image)*  
+  *(发送带图片的指令，或回复一张图片)*
+  ```text
+  .q [Image] Explain this error.
+  .q [图片] 解释一下这个报错。
+  ```
+
+- **Follow-up (追问)**
+  *Reply to the bot's message to continue the conversation.*  
+  *直接回复机器人的消息即可进行连续对话。*
+
+-----
+
+## License
+
+This project is licensed under the MIT License.

{entari_plugin_hyw-3.3.6.dist-info → entari_plugin_hyw-3.3.7.dist-info}/RECORD

@@ -31,15 +31,15 @@ entari_plugin_hyw/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 entari_plugin_hyw/core/config.py,sha256=rN2hVI964D7eM6xPuOthEIpXyFGZpRSYNrl1xdKHJ1s,1636
 entari_plugin_hyw/core/history.py,sha256=vqp7itwR5-KaqC4Ftmq6GOz7OM9GsiFJnSN9JJ2P6L4,5894
 entari_plugin_hyw/core/hyw.py,sha256=RCRjV9uYmvXysiliztphLP3VyUabrf0LY2Bk66W5JGA,1927
-entari_plugin_hyw/core/pipeline.py,sha256=7mZDm7W9Izui_hcQqd_KjRVtlxfEYFWamGxqu-C9exY,48052
-entari_plugin_hyw/core/render.py,sha256=U5wZ6kQKBBF85acDT8kq-HyXyNVPwUd-__SPLbFwXGg,27466
+entari_plugin_hyw/core/pipeline.py,sha256=t1nIjQlMKqTb7wpY7Dn1rbWDD2kl8WWUnPQBY5MQO4E,49071
+entari_plugin_hyw/core/render.py,sha256=rUhv2R5fdtsMIGg-Q1qe8hhUWC1_E50BODLA78u4_SI,28948
 entari_plugin_hyw/utils/__init__.py,sha256=TnkxDqYr0zgRE7TC92tVbUaY8m1UyyoLg2zvzQ8nMVI,84
 entari_plugin_hyw/utils/browser.py,sha256=LJlFh-oSqt9mQBpMALxbYGUG__t1YLUo7RxUAslsWUc,1416
 entari_plugin_hyw/utils/misc.py,sha256=_7iHVYj_mJ6OGq6FU1s_cFeS1Ao-neBjZYd6eI2p95U,3482
 entari_plugin_hyw/utils/playwright_tool.py,sha256=ZZNkzFtUt_Gxny3Od4boBAgNF9J0N84uySatzn1Bwe4,1272
 entari_plugin_hyw/utils/prompts.py,sha256=oJpgNvRQ_Lmr2Ca-B6fcpysMT2i0obioBC1DuH_Z1MY,4430
 entari_plugin_hyw/utils/search.py,sha256=Bvz2KFw3Gr2nuvmlo_8ExLHvO353NKX-YN35A2FCsBw,19047
-entari_plugin_hyw-3.3.6.dist-info/METADATA,sha256=iNeG0220pvABmvr1S76OuGYJa6KZi5yz8iEx3s6i-KY,4674
-entari_plugin_hyw-3.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-entari_plugin_hyw-3.3.6.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
-entari_plugin_hyw-3.3.6.dist-info/RECORD,,
+entari_plugin_hyw-3.3.7.dist-info/METADATA,sha256=ZQ_HfsEQKXUPkEf2KaPSO9hPm1bYgHSfCo-GRV-f9l8,6340
+entari_plugin_hyw-3.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+entari_plugin_hyw-3.3.7.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
+entari_plugin_hyw-3.3.7.dist-info/RECORD,,

entari_plugin_hyw-3.3.6.dist-info/METADATA

@@ -1,143 +0,0 @@
-Metadata-Version: 2.4
-Name: entari_plugin_hyw
-Version: 3.3.6
-Summary: Use large language models to interpret chat messages
-Author-email: kumoSleeping <zjr2992@outlook.com>
-License: MIT
-Project-URL: Homepage, https://github.com/kumoSleeping/entari-plugin-hyw
-Project-URL: Repository, https://github.com/kumoSleeping/entari-plugin-hyw
-Project-URL: Issue Tracker, https://github.com/kumoSleeping/entari-plugin-hyw/issues
-Keywords: entari,llm,ai,bot,chat
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-Requires-Dist: arclet-entari[full]>=0.16.5
-Requires-Dist: openai
-Requires-Dist: httpx
-Requires-Dist: markdown>=3.10
-Requires-Dist: crawl4ai>=0.7.8
-Requires-Dist: jinja2>=3.0
-Requires-Dist: ddgs>=9.10.0
-Provides-Extra: dev
-Requires-Dist: entari-plugin-server>=0.5.0; extra == "dev"
-Requires-Dist: satori-python-adapter-onebot11>=0.2.5; extra == "dev"
-
-<div align="center">
-
-# Entari Plugin HYW
-
-**Entari 智能聊天解释插件**
-
-[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://opensource.org/licenses/MIT) [![PyPI](https://img.shields.io/pypi/v/entari-plugin-hyw?style=flat-square&color=success)](https://pypi.org/project/entari-plugin-hyw/) [![Python](https://img.shields.io/badge/Python-3.10+-blue.svg?style=flat-square&logo=python&logoColor=white)](https://www.python.org/downloads/)
-
-*IM 环境下的 LLM 智能解释方案*
-
-</div>
-
-# v3.3 迎来大幅度改动、现在图文不符
-
-
-
-## 🎑 效果展示
-
-
-
-<div align="center">
-  <img src="demo.svg" alt="Chat Demo" width="100%">
-</div>
-
-## ✨ 功能特性
-- **关于搜索**：一次性触发 Bing 网页与图片搜索，组合结果后再回应。
-- 给予 `Alconna` 与 `MessageChain` 混合处理, 深度优化触发体验。
-- **网页获取**：使用 Playwright 进行实时页面获取。
-- **多模态理解**：支持图片视觉分析。
-- **上下文感知**：维护对话历史记录，支持连续的多轮对话。
-- `reaction` 表情, 表示任务开始。
-- **OneBot 优化**：针对 OneBot 11 协议深度优化，支持解析 JSON 卡片、引用消息等特殊元素。
-
-
-
-## 📦 安装
-
-### 基础安装
-```bash
-pip install entari-plugin-hyw
-```
-
-### 搜索
-默认通过 HTTP 请求搜索引擎（DuckDuckGo，可在配置中自定义完整搜索链接，如 `https://duckduckgo.com/?q={query}`）。
-
-## ⚙️ 配置
-
-请在 `entari.yml` 中添加以下配置：
-
-```yaml
-plugins:
-  entari_plugin_hyw:
-    # --- 基础设置 ---
-    # 触发机器人的命令列表
-    command_name_list: ["zssm", "hyw"]
-    
-    # 主 LLM 模型配置（必需）, 如 x-ai/grok-4.1-fast:online、perplexity/sonar
-    model_name: "gx-ai/grok-4.1-fast:free"
-    api_key: "your-api-key"
-
-    # 默认 https://openrouter.ai/api/v1
-    base_url: "openai-compatible-url"  
-    
-    # --- 浏览器与搜索 ---
-    headless: true
-    
-    # --- 视觉配置 (可选) ---
-    # 如果未设置，将回退使用主模型
-    vision_model_name: "qwen-vl-plus"
-    vision_api_key: "your-vision-api-key"
-    vision_base_url: "your-vision_base_url"
-    
-    # --- openai extra_body ---
-    extra_body:
-      reasoning:
-        effort: low
-    
-    # --- 交互体验 ---
-    # 是否开启表情反应 (默认: true)
-    reaction: true
-
-    # --- 调试 ---
-    save_conversation: false
-```
-
-## 📖 使用方法
-
-### 基础指令
-使用配置的命令前缀与机器人交互：
-
-```text
-hyw 最近LLM有啥新闻, 是不是claude又被秒了
-hyw [图片消息] 里面这人写代码怎么我一句都看不懂
-hyw https://koishi.chat/ 怎么安装
-[回复消息] hyw 
-[回复消息<[图片消息]>] hyw -t
-[回复消息] hyw 补充: 这个rf的意思是github用户RF-Tar-Railt
-[回复消息(hyw插件的输出)] /1 详细点描述
-[回复消息(hyw插件的输出>] /那谁有多余解释器?
-```
-
-### 选项参数
-- `-t` / `--text`: 强制纯文本模式（跳过图片分析，节省 Token 或时间）。
-
-```text
-hyw -t 一大段话。
-```
-
-### 引用回复
-支持引用消息进行追问，机器人会自动读取被引用的消息作为上下文：
-- **引用 + 命令**：机器人将理解被引用消息的内容（包括图片）通过 `MessageChain` 操作拼接 `Text`、`Image` 与部分 `Custom`。
-
-UncleCode. (2024). Crawl4AI: Open-source LLM Friendly Web Crawler & Scraper [Computer software]. 
-GitHub. https://github.com/unclecode/crawl4ai