entari-plugin-hyw 3.5.0rc1__tar.gz → 3.5.0rc3__tar.gz

{entari_plugin_hyw-3.5.0rc1/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.5.0rc3}/PKG-INFO

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

{entari_plugin_hyw-3.5.0rc1 → entari_plugin_hyw-3.5.0rc3}/pyproject.toml

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

{entari_plugin_hyw-3.5.0rc1 → entari_plugin_hyw-3.5.0rc3}/src/entari_plugin_hyw/__init__.py

@@ -1,20 +1,29 @@
 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_vue import ContentRenderer
-from .utils.misc import process_onebot_json, process_images, resolve_model_name
-from arclet.entari.event.lifespan import Cleanup, Startup
+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
 import secrets
@@ -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
@@ -89,89 +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(Startup)
-async def _hyw_startup():
-    try:
-        # Pre-launch browser
-        logger.info("HYW: Pre-launching renderer browser...")
-        await renderer.start()
-    except Exception as e:
-        logger.warning(f"HYW: Renderer warm-up failed: {e}")
-
-@listen(Cleanup, once=True)
-async def _hyw_cleanup():
-    try:
-        await hyw.close()
-        await renderer.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}")
@@ -251,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")
@@ -300,6 +298,7 @@ async def process_request(session: Session[MessageCreatedEvent], all_param: Opti
             image_references=structured.get("image_references", []),
             stages_used=final_resp.get("stages_used", []),
             image_timeout=conf.render_image_timeout_ms,
+            theme_color=conf.theme_color,
         )
         
         # Send & Save
@@ -368,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):
@@ -393,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.5.0-rc1", 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)