entari-plugin-hyw 3.2.106__tar.gz → 3.2.108__tar.gz

{entari_plugin_hyw-3.2.106/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.2.108}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.2.106
+Version: 3.2.108
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT

{entari_plugin_hyw-3.2.106 → entari_plugin_hyw-3.2.108}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "entari_plugin_hyw"
-version = "3.2.106"
+version = "3.2.108"
 description = "Use large language models to interpret chat messages"
 authors = [{name = "kumoSleeping", email = "zjr2992@outlook.com"}]
 dependencies = [

{entari_plugin_hyw-3.2.106 → entari_plugin_hyw-3.2.108}/src/entari_plugin_hyw/core/render.py

@@ -178,20 +178,56 @@ class ContentRenderer:
         last_exc = None
         for attempt in range(1, max_attempts + 1):
             try:
-                # Server-side Markdown Rendering
+                # 1. Protect math blocks
+                # We look for $$...$$, \[...\], \(...\)
+                # We'll replace them with placeholders so markdown extensions (like nl2br) don't touch them.
+                math_blocks = {}
+                
+                def protect_math(match):
+                    key = f"__MATH_BLOCK_{len(math_blocks)}__"
+                    math_blocks[key] = match.group(0)
+                    return key
+
+                # Patterns for math:
+                # 1) $$ ... $$ (display math)
+                # 2) \[ ... \] (display math)
+                # 3) \( ... \) (inline math)
+                # Note: We must handle multiline for $$ and \[
+                
+                # Regex for $$...$$
+                markdown_content = re.sub(r'\$\$(.*?)\$\$\s*', protect_math, markdown_content, flags=re.DOTALL)
+                
+                # Regex for \[...\]
+                markdown_content = re.sub(r'\\\[(.*?)\\\]\s*', protect_math, markdown_content, flags=re.DOTALL)
+                
+                # Regex for \(...\) (usually single line, but DOTALL is safest if user wraps lines)
+                markdown_content = re.sub(r'\\\((.*?)\\\)', protect_math, markdown_content, flags=re.DOTALL)
+
+                # 2. Render Markdown
+                # Use 'nl2br' to turn newlines into <br>, 'fenced_code' for code blocks
                 content_html = markdown.markdown(
-                    markdown_content.strip(), 
+                    markdown_content.strip(),
                     extensions=['fenced_code', 'tables', 'nl2br', 'sane_lists']
                 )
                 
+                # 3. Restore math blocks
+                def restore_math(text):
+                    # We assume placeholders are intact. We do a simple string replace or regex.
+                    # Since placeholders are unique strings, we can just replace them.
+                    for key, val in math_blocks.items():
+                        text = text.replace(key, val)
+                    return text
+
+                content_html = restore_math(content_html)
+                
                 # Post-process to style citation markers
                 parts = re.split(r'(<code.*?>.*?</code>)', content_html, flags=re.DOTALL)
                 for i, part in enumerate(parts):
                     if not part.startswith('<code'):
-                        # 1. Numeric Citations [1] -> Blue Style (References)
-                        part = re.sub(r'\[(\d+)\](?![^<]*>)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-blue-600 bg-blue-50 border border-blue-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
-                        # 2. Alphabetical Citations [a] -> Orange Style (MCP Flow)
-                        part = re.sub(r'\[([a-zA-Z]+)\](?![^<]*>)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-600 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
+                        # 1. Numeric Citations [references](/1) -> Blue Style (References)
+                        part = re.sub(r'\[references\]\(/(\d+)\)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-blue-600 bg-blue-50 border border-blue-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
+                        # 2. Alphabetical Citations [mcp](/a) -> Orange Style (MCP Flow)
+                        part = re.sub(r'\[mcp\]\(/([a-zA-Z]+)\)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-600 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
                         parts[i] = part
                 content_html = "".join(parts)
                 

{entari_plugin_hyw-3.2.106 → entari_plugin_hyw-3.2.108}/src/entari_plugin_hyw/utils/prompts.py

@@ -60,7 +60,7 @@ AGENT_SYSTEM_PROMPT_SEARCH_ADD = """
 
 [最终回复]
 - 图片: 如果本次回答适合配图, 对搜索到的图片, 选择 1-3 张合适的尽量类型、来源、不同、主题契合的图片, 美观分布嵌入正文 `![alt](url)`.
-- 搜索引用: 在正文中使用 `[数字id]` 如 `[1]` 标注来源, 并在文末通过 `references` 代码块列出.
+- 搜索引用: 在正文中使用 `[references](/数字id)` 如 `[references](/1)` 标注来源, 并在文末通过 `references` 代码块列出.
 - 你需要在最终回复底部添加 `references` 代码块.
 
 ```references
@@ -75,9 +75,9 @@ AGENT_SYSTEM_PROMPT_MCP_ADD = """
 {tools_desc}
 
 > 积极使用工具完成任务，工具优先于文本回复。
-
+秧根扭起来，我们喜羊羊大东北是我的家乡，我就在这一个人
 [最终回复格式]
-- 工具引用: 在正文中使用 `[字母id]` 如 `[a]` 标注来源, 并在文末通过 `mcp` 代码块列出.
+- 工具引用: 在正文中使用 `[mcp](/字母顺序)` 如 `[mcp](/a)` 标注来源, 并在文末通过 `mcp` 代码块列出.
 - 底部添加 `mcp` 代码块列出工具调用流程:
 - 格式: `[图标] 工具名称` + 文本描述
 - 图标: navigate, snapshot, click, type, code, wait, default

{entari_plugin_hyw-3.2.106 → entari_plugin_hyw-3.2.108/src/entari_plugin_hyw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.2.106
+Version: 3.2.108
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT