pycoze 0.1.361__py3-none-any.whl → 0.1.363__py3-none-any.whl

pycoze/bot/chat.py

@@ -6,6 +6,14 @@ import os
 import asyncio
 from pycoze import utils
 import tempfile
+import re
+
+def eclipse_tool_result(text):
+    # 使用正则表达式匹配 [Tool Result Begin] 和 [Tool Result End] 之间的内容
+    pattern = r'\[Tool Result Begin\].*?\[Tool Result End\]'
+    # 将匹配到的内容替换为 [Tool Result Begin]...[Tool Result End]
+    replaced_text = re.sub(pattern, '[Tool Result Begin]...[Tool Result End]', text, flags=re.DOTALL)
+    return replaced_text
 
 
 async def check_interrupt_file(interval, interrupt_file, chat_task):
@@ -66,6 +74,8 @@ def chat(bot_setting_file: str):
     with open(bot_setting_file, encoding="utf-8") as f:
         bot_setting = json.load(f)
     abilities = get_abilities(bot_setting)
+    remember_tool_results = bot_setting["remember_tool_results"]
+
     cwd = tempfile.mkdtemp()
     system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
     conversation_history = [
@@ -105,8 +115,9 @@ def chat(bot_setting_file: str):
                     bot_setting,
                 )
             )
-        print("has_output")
         output("assistant", CHAT_DATA["info"])
+        if not remember_tool_results:
+            conversation_history = [{"role": msg["role"], "content": eclipse_tool_result(msg["content"])} for msg in conversation_history]
 
 
 def get_chat_response(bot_setting_file: str, user_input: str):

pycoze/bot/chat_base.py

@@ -159,6 +159,7 @@ async def handle_user_inputs(
 ):
     no_exit_if_incomplete = bot_setting["systemAbility"]["no_exit_if_incomplete"]
     programmer_mode = bot_setting["systemAbility"]["programmer_mode"]
+    show_tool_results = bot_setting["show_tool_results"]
 
     start_new_stream = {
         "value": False
@@ -233,13 +234,13 @@ async def handle_user_inputs(
                     assistant_content = (
                         "Executing tool: "
                         + dumps_markdown_json(tool_request)
-                        + "\n\nResult: "
+                        + "\n\n[Tool Result Begin]\n"
                         + result
+                        + "\n[Tool Result End]\n"
                     )
-                    if is_json_dumps:
-                        info("assistant", "\n```json\n" + result + "\n```\n\n")
-                    else:
-                        info("assistant", "\n```text\n" + result + "\n```\n\n")
+                    lang = "json" if is_json_dumps else "text"
+                    if show_tool_results:
+                        info("assistant", f"\n```{lang}\n" + result + "\n```\n\n")
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )

{pycoze-0.1.361.dist-info → pycoze-0.1.363.dist-info}/METADATA

@@ -1,18 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pycoze
-Version: 0.1.361
+Version: 0.1.363
 Summary: Package for pycoze only!
-Home-page: UNKNOWN
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-python
+Dynamic: summary
 
 # PYCOZE
 
@@ -28,5 +32,3 @@ Package for pycoze only!
 <!-- python setup.py sdist bdist_wheel -->
 <!-- twine upload dist/* -->
 <!-- 修改src\renderer\layout\init\const.ts中的库版本要求 -->
-
-

{pycoze-0.1.361.dist-info → pycoze-0.1.363.dist-info}/RECORD

@@ -12,8 +12,8 @@ pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=bTkQCzQZ7i3pYXB70bUSTBNJ9C4TW_X3yMae1VkquGk,1944
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=DB0fUb4B0EVRWWEavCzIa-cSXOpiZrxIusJnQYGPKG8,3765
-pycoze/bot/chat_base.py,sha256=ll9ulBPfKtsrJYLqBsrgaFKU7WjIPRDa-LjwCS6xM_M,9666
+pycoze/bot/chat.py,sha256=LgOReTY3wu02Mw2LmLjDalAs10way8wMRVJPIn1MYc8,4379
+pycoze/bot/chat_base.py,sha256=myh9QrGJIkbFwfV1mLxQ0a-q8uwg3UmpdiT8XXsMIJ0,9750
 pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=OBxwUY6yiwEmusnUHhwixWYByrWX3BpwfxG_Gfas8UM,15783
@@ -33,8 +33,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.361.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.361.dist-info/METADATA,sha256=pAs0FPvxLnN8_Gtmn1C5KlbAi9_sJuem8MgUxCJJdbc,755
-pycoze-0.1.361.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-pycoze-0.1.361.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.361.dist-info/RECORD,,
+pycoze-0.1.363.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.363.dist-info/METADATA,sha256=QUbJJ-jRHz2rAnxCXrN7mnEGfqRyL6lRQSkseP8grKQ,854
+pycoze-0.1.363.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.363.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.363.dist-info/RECORD,,

{pycoze-0.1.361.dist-info → pycoze-0.1.363.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any