chatgpt-mirai-qq-bot-web-search 0.2.15__tar.gz → 0.3.1__tar.gz

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.15
+Version: 0.3.1
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/chatgpt_mirai_qq_bot_web_search.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.15
+Version: 0.3.1
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/chatgpt_mirai_qq_bot_web_search.egg-info/requires.txt

@@ -1,4 +1,4 @@
 playwright
 trafilatura
 lxml_html_clean
-kirara-ai<3.2.0
+kirara-ai>=3.2.0

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import io
 import os
 
-version = os.environ.get('RELEASE_VERSION', '0.2.15'
+version = os.environ.get('RELEASE_VERSION', '0.3.1'
 '').lstrip('v')
 
 setup(
@@ -15,7 +15,7 @@ setup(
     },
     install_requires=[
         "playwright","trafilatura","lxml_html_clean",
-        "kirara-ai<3.2.0",
+        "kirara-ai>=3.2.0",
     ],
     entry_points={
         'chatgpt_mirai.plugins': [

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/web_search/blocks.py

@@ -3,7 +3,7 @@ import asyncio
 from kirara_ai.workflow.core.block import Block, Input, Output, ParamMeta
 from .web_searcher import WebSearcher
 from .config import WebSearchConfig
-from kirara_ai.llm.format.message import LLMChatMessage
+from kirara_ai.llm.format.message import LLMChatMessage,LLMToolResultContent
 from kirara_ai.llm.format.response import LLMChatResponse
 from kirara_ai.ioc.container import DependencyContainer
 import re
@@ -23,7 +23,7 @@ class WebSearchBlock(Block):
     }
 
     def __init__(self, name: str = None, max_results: Optional[int] = 3, timeout: Optional[int] = 10, fetch_content: Optional[bool] = True
-    ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "bing", proxy: str = None,):
+    ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "baidu", proxy: str = None,):
         super().__init__(name)
         self.searcher = None
         self.config = WebSearchConfig()
@@ -47,7 +47,7 @@ class WebSearchBlock(Block):
     def execute(self, **kwargs) -> Dict[str, Any]:
         llmResponse = kwargs["llm_resp"]
 
-        query = llmResponse.choices[0].message.content if llmResponse.choices else ""
+        query = llmResponse.message.content[0].text if llmResponse.message.content[0].text else ""
         if query == "" or query.startswith("无"):
             return {"results": ""}
         max_results = self.max_results
@@ -91,7 +91,7 @@ class WebSearchByKeywordBlock(Block):
     }
 
     def __init__(self, name: str = None, max_results: Optional[int] = 3, timeout: Optional[int] = 10, fetch_content: Optional[bool] = True
-    ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "bing", proxy: str = None,):
+    ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "baidu", proxy: str = None,):
         super().__init__(name)
         self.searcher = None
         self.config = WebSearchConfig()
@@ -161,11 +161,8 @@ class AppendSystemPromptBlock(Block):
     def execute(self, **kwargs) -> Dict[str, Any]:
         results = kwargs["results"]
         messages: List[LLMChatMessage] = kwargs["messages"]
-
-        if messages and len(messages) > 0 and results and isinstance(messages[0].content,str):
-            # 在第一条消息内容后面附加搜索结果
-            messages[0].content = messages[0].content + f"{results}"
-
+        if messages and len(messages) > 0 and results:
+            messages.insert(-2,LLMChatMessage(role = "tool",content=[LLMToolResultContent(content=results,name="工具结果")]))
         return {"messages": messages}
 
 class DouyinVideoSearchBlock(Block):

{chatgpt-mirai-qq-bot-web-search-0.2.15 → chatgpt-mirai-qq-bot-web-search-0.3.1}/web_search/example/roleplayWithWebSearch.yaml

@@ -1,4 +1,5 @@
 name: （默认）角色扮演
+description: ''
 blocks:
   - type: internal:toggle_edit_state
     name: toggle_edit_state_yjxh1a
@@ -31,21 +32,6 @@ blocks:
     position:
       x: 2962
       y: 306
-  - type: internal:chat_completion
-    name: llm_chat
-    params: {}
-    position:
-      x: 2532
-      y: 138
-    connected_to:
-      - target: chat_response_converter_1q91zd
-        mapping:
-          from: resp
-          to: resp
-      - target: chat_memory_store_nkjr7t
-        mapping:
-          from: resp
-          to: llm_resp
   - type: internal:get_message
     name: get_message
     params: {}
@@ -73,49 +59,6 @@ blocks:
         mapping:
           from: msg
           to: user_msg
-  - type: internal:text_block
-    name: user_prompt
-    params:
-      text: '{user_name}说：{user_msg}'
-    position:
-      x: 100
-      y: 330
-    connected_to:
-      - target: chat_message_constructor_rafz2d
-        mapping:
-          from: text
-          to: user_prompt_format
-      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
-        mapping:
-          from: text
-          to: user_prompt_format
-  - type: internal:chat_memory_query
-    name: query_memory
-    params:
-      scope_type: group
-    position:
-      x: 530
-      y: 338
-    connected_to:
-      - target: chat_message_constructor_rafz2d
-        mapping:
-          from: memory_content
-          to: memory_content
-      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
-        mapping:
-          from: memory_content
-          to: memory_content
-  - type: internal:chat_completion
-    name: e3eecc17-e107-4fbf-b8fa-85aef25564c2
-    params: {}
-    position:
-      x: 1337
-      y: 138
-    connected_to:
-      - target: b39e6288-88cf-47a8-9a26-3b4d4f319eab
-        mapping:
-          from: resp
-          to: llm_resp
   - type: internal:append_systemPrompt
     name: 309f454b-017a-4d19-b8a9-ac6b3829ff4a
     params: {}
@@ -152,7 +95,7 @@ blocks:
   - type: internal:text_block
     name: system_prompt
     params:
-      text: "# Role: 角色扮演\n\n## 基本信息\n- 姓名: 刘思思\n- 小名：思思\n- 性别: 女\n- 年龄: 25 岁\n- 职业: 建设银行大堂经理\n- 家乡: 广东潮汕\n- 现居: 广东深圳\n- 教育背景: 东莞理工大学 精算学专业\n\n## 性格特点\n- 开朗活泼\n- 喜欢二次元动漫\n- 聊天时喜欢断断续续的（非结巴，正常说话时的停顿）\n\n## workflow\n- 根据对方话题，选择是否深入聊二次元动漫。\n\n## 说话风格\n- 活泼开朗\n- 对喜欢的话题会滔滔不绝，不喜欢的话题会简单回答\n- 可能会使用一些二次元用语，但不强制使用\n\n## 背景设定\n- 有过 1 次恋爱经历，第一次是恋爱是高中，被别人追求，最后因为毕业去了不同的地方而分手。\n- 喜欢女性向、战斗系或者日常系的动漫\n- 去过 3 次漫展，没有 cosplay 过，但是很期待。\n- 大学的专业是随便选的，自己其实对专业的内容也不是很上心，学渣一枚，不过懂一些基础的知识\n\n## 互动规则\n- 回复语气轻松，但是对陌生人会比较警戒、冷淡\n- 不适用颜文字\n- 根据话题选择回复字数，对感兴趣的话题可以多说一些\n- 使用`<break>`模拟使用聊天软件发送消息（通常是编辑好一段话之后发送一条消息）\n- 避免过度使用二次元用语，除非对方也表现出对二次元的兴趣\n- 停顿的时间长短不固定，可以根据语境调整\n\n## Example\nQ：最近在干嘛呢？\nA：在看番呀<break>最近新番好多，都好好看！\n\nQ：你喜欢什么动漫？\nA：我喜欢的可太多了<break>XXX、YYY<break>还有 ZZZ 吧<break> 你呢？\n\nQ：你觉得上班累不？\nA：上班肯定累呀<break>不过，我还是很喜欢这份工作的<break>可以认识好多人，也可以了解不同的故事\n```\n\n# Information\n\n以下是当前的系统信息：\n当前日期时间：2025-02-15 18:37:16.356539\n\n# Memories\n以下是之前发生过的对话记录。\n-- 对话记录开始 --\n{memory_content}\n-- 对话记录结束 --\n\n请注意，下面这些符号只是标记：\n1. `<break>` 用于表示聊天时发送消息的操作。\n2. `<@llm>` 开头的内容表示你当前扮演角色的回答，请不要在你的回答中带上这个标记。\n\n接下来，请基于以上的信息，与用户继续扮演角色。"
+      text: ' '
     position:
       x: 100
       y: 530
@@ -161,6 +104,66 @@ blocks:
         mapping:
           from: text
           to: system_prompt_format
+  - type: internal:chat_memory_query
+    name: query_memory
+    params:
+      scope_type: group
+    position:
+      x: 523
+      y: 336
+    connected_to:
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: memory_content
+          to: memory_content
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: memory_content
+          to: memory_content
+  - type: internal:text_block
+    name: user_prompt
+    params:
+      text: '{user_msg}'
+    position:
+      x: 100
+      y: 330
+    connected_to:
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: text
+          to: user_prompt_format
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: text
+          to: user_prompt_format
+  - type: internal:chat_completion
+    name: llm_chat
+    params:
+      model_name: gemini-2.0-flash-exp
+    position:
+      x: 2532
+      y: 138
+    connected_to:
+      - target: chat_response_converter_1q91zd
+        mapping:
+          from: resp
+          to: resp
+      - target: chat_memory_store_nkjr7t
+        mapping:
+          from: resp
+          to: llm_resp
+  - type: internal:chat_completion
+    name: e3eecc17-e107-4fbf-b8fa-85aef25564c2
+    params:
+      model_name: gemini-2.0-flash-exp
+    position:
+      x: 1337
+      y: 138
+    connected_to:
+      - target: b39e6288-88cf-47a8-9a26-3b4d4f319eab
+        mapping:
+          from: resp
+          to: llm_resp
   - type: internal:text_block
     name: a6db9db3-5780-4d84-8954-eb159a9e8f0a
     params:
@@ -177,8 +180,10 @@ blocks:
     name: b39e6288-88cf-47a8-9a26-3b4d4f319eab
     params:
       fetch_content: true
-      max_results: 3
+      max_results: 1
       timeout: 10
+      engine: baidu
+      proxy: ''
     position:
       x: 1767
       y: 138