entari-plugin-hyw 4.0.0rc4__py3-none-any.whl → 4.0.0rc6__py3-none-any.whl

entari_plugin_hyw/stage_summary.py

@@ -0,0 +1,164 @@
+"""
+Summary Stage
+
+Generates final response based on gathered information.
+Different output formats for different modes.
+"""
+
+import time
+import re
+from typing import Any, Dict, List, Optional
+
+from loguru import logger
+from openai import AsyncOpenAI
+
+from .stage_base import BaseStage, StageContext, StageResult
+from .definitions import SUMMARY_REPORT_SP
+
+
+class SummaryStage(BaseStage):
+    """
+    Summary Stage: Generate final response.
+    """
+    
+    @property
+    def name(self) -> str:
+        return "Summary"
+    
+    async def execute(
+        self, 
+        context: StageContext, 
+        images: List[str] = None
+    ) -> StageResult:
+        """Generate summary."""
+        start_time = time.time()
+        
+        # Format context from web results
+        web_content = self._format_web_content(context)
+        full_context = f"{context.agent_context}\n\n{web_content}"
+        
+        # Select prompt
+        language = getattr(self.config, "language", "Simplified Chinese")
+        
+        system_prompt = SUMMARY_REPORT_SP.format(
+            language=language
+        )
+        
+        # Build Context Message
+        context_message = f"## Web Search & Page Content\n\n```context\n{full_context}\n```"
+        
+        # Build user content
+        user_text = context.user_input or "..."
+        if images:
+            user_content: List[Dict[str, Any]] = [{"type": "text", "text": user_text}]
+            for img_b64 in images:
+                url = f"data:image/jpeg;base64,{img_b64}" if not img_b64.startswith("data:") else img_b64
+                user_content.append({"type": "image_url", "image_url": {"url": url}})
+        else:
+            user_content = user_text
+        
+        messages = [
+            {"role": "system", "content": system_prompt},
+            {"role": "user", "content": context_message},
+            {"role": "user", "content": user_content}
+        ]
+        
+        # Get model config
+        model_cfg = self.config.get_model_config("main")
+        
+        client = self._client_for(
+            api_key=model_cfg.get("api_key"),
+            base_url=model_cfg.get("base_url")
+        )
+        
+        model = model_cfg.get("model_name") or self.config.model_name
+        
+        try:
+            response = await client.chat.completions.create(
+                model=model,
+                messages=messages,
+                temperature=self.config.temperature,
+                extra_body=getattr(self.config, "summary_extra_body", None),
+            )
+        except Exception as e:
+            logger.error(f"SummaryStage LLM error: {e}")
+            return StageResult(
+                success=False,
+                error=str(e),
+                data={"content": f"Error generating summary: {e}"}
+            )
+        
+        usage = {"input_tokens": 0, "output_tokens": 0}
+        if hasattr(response, "usage") and response.usage:
+            usage["input_tokens"] = getattr(response.usage, "prompt_tokens", 0) or 0
+            usage["output_tokens"] = getattr(response.usage, "completion_tokens", 0) or 0
+        
+        content = (response.choices[0].message.content or "").strip()
+        
+        return StageResult(
+            success=True,
+            data={"content": content},
+            usage=usage,
+            trace={
+                "model": model,
+                "provider": model_cfg.get("model_provider") or "Unknown",
+                "usage": usage,
+                "system_prompt": system_prompt,
+                "output": content,
+                "time": time.time() - start_time,
+                "images_count": len(images) if images else 0,
+            }
+        )
+    
+    def _strip_links(self, text: str) -> str:
+        """Strip markdown links [text](url) -> text and remove bare URLs."""
+        # Replace [text](url) with text
+        text = re.sub(r'\[([^\]]+)\]\([^\)]+\)', r'\1', text)
+        # Remove bare URLs (http/https) roughly, trying to preserve surrounding text if possible?
+        # A simple pattern for http/s
+        text = re.sub(r'https?://\S+', '', text)
+        return text
+
+    def _format_web_content(self, context: StageContext) -> str:
+        """Format web results for summary prompt."""
+        if not context.web_results:
+            return ""
+        
+        # Sort results: pages first, then raw searches, then snippets
+        def get_priority(item_type):
+            if item_type == "page": return 0
+            if item_type == "search_raw_page": return 1
+            return 2  # search (snippets)
+            
+        sorted_results = sorted(
+            context.web_results, 
+            key=lambda x: get_priority(x.get("_type"))
+        )
+        
+        lines = []
+        seen_urls = set()
+        
+        for res in sorted_results:
+            type_ = res.get("_type")
+            idx = res.get("_id")
+            title = (res.get("title", "") or "").strip()
+            url = res.get("url", "")
+            
+            # Deduplicate items by URL (keep higher priority item only)
+            if url:
+                if url in seen_urls:
+                    continue
+                seen_urls.add(url)
+            
+            # url = res.get("url", "") # Removed as requested
+            
+            if type_ == "page":
+                content = (res.get("content", "") or "").strip()
+                content = self._strip_links(content)
+                lines.append(f"[{idx}] Title: {title}\nContent:\n{content}\n")
+            elif type_ == "search":
+                snippet = (res.get("content", "") or "").strip()
+                snippet = self._strip_links(snippet)
+                lines.append(f"[{idx}] Title: {title}\nSnippet: {snippet}\n")
+        
+        return "\n".join(lines)

{entari_plugin_hyw-4.0.0rc4.dist-info → entari_plugin_hyw-4.0.0rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 4.0.0rc4
+Version: 4.0.0rc6
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -20,9 +20,9 @@ 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
+Requires-Dist: DrissionPage>=4.1.1.2
+Requires-Dist: trafilatura>=1.6.0
+Requires-Dist: json-repair>=0.55.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-4.0.0rc4.dist-info → entari_plugin_hyw-4.0.0rc6.dist-info}/RECORD

@@ -1,12 +1,16 @@
-entari_plugin_hyw/__init__.py,sha256=XRjnYDWX-dfMi33yD1CcfejHcQyySXTrQVlo95dVfis,17118
-entari_plugin_hyw/history.py,sha256=zYtON0FgkA_AcXerLV335OzpIP30eAxDEp7NHCFFXis,7016
+entari_plugin_hyw/__init__.py,sha256=t-TAqOaghlzVtoSuMfQoiqdA8wrfB7Riofqp3EpGQPU,21844
+entari_plugin_hyw/definitions.py,sha256=sRgNkmzD-XDSbRM2nVQP14WGpMoFrzr9C-cc6xmShDA,6570
+entari_plugin_hyw/history.py,sha256=6d1e8DPfv4XQyM9hMjrx08_WKrxqVSJEvSIGRX4JOB0,11085
 entari_plugin_hyw/image_cache.py,sha256=t8pr1kgH2ngK9IhrBAhzUqhBWERNztUywMzgCFZEtQk,9899
-entari_plugin_hyw/misc.py,sha256=b0KPCUrf1GuCY0Mx29Sn5sREg1fxR1OyYEl4O4Omsys,4553
-entari_plugin_hyw/pipeline.py,sha256=CFp8D9OAJ3nfDsJwKNHb42ZLHYoUL5k9wykrcWC_Tno,52501
-entari_plugin_hyw/prompts.py,sha256=BqX8MNdBG7M6_oRAe1jCiSCgcbRchFAoWpgF9WB3-0o,2348
-entari_plugin_hyw/render_vue.py,sha256=cdIsvuGIC-01Nmc9vgYnGQIY5CGh_ZdqphAhFP4h0Qo,12426
-entari_plugin_hyw/search.py,sha256=bN958sSXYIz7fMmH_ZoS1777c1wXatV05-rvfEq_YHQ,30383
-entari_plugin_hyw/assets/card-dist/index.html,sha256=B5U91hlLEVK_zPNmMoB5daj475ncdRKbVxR35Xgb-Ns,2016492
+entari_plugin_hyw/misc.py,sha256=ZGDXeXbSugG4tRrBfUDVd94i2SCaPOmaGtVmPz8mqtY,5413
+entari_plugin_hyw/modular_pipeline.py,sha256=-p2Z4oUij-G4sCdf2SeHNm89NlVTYHuU91vUIz9R-IM,16867
+entari_plugin_hyw/render_vue.py,sha256=4i5xTZCb9amPgSWo6f7Ev279ZOk-D8Kfmxe2HdcA_vI,14737
+entari_plugin_hyw/search.py,sha256=2Rnc6iYIzPEFH7NtSR0Pi0eXFH-EqIia7Kh3txWmD8U,5262
+entari_plugin_hyw/stage_base.py,sha256=wNotYPl8LElk-1Yf8NB2OvFeGSV2UGW9uEmlY4QmxzA,2752
+entari_plugin_hyw/stage_instruct.py,sha256=2vMLfA7lVRqaPdf9szBfsN7sTAALmkNUsMyUL7tjmGA,14620
+entari_plugin_hyw/stage_instruct_deepsearch.py,sha256=_I_xZ-M1xovM4I7NL5eyc21Wg9xdFKnJDQVQActTjUI,3969
+entari_plugin_hyw/stage_summary.py,sha256=1g1tL7alHbDdp6Mrq2HrXD8k65VMOL-zdyo3bWAS5RQ,5736
+entari_plugin_hyw/assets/card-dist/index.html,sha256=s_RU1rCFowRwFMTuIiUsyGp25WfsIyk-XNWyD9jYqVc,2204580
 entari_plugin_hyw/assets/card-dist/vite.svg,sha256=SnSK_UQ5GLsWWRyDTEAdrjPoeGGrXbrQgRw6O0qSFPs,1497
 entari_plugin_hyw/assets/card-dist/logos/anthropic.svg,sha256=ASsy1ypo3osNc3n-B0R81tk_dIFsVgg7qQORrd5T2kA,558
 entari_plugin_hyw/assets/card-dist/logos/cerebras.svg,sha256=bpmiiYTODwc06knTmPj3GQ7NNtosMog5lkggvB_Z-7M,44166
@@ -44,6 +48,14 @@ entari_plugin_hyw/assets/icon/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD82xXj8fV_k
 entari_plugin_hyw/assets/icon/xai.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
 entari_plugin_hyw/assets/icon/xiaomi.png,sha256=WHxlDFGU5FCjb-ure3ngdGG18-efYZUUfqA3_lqCUN0,4084
 entari_plugin_hyw/assets/icon/zai.png,sha256=K-gnabdsjMLInppHA1Op7Nyt33iegrx1x-yNlvCZ0Tc,2351
+entari_plugin_hyw/browser/__init__.py,sha256=Cht-i5MowfAdmfW3kiY4sV7oXKDb-DmhZ-_eKwDl6r0,321
+entari_plugin_hyw/browser/landing.html,sha256=wgqldumdylz69T83pvOkrigT1Mdb9GY0_KU0ceLGwdY,4642
+entari_plugin_hyw/browser/manager.py,sha256=9VuTyXBr1QBcTV8Nj2vSrozstMmNxAytXESUQ6vxLrM,5234
+entari_plugin_hyw/browser/service.py,sha256=8PihWOdyJcBV1_2lp3PRmmcgXYFN3uryqs5rE9E5a9M,13647
+entari_plugin_hyw/browser/engines/base.py,sha256=q5y4SM1G6xS7-6TQ-nZz9iTWw3XonjJn01fWzoTxr6c,414
+entari_plugin_hyw/browser/engines/bing.py,sha256=rIWcvjzvm700xji_OBl6COUAtwXg87DcXQ97DlTzleA,3838
+entari_plugin_hyw/browser/engines/duckduckgo.py,sha256=jlCIXR1mpJ0LjSbuHMYNGMYjHiQ9Lw_x-A8242Zajgo,5154
+entari_plugin_hyw/browser/engines/google.py,sha256=vCtyOxr63F40hDMW70sS1CyoMsqc0HzyESYrK_qcZLg,6091
 entari_plugin_hyw/card-ui/.gitignore,sha256=_nGOe6uxTzy60tl_CIibnOUhXtP-DkOyuM-_s7m4ROg,253
 entari_plugin_hyw/card-ui/README.md,sha256=fN9IawCcxEcJ8LM-RfKiAH835fRqyY_iqrRsgSkxiSk,442
 entari_plugin_hyw/card-ui/index.html,sha256=Hd7vk8v8PtATbfiEWLYoKDpUT0dlyozW_K5gR_cObfo,328
@@ -72,17 +84,17 @@ entari_plugin_hyw/card-ui/public/logos/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD8
 entari_plugin_hyw/card-ui/public/logos/xai.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
 entari_plugin_hyw/card-ui/public/logos/xiaomi.png,sha256=WHxlDFGU5FCjb-ure3ngdGG18-efYZUUfqA3_lqCUN0,4084
 entari_plugin_hyw/card-ui/public/logos/zai.png,sha256=K-gnabdsjMLInppHA1Op7Nyt33iegrx1x-yNlvCZ0Tc,2351
-entari_plugin_hyw/card-ui/src/App.vue,sha256=fwnw_SFFXK383w0BGAjopzPv7vAWForOLJa2K0tX03o,17821
+entari_plugin_hyw/card-ui/src/App.vue,sha256=ofRlf3hTSqDg1l8jgnFwzWg1dBzQVVg5MLOaMW01z68,28858
 entari_plugin_hyw/card-ui/src/main.ts,sha256=rm653lPnK5fuTIj-iNLpgr8GAmayuCoKop7IWfo0IBk,111
 entari_plugin_hyw/card-ui/src/style.css,sha256=Qm0sv9em6k4VI_j5PI0_E_ng6u20eFpf2lN44H19zzc,671
 entari_plugin_hyw/card-ui/src/test_regex.js,sha256=cWmclm6LRKYfjeN1RT5HECdltmo1HvS2BwGCYY_4l14,3040
-entari_plugin_hyw/card-ui/src/types.ts,sha256=jzI8MXDKxz7WRZmGVb-bToO8BEFW2AOp8iek1n4VuQY,1246
+entari_plugin_hyw/card-ui/src/types.ts,sha256=2HkcsR1ej2y3yR7pvUA_y8XXP_1_NhLVAIKez3OIb3g,1583
 entari_plugin_hyw/card-ui/src/assets/vue.svg,sha256=VTLbNPHFKEGIG6uK7KbD6NCSvSGmiaZfTY-M-AQe750,496
 entari_plugin_hyw/card-ui/src/components/HelloWorld.vue,sha256=yvBIzJua9BfikUOR1I7GYytlnBbgB6xyposxslAoRLU,856
-entari_plugin_hyw/card-ui/src/components/MarkdownContent.vue,sha256=JO1sKThQB42bVl5382BkxpDEyRpAK7oGcmdj1LY5P64,13190
+entari_plugin_hyw/card-ui/src/components/MarkdownContent.vue,sha256=SV95Vuj99tQN2yrU9GqiyhiemWAW8omhYnS8AsH1YIU,13325
 entari_plugin_hyw/card-ui/src/components/SectionCard.vue,sha256=owcDNx2JYVmF2J5SYCroR2gvg_cPApQsNunjK1WJpVI,1433
-entari_plugin_hyw/card-ui/src/components/StageCard.vue,sha256=cC0TeJ4AhtN3sJEXenVpl2Eq5901GKC59qpDUNH2SZE,10964
-entari_plugin_hyw-4.0.0rc4.dist-info/METADATA,sha256=0Ytj2E6tpljuG281p44mEEusfc3V-ZUB1V5rvEswwos,3746
-entari_plugin_hyw-4.0.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-entari_plugin_hyw-4.0.0rc4.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
-entari_plugin_hyw-4.0.0rc4.dist-info/RECORD,,
+entari_plugin_hyw/card-ui/src/components/StageCard.vue,sha256=MgpOaBlPR--LJoRenN37i72BV8qVgzDdurpoKCvzKyk,11133
+entari_plugin_hyw-4.0.0rc6.dist-info/METADATA,sha256=ODqjgpaG9PeWasK1FlsQ5E39DxvyyC7nVy4WMy_HcUk,3766
+entari_plugin_hyw-4.0.0rc6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+entari_plugin_hyw-4.0.0rc6.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
+entari_plugin_hyw-4.0.0rc6.dist-info/RECORD,,