AstrBot 4.14.0__py3-none-any.whl → 4.14.1__py3-none-any.whl

astrbot/builtin_stars/astrbot/main.py

@@ -77,7 +77,6 @@ class Main(star.Star):
 
                     yield event.request_llm(
                         prompt=prompt,
-                        func_tool_manager=self.context.get_llm_tool_manager(),
                         session_id=event.session_id,
                         conversation=conv,
                     )

astrbot/builtin_stars/session_controller/main.py

@@ -49,7 +49,7 @@ class Main(Star):
                     if p_settings.get("empty_mention_waiting_need_reply", True):
                         try:
                             # 尝试使用 LLM 生成更生动的回复
-                            func_tools_mgr = self.context.get_llm_tool_manager()
+                            # func_tools_mgr = self.context.get_llm_tool_manager()
 
                             # 获取用户当前的对话信息
                             curr_cid = await self.context.conversation_manager.get_curr_conversation_id(
@@ -76,7 +76,6 @@ class Main(Star):
                                     "你友好地询问用户想要聊些什么或者需要什么帮助，回复要符合人设，不要太过机械化。"
                                     "请注意，你仅需要输出要回复用户的内容，不要输出其他任何东西"
                                 ),
-                                func_tool_manager=func_tools_mgr,
                                 session_id=curr_cid,
                                 contexts=[],
                                 system_prompt="",

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.14.0"
+__version__ = "4.14.1"

astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.14.0"
+VERSION = "4.14.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [

astrbot/core/platform/astr_message_event.py

@@ -22,6 +22,7 @@ from astrbot.core.message.components import (
 from astrbot.core.message.message_event_result import MessageChain, MessageEventResult
 from astrbot.core.platform.message_type import MessageType
 from astrbot.core.provider.entities import ProviderRequest
+from astrbot.core.agent.tool import ToolSet
 from astrbot.core.utils.metrics import Metric
 from astrbot.core.utils.trace import TraceSpan
 
@@ -355,6 +356,7 @@ class AstrMessageEvent(abc.ABC):
         self,
         prompt: str,
         func_tool_manager=None,
+        tool_set: ToolSet | None = None,
         session_id: str = "",
         image_urls: list[str] | None = None,
         contexts: list | None = None,
@@ -377,7 +379,7 @@ class AstrMessageEvent(abc.ABC):
 
         contexts: 当指定 contexts 时，将会使用 contexts 作为上下文。如果同时传入了 conversation，将会忽略 conversation。
 
-        func_tool_manager: 函数工具管理器，用于调用函数工具。用 self.context.get_llm_tool_manager() 获取。
+        func_tool_manager: [Deprecated] 函数工具管理器，用于调用函数工具。用 self.context.get_llm_tool_manager() 获取。已过时，请使用 tool_set 参数代替。
 
         conversation: 可选。如果指定，将在指定的对话中进行 LLM 请求。对话的人格会被用于 LLM 请求，并且结果将会被记录到对话中。
 
@@ -393,7 +395,8 @@ class AstrMessageEvent(abc.ABC):
             prompt=prompt,
             session_id=session_id,
             image_urls=image_urls,
-            func_tool=func_tool_manager,
+            # func_tool=func_tool_manager,
+            func_tool=tool_set,
             contexts=contexts,
             system_prompt=system_prompt,
             conversation=conversation,

{astrbot-4.14.0.dist-info → astrbot-4.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.14.0
+Version: 4.14.1
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin

{astrbot-4.14.0.dist-info → astrbot-4.14.1.dist-info}/RECORD

@@ -9,7 +9,7 @@ astrbot/api/provider/__init__.py,sha256=mJVcon0snjn_xYirk2hntwba6ymIYYC-ZKKmxvx-
 astrbot/api/star/__init__.py,sha256=OxgHGtWn3lEQGjb4twbpbWnRepUevPu7gxtDAkAsfhQ,250
 astrbot/api/util/__init__.py,sha256=L1O_mFEUDk8V4lEPsT5iiNbIiOVh7HbrNmitqzUWMZg,180
 astrbot/builtin_stars/astrbot/long_term_memory.py,sha256=Gra7dqiqXLBH_u4M6TZmu49lxiolotbDNTwbh2aVTiA,7676
-astrbot/builtin_stars/astrbot/main.py,sha256=CeYK4iQZ8ma1gbFtOiQLdwEATrC8YFERX89ZwGTfnDc,4687
+astrbot/builtin_stars/astrbot/main.py,sha256=cAXasaj62RRJdh02gRRpkjlpF9GDcfbv5AIfM2qQhAY,4608
 astrbot/builtin_stars/astrbot/metadata.yaml,sha256=GCPK0piMKr4C6Bb0kaBJYhiqPDoMEAYJJp2MV5pXs4k,197
 astrbot/builtin_stars/builtin_commands/main.py,sha256=T8bNer22YgFkKZbLn9Zl-5Y1SIbKpQe_HvDJpUiyte4,7613
 astrbot/builtin_stars/builtin_commands/metadata.yaml,sha256=x0URUKI3S14RRXQ-ewgJy4dYXMKxZcEo2pSKeApGleg,152
@@ -27,14 +27,14 @@ astrbot/builtin_stars/builtin_commands/commands/sid.py,sha256=mQIk2f6zFjO7ukZf-6
 astrbot/builtin_stars/builtin_commands/commands/t2i.py,sha256=cfE8Z75EQEFvpxA2k1hLNWHQk5OUAHQMMn9_m5mMB2k,775
 astrbot/builtin_stars/builtin_commands/commands/tts.py,sha256=k6GJEEV6YkCAhIEosv85w65_R7NSAu4TfJ3ViCMHc0c,1304
 astrbot/builtin_stars/builtin_commands/commands/utils/rst_scene.py,sha256=dOL-hjTceG-vrxatB9Cv3xLDFfRlTO_ifWb9Pc7Za7k,781
-astrbot/builtin_stars/session_controller/main.py,sha256=a4rvB65Z-Nzf7Wmhq69Ki6xRBeuWOLkE1IGiI8f-kpE,5406
+astrbot/builtin_stars/session_controller/main.py,sha256=cKu3zqyo75BTVdrCwvhd9cd5ViVrF2mqM9NUVTe7URk,5342
 astrbot/builtin_stars/session_controller/metadata.yaml,sha256=JyV3_l1BjPdklELpe2L6V5C03i_oymXaQnnf3y_gFgc,126
 astrbot/builtin_stars/web_searcher/main.py,sha256=B5eaSinpWbsZP5URZQkCxPw1IwZJRi_1BCINHl_RViQ,17820
 astrbot/builtin_stars/web_searcher/metadata.yaml,sha256=aHAKtP8UZJaddzIN2eFfglTOIAnLyJ9-wyM00Io6P7E,99
 astrbot/builtin_stars/web_searcher/engines/__init__.py,sha256=Gcp7k6m3w2Pb-hNCe3QIiYa9smQFcEzmb7jcfg2evuw,4300
 astrbot/builtin_stars/web_searcher/engines/bing.py,sha256=pn3DPR-5SO2D_RtBIU3l9Ph7PTUB-FCZAMCYuk6kd6Q,1035
 astrbot/builtin_stars/web_searcher/engines/sogo.py,sha256=YA7pA5-335r7UgKpyUPAeGGZQbYEwDBO8bm08Ro8Xg0,1701
-astrbot/cli/__init__.py,sha256=ML3ydKKX6mbmGVRGSQD6MJ_XsLE5F-KE-zq16Mn-ww8,23
+astrbot/cli/__init__.py,sha256=9Wn8BwD7EU7A8hupiqYQO3QNgiGcpbdgKgkCwHlUb-o,23
 astrbot/cli/__main__.py,sha256=QobgMyFoLNTgI_OYddhGOZ9ZvQeBVjjz79mA2cC2OEU,1758
 astrbot/cli/commands/__init__.py,sha256=eAgppZQIqFO1ylQJFABeYrzQ0oZqPWjtE80aKIPB3ks,149
 astrbot/cli/commands/cmd_conf.py,sha256=6-YLicBt_zjWTzaVLUJ1VQLQPbDEPYACB9IVnN8Zvng,6330
@@ -107,7 +107,7 @@ astrbot/core/computer/tools/python.py,sha256=E6-eRarOjE6AhYioOj5gZhfn10S3fC8uHjO
 astrbot/core/computer/tools/shell.py,sha256=b2RWis65YJtUZHhmsLZI1L1LRvnfMlsZcXL4KPbqq_s,2211
 astrbot/core/config/__init__.py,sha256=vZjtpC7vr-IvBgSUtbS04C0wpulmCG5tPmcEP1WYE_4,172
 astrbot/core/config/astrbot_config.py,sha256=5r2VhCNO4VuGCqct12g10-TcvAKyXV40-suk5vRMGns,6436
-astrbot/core/config/default.py,sha256=87XKaVMI410lJiY1khqdXazljAAILy4z4BmLjjys01Q,164252
+astrbot/core/config/default.py,sha256=2baPozggK-OD4OS6cRKhmCJHmj4qcklpvo0wlwNWumM,164252
 astrbot/core/config/i18n_utils.py,sha256=HJn_0XeeVS9ryCBelYfnc0nEn10LlX702fcSSFrF1J8,3879
 astrbot/core/cron/__init__.py,sha256=QJXfH2H9YSTAb9t5cZOxjwx9GasTF-TBIs6OksH4oKg,66
 astrbot/core/cron/events.py,sha256=5QnRacoqTJ_FIF_7rupLZVIhjzjt5_aK61hcSVYPnJI,2265
@@ -174,7 +174,7 @@ astrbot/core/pipeline/session_status_check/stage.py,sha256=448eWo72O-JZCXMGBLznJ
 astrbot/core/pipeline/waking_check/stage.py,sha256=eDxbk_nWEhiwrARJ8DFoH8qf1mi_OdeOutWq3xLA41c,9787
 astrbot/core/pipeline/whitelist_check/stage.py,sha256=x6o4oswIvVtHFRbuKuLFoyFEgx-gSo3IMGYvopu8d9A,2411
 astrbot/core/platform/__init__.py,sha256=5Hhb2mIb8mS2RWfxILIMuV03XiyfqEbn4pAjvi8ntl0,361
-astrbot/core/platform/astr_message_event.py,sha256=Wwf2YmFVMaX9iKFdQFFAIdir2Gkw0YCj6cjscN72VNk,15964
+astrbot/core/platform/astr_message_event.py,sha256=4C0OayaWMSspjMSOJE-q-4tv6Gx73Wgq3ioVa0_Ah88,16142
 astrbot/core/platform/astrbot_message.py,sha256=kdoiyZoCaH3iVua4pvKw7HHlfVpVB4bI36UeqYX1o38,2670
 astrbot/core/platform/manager.py,sha256=iz6mnYE6DAIZ_b_bkqWfTNYCffRKJVHqsbxuugM3pTU,11549
 astrbot/core/platform/message_session.py,sha256=Fg0MWI4i6IB2jsD39a7fAduFtNcVdFIi40HAHeR9brk,1092
@@ -340,8 +340,8 @@ astrbot/dashboard/routes/t2i.py,sha256=F6smxdL99MF7cRw3hqS6-2GErw8Zhsv0V0mfBUeEk
 astrbot/dashboard/routes/tools.py,sha256=n2l04MGyZL7vVPvGtEbPPBNNs-1qbDkrNMcQbTL8Yag,16294
 astrbot/dashboard/routes/update.py,sha256=qXiqQ_dbqRVftOzGgCQrvK8-qopVK6zKhhVVJ9SK26U,6648
 astrbot/dashboard/routes/util.py,sha256=Ewf5EgWs0evjOyIbgFffJH6T4DzgDrIoacd6VZ5Ix2c,2856
-astrbot-4.14.0.dist-info/METADATA,sha256=gW0VNs77sdJZGksyHmk5QO91jJB08PrRirXzDbUQrd0,13559
-astrbot-4.14.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-astrbot-4.14.0.dist-info/entry_points.txt,sha256=OEF09YmhBWYuViXrvTLLpstF4ccmNwDL8r7nnFD0pfI,53
-astrbot-4.14.0.dist-info/licenses/LICENSE,sha256=zPfQj5Mq8-gThIiBcxETr7t8gND9bZWOjTGQAr80TQI,34500
-astrbot-4.14.0.dist-info/RECORD,,
+astrbot-4.14.1.dist-info/METADATA,sha256=IrdyiuhhG6OQ3SYfrnNj5mUjHnmJoRicP7DDMLkj_lE,13559
+astrbot-4.14.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+astrbot-4.14.1.dist-info/entry_points.txt,sha256=OEF09YmhBWYuViXrvTLLpstF4ccmNwDL8r7nnFD0pfI,53
+astrbot-4.14.1.dist-info/licenses/LICENSE,sha256=zPfQj5Mq8-gThIiBcxETr7t8gND9bZWOjTGQAr80TQI,34500
+astrbot-4.14.1.dist-info/RECORD,,