entari-plugin-hyw 3.4.2__tar.gz → 3.5.0rc2__tar.gz

{entari_plugin_hyw-3.4.2/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.5.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.4.2
+Version: 3.5.0rc2
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -75,8 +75,11 @@ Configure the plugin in your `entari.yml`.
 ```yaml
 plugins:
   entari_plugin_hyw:
-    model_name: google/gemini-3-flash-preview
+    model_name: google/gemini-2.0-flash-exp
     api_key: "your-or-api-key-here"
+    # Rendering Configuration
+    render_timeout_ms: 6000 # Browser wait timeout
+    render_image_timeout_ms: 3000 # Image load wait timeout
 ```
 
 ## Usage

{entari_plugin_hyw-3.4.2 → entari_plugin_hyw-3.5.0rc2}/README.md

@@ -46,8 +46,11 @@ Configure the plugin in your `entari.yml`.
 ```yaml
 plugins:
   entari_plugin_hyw:
-    model_name: google/gemini-3-flash-preview
+    model_name: google/gemini-2.0-flash-exp
     api_key: "your-or-api-key-here"
+    # Rendering Configuration
+    render_timeout_ms: 6000 # Browser wait timeout
+    render_image_timeout_ms: 3000 # Image load wait timeout
 ```
 
 ## Usage

{entari_plugin_hyw-3.4.2 → entari_plugin_hyw-3.5.0rc2}/pyproject.toml

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

{entari_plugin_hyw-3.4.2 → entari_plugin_hyw-3.5.0rc2}/src/entari_plugin_hyw/__init__.py

@@ -1,19 +1,28 @@
 from dataclasses import dataclass, field
+from importlib.metadata import version as get_version
 from typing import List, Dict, Any, Optional, Union
 import time
+import asyncio
+
+# 从 pyproject.toml 读取版本号，避免重复维护
+try:
+    __version__ = get_version("entari_plugin_hyw")
+except Exception:
+    __version__ = "0.0.0"
 
 from arclet.alconna import Alconna, Args, AllParam, CommandMeta, Option, Arparma, MultiVar, store_true
 from arclet.entari import metadata, listen, Session, plugin_config, BasicConfModel, plugin, command
+from arclet.letoderea import on
 from arclet.entari import MessageChain, Text, Image, MessageCreatedEvent, Quote, At
 from satori.element import Custom
 from loguru import logger
 import arclet.letoderea as leto
 from arclet.entari.event.command import CommandReceive
 
-from .core.hyw import HYW
-from .core.history import HistoryManager
-from .core.render import ContentRenderer
-from .utils.misc import process_onebot_json, process_images, resolve_model_name
+from .pipeline import ProcessingPipeline
+from .history import HistoryManager
+from .render_vue import ContentRenderer
+from .misc import process_onebot_json, process_images, resolve_model_name
 from arclet.entari.event.lifespan import Cleanup
 
 import os
@@ -22,6 +31,32 @@ import base64
 
 import re
 
+
+def parse_color(color: str) -> str:
+    """
+    Parse color from hex or RGB tuple to hex format.
+    Supports: #ff0000, ff0000, (255, 0, 0), 255,0,0
+    """
+    if not color:
+        return "#ef4444"
+    
+    color = str(color).strip()
+    
+    # Hex format: #fff or #ffffff or ffffff
+    if color.startswith('#') and len(color) in [4, 7]:
+        return color
+    if re.match(r'^[0-9a-fA-F]{6}$', color):
+        return f'#{color}'
+    
+    # RGB tuple: (r, g, b) or r,g,b
+    rgb_match = re.match(r'^\(?(\d+)[,\s]+(\d+)[,\s]+(\d+)\)?$', color)
+    if rgb_match:
+        r, g, b = (max(0, min(255, int(x))) for x in rgb_match.groups())
+        return f'#{r:02x}{g:02x}{b:02x}'
+    
+    logger.warning(f"Invalid color '{color}', using default #ef4444")
+    return "#ef4444"
+
 class _RecentEventDeduper:
     def __init__(self, ttl_seconds: float = 30.0, max_size: int = 2048):
         self.ttl_seconds = ttl_seconds
@@ -69,6 +104,7 @@ class HywConfig(BasicConfModel):
     save_conversation: bool = False
     icon: str = "openai"
     render_timeout_ms: int = 6000
+    render_image_timeout_ms: int = 3000
     extra_body: Optional[Dict[str, Any]] = None
     vision_extra_body: Optional[Dict[str, Any]] = None
     instruct_extra_body: Optional[Dict[str, Any]] = None
@@ -88,81 +124,45 @@ class HywConfig(BasicConfModel):
     # Provider Names
     search_name: str = "DuckDuckGo"
     search_provider: str = "crawl4ai"  # crawl4ai | httpx | ddgs
+    fetch_provider: str = "crawl4ai"  # crawl4ai | jinaai
+    jina_api_key: Optional[str] = None  # Optional API key for Jina AI
     model_provider: Optional[str] = None
     vision_model_provider: Optional[str] = None
     instruct_model_provider: Optional[str] = None
+    # UI Theme
+    theme_color: str = "#ef4444"  # Tailwind red-500, supports hex/RGB/color names
+    
+    def __post_init__(self):
+        """Parse and normalize theme color after initialization."""
+        self.theme_color = parse_color(self.theme_color)
 
 
 
 conf = plugin_config(HywConfig)
 history_manager = HistoryManager()
 renderer = ContentRenderer()
-hyw = HYW(config=conf)
-
-
 
 
-@listen(Cleanup, once=True)
-async def _hyw_cleanup():
-    try:
-        await hyw.close()
-    except Exception as e:
-        logger.warning(f"HYW cleanup error: {e}")
-
 class GlobalCache:
     models_image_path: Optional[str] = None
 
 global_cache = GlobalCache()
 
-from satori.exception import ActionFailed
-from satori.adapters.onebot11.reverse import _Connection
-
-# Monkeypatch to suppress ActionFailed for get_msg
-original_call_api = _Connection.call_api
-
-async def patched_call_api(self, action: str, params: dict = None):
-    try:
-        return await original_call_api(self, action, params)
-    except ActionFailed as e:
-        if action == "get_msg":
-            logger.warning(f"Suppressed ActionFailed for get_msg: {e}")
-            return None
-        raise e
-
-_Connection.call_api = patched_call_api
-
-EMOJI_TO_CODE = {
-    "✨": "10024",
-    "✅": "10004",
-    "❌": "10060"
-}
-
 async def react(session: Session, emoji: str):
     if not conf.reaction: return
     try:
-        if session.event.login.platform == "onebot":
-            code = EMOJI_TO_CODE.get(emoji, "10024")
-            # OneBot specific reaction
-            await session.account.protocol.call_api(
-                "internal/set_group_reaction", 
-                {
-                    "group_id": str(session.guild.id), 
-                    "message_id": str(session.event.message.id), 
-                    "code": code, 
-                    "is_add": True
-                }
-            )
-        else:
-            # Standard Satori reaction
-            await session.reaction_create(emoji=emoji)
-    except ActionFailed:
-        pass
+        await session.reaction_create(emoji=emoji)
     except Exception as e:
         logger.warning(f"Reaction failed: {e}")
 
-async def process_request(session: Session[MessageCreatedEvent], all_param: Optional[MessageChain] = None, 
-                         selected_model: Optional[str] = None, selected_vision_model: Optional[str] = None, 
-                         conversation_key_override: Optional[str] = None, local_mode: bool = False):
+async def process_request(
+    session: Session[MessageCreatedEvent],
+    all_param: Optional[MessageChain] = None,
+    selected_model: Optional[str] = None,
+    selected_vision_model: Optional[str] = None,
+    conversation_key_override: Optional[str] = None,
+    local_mode: bool = False,
+) -> None:
     logger.info(f"Processing request: {all_param}")
     mc = MessageChain(all_param)
     logger.info(f"reply: {session.reply}")
@@ -242,12 +242,19 @@ async def process_request(session: Session[MessageCreatedEvent], all_param: Opti
 
         images, err = await process_images(mc, vision_model)
 
-        # Call Agent (Step 1)
-        # Sanitize user_input: use extracted text only
+        # Call Pipeline directly
         safe_input = msg_text
-            
-        resp = await hyw.agent(safe_input, conversation_history=hist_payload, images=images, 
-                              selected_model=model, selected_vision_model=vision_model, local_mode=local_mode)
+        pipeline = ProcessingPipeline(conf)
+        try:
+            resp = await pipeline.execute(
+                safe_input,
+                hist_payload,
+                model_name=model,
+                images=images,
+                selected_vision_model=vision_model,
+            )
+        finally:
+            await pipeline.close()
         
         # Step 1 Results
         step1_vision_model = resp.get("vision_model_used")
@@ -270,111 +277,28 @@ async def process_request(session: Session[MessageCreatedEvent], all_param: Opti
         with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tf:
             output_path = tf.name
         model_used = final_resp.get("model_used")
-        vision_model_used = final_resp.get("vision_model_used")
-        
-        # Helper to infer icon from model name
-        def infer_icon_from_model(model_name: str) -> str:
-            """Infer icon name from model name (e.g. 'google/gemini-3-flash' -> 'google' or 'gemini')"""
-            if not model_name:
-                return conf.icon
-            name_lower = model_name.lower()
-            # Check for known providers/models in the name
-            known_icons = ["google", "gemini", "openai", "anthropic", "deepseek", "mistral", 
-                          "qwen", "grok", "xai", "perplexity", "microsoft", "minimax", "nvidia"]
-            for icon_name in known_icons:
-                if icon_name in name_lower:
-                    return icon_name
-            return conf.icon
-        
-        icon = conf.icon
-        m_conf = None
-        if model_used:
-            m_conf = next((m for m in conf.models if m.get("name") == model_used), None)
-            if m_conf:
-                icon = m_conf.get("icon", infer_icon_from_model(model_used))
-            else:
-                # Model not in config list, infer from name
-                icon = infer_icon_from_model(model_used)
 
         # Determine session short code
         if hist_key:
             display_session_id = history_manager.get_code_by_key(hist_key)
             if not display_session_id:
-                # Should not happen if key exists, but fallback
                 display_session_id = history_manager.generate_short_code()
         else:
-            # New conversation, pre-generate code
             display_session_id = history_manager.generate_short_code()
 
-        # Determine vision base url and icon
-        vision_base_url = None
-        vision_icon = None
-        
-        if vision_model_used:
-            v_conf = next((m for m in conf.models if m.get("name") == vision_model_used), None)
-            if v_conf:
-                vision_base_url = v_conf.get("base_url")
-                vision_icon = v_conf.get("icon", infer_icon_from_model(vision_model_used))
-            else:
-                vision_icon = infer_icon_from_model(vision_model_used)
-        
-        # Handle Vision Only Mode (suppress text model display)
-        render_model_name = model_used or conf.model_name or "unknown"
-        render_icon = icon
-        render_base_url = m_conf.get("base_url", conf.base_url) if m_conf else conf.base_url
-        
-        if not model_used and vision_model_used:
-            render_model_name = ""
-            render_icon = ""
-
         # Use stats_list if available, otherwise standard stats
         stats_to_render = final_resp.get("stats_list", final_resp.get("stats", {}))
-
-        # Determine Behavior Summary & Provider Name
-        
-        # 1. Behavior Summary
-        behavior_summary = "Text Generation"
-        if vision_model_used:
-             behavior_summary = "Visual Analysis"
-        elif any(s.get("name") == "Search" for s in final_resp.get("stages_used", []) or []):
-            behavior_summary = "Search-Augmented"
-        
-        # 2. Provider Name
-        # Try to get from m_conf (resolved above)
-        provider_name = "Unknown Provider"
-        if model_used and m_conf:
-            provider_name = m_conf.get("provider", "Unknown Provider")
-        elif not model_used and vision_model_used:
-             # If only vision model used (unlikely but possible in code logic)
-             if 'v_conf' in locals() and v_conf:
-                 provider_name = v_conf.get("provider", "Unknown Provider")
-        
-        # If still unknown and we have base_url, maybe use domain as last resort fallback?
-        # User said: "provider does not automatically get from url if not filled"
-        # So if it's "Unknown Provider", we leave it or maybe empty string?
-        # Let's stick to "Unknown Provider" or just empty if we want to be clean.
-        # But for UI validation it's better to show something if missing config.
              
         render_ok = await renderer.render(
             markdown_content=content,
             output_path=output_path,
-            suggestions=[],
             stats=stats_to_render,
             references=structured.get("references", []),
             page_references=structured.get("page_references", []),
             image_references=structured.get("image_references", []),
-            flow_steps=structured.get("flow_steps", []),
             stages_used=final_resp.get("stages_used", []),
-            model_name=render_model_name,
-            provider_name=provider_name,
-            behavior_summary=behavior_summary,
-            icon_config=render_icon,
-            vision_model_name=vision_model_used,
-            vision_base_url=vision_base_url,
-            vision_icon_config=vision_icon,
-            base_url=render_base_url,
-            billing_info=final_resp.get("billing_info"),
-            render_timeout_ms=conf.render_timeout_ms
+            image_timeout=conf.render_image_timeout_ms,
+            theme_color=conf.theme_color,
         )
         
         # Send & Save
@@ -443,18 +367,16 @@ async def process_request(session: Session[MessageCreatedEvent], all_param: Opti
                 logger.error(f"Failed to save error conversation: {save_err}")
 
 
-
-# Main Command (Question)
 alc = Alconna(
     conf.question_command,
     Args["all_param;?", AllParam],
 )
 
-@command.on(alc)
+@command.on(alc)    
 async def handle_question_command(session: Session[MessageCreatedEvent], result: Arparma):
     """Handle main Question command"""
     try:
-        # logger.info(f"Question Command Triggered. Message: {result}")
+        logger.info(f"Question Command Triggered. Message: {result}")
         mid = str(session.event.message.id) if getattr(session.event, "message", None) else str(session.event.id)
         dedupe_key = f"{getattr(session.account, 'id', 'account')}:{mid}"
         if _event_deduper.seen_recently(dedupe_key):
@@ -468,14 +390,12 @@ async def handle_question_command(session: Session[MessageCreatedEvent], result:
     args = result.all_matched_args
     logger.info(f"Matched Args: {args}")
     
-    # Only all_param is supported now
-    # Context ID for history lookup is automatically handled in process_request
-    
     await process_request(session, args.get("all_param"), selected_model=None, selected_vision_model=None, conversation_key_override=None, local_mode=False)
 
-metadata("hyw", author=[{"name": "kumoSleeping", "email": "zjr2992@outlook.com"}], version="3.2.105", config=HywConfig)
+metadata("hyw", author=[{"name": "kumoSleeping", "email": "zjr2992@outlook.com"}], version=__version__, config=HywConfig)
+
 
-@leto.on(CommandReceive)
+@listen(CommandReceive)
 async def remove_at(content: MessageChain):
-    content = content.lstrip(At)
-    return content
+    logger.info(f"remove_at: {content}")
+    return content.lstrip(At)