pycoze 0.1.380__py3-none-any.whl → 0.1.382__py3-none-any.whl

pycoze/bot/chat.py

@@ -8,6 +8,8 @@ from pycoze import utils
 import tempfile
 import re
 import datetime
+from pathlib import Path
+
 
 def eclipse_tool_result(text, threshold=100):
     pattern = r'\[Tool Result Begin\](.*?)\[Tool Result End\]'
@@ -93,7 +95,10 @@ def chat(bot_setting_file: str):
     abilities = get_abilities(bot_setting)
     continuouslyRememberToolResults = bot_setting["continuouslyRememberToolResults"]
 
-    cwd = tempfile.mkdtemp()
+    if bot_setting["specifiedWorkingDirectory"] is None:
+        cwd = tempfile.mkdtemp()
+    else:
+        cwd = Path(bot_setting["specifiedWorkingDirectory"]).as_posix()
     system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
     conversation_history = [
         {

pycoze/bot/chat_base.py

@@ -37,8 +37,7 @@ def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode
             if content
             else ""
         )
-        return f"""
-<task>
+        return f"""<task>
 {user_input}
 </task>
 
@@ -52,11 +51,14 @@ List of files under path:
 
 </environment_details>
     """
+
     else:
-        return f"""
-<task>
+        return f"""<task>
 {user_input}
 </task>
+<environment_details>
+Current working directory: {cwd}
+</environment_details>
 """
 
 
@@ -65,18 +67,6 @@ def dumps_markdown_json(data):
     return f"\n```json\n{json_str}\n```\n"
 
 
-def process_code_block(language: str, content: str):
-    """
-    处理并清理代码块内容，返回格式化后的字符串
-    """
-    if language and content:
-        # 清理代码块内容
-        cleaned_content = "\n".join(
-            line.strip() for line in content.split("\n") if line.strip()
-        )
-        return (language, cleaned_content)
-    return ""
-
 
 async def stream_openai_response(conversation_history, start_new_stream):
     """
@@ -84,9 +74,8 @@ async def stream_openai_response(conversation_history, start_new_stream):
     """
     stream = None
     buffer = ""
-    in_code_block = False
-    code_block_language = ""
-    code_block_content = ""
+    in_json_block = False
+    json_block_content = ""
     text_content = ""
 
     while True:
@@ -97,9 +86,8 @@ async def stream_openai_response(conversation_history, start_new_stream):
             stream = chat_stream_async(conversation_history)  # 获取新的异步生成器
             start_new_stream["value"] = False  # 重置标志
             buffer = ""
-            in_code_block = False
-            code_block_language = ""
-            code_block_content = ""
+            in_json_block = False
+            json_block_content = ""
             text_content = ""
 
         # 使用 async for 迭代异步生成器
@@ -115,24 +103,21 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 # 处理 buffer 中的每一行
                 while "\n" in buffer:
                     line, buffer = buffer.split("\n", 1)
-                    if not in_code_block:
-                        if line.strip().startswith("```"):
+                    if not in_json_block:
+                        if line.strip().lower().startswith("```json"):
                             if text_content:
                                 yield ("text", text_content.strip())
                                 text_content = ""
-                            in_code_block = True
-                            code_block_language = line.strip()[3:].strip()
+                            in_json_block = True
                         else:
                             text_content += line + "\n"
                     else:
-                        if line.strip().startswith("```"):
-                            in_code_block = False
-                            yield process_code_block(
-                                code_block_language, code_block_content
-                            )
-                            code_block_content = ""
+                        if line.strip().lower().startswith("```") and in_json_block:
+                            yield ("json", json_block_content.strip())
+                            json_block_content = ""
+                            in_json_block = False
                         else:
-                            code_block_content += line + "\n"
+                            json_block_content += line + "\n"
 
             # 如果流正常结束，退出 while 循环
             break
@@ -144,10 +129,10 @@ async def stream_openai_response(conversation_history, start_new_stream):
 
     # 处理 buffer 中剩余的内容
     if buffer:
-        if in_code_block:
+        if in_json_block:
             buffer = buffer.split("```")[0]
-            code_block_content += buffer + "\n"
-            yield process_code_block(code_block_language, code_block_content)
+            json_block_content += buffer
+            yield ("json", json_block_content.strip())
         else:
             text_content += buffer
             if text_content:
@@ -189,7 +174,7 @@ async def handle_user_inputs(
         ):
             if len(response) == 2:
                 if (
-                    response[0] != "json"
+                    response[0] == "text"
                     and response[1].strip() != ""
                     or (response[0] == "json" and not has_any_tool)
                 ):

{pycoze-0.1.380.dist-info → pycoze-0.1.382.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycoze
-Version: 0.1.380
+Version: 0.1.382
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.380.dist-info → pycoze-0.1.382.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=cxaF20QCAoca54lo472o1K9VRXu5f3uU-bH7VdSumnU,5635
-pycoze/bot/chat_base.py,sha256=klJdK5W8pIeBB2zuIRXCgonKVKzExGfCP2IiSJsN4Bo,10231
+pycoze/bot/chat.py,sha256=VoYFhO-vYFeQIPbnUI6cRgVQTCihUcDLDK9HK2_VstI,5804
+pycoze/bot/chat_base.py,sha256=abCJvqEtShQpARefTfRTIrKCohN78nWztb2MvX3R-tc,9714
 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.380.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.380.dist-info/METADATA,sha256=hHflUHg1pkvCCyNUwikenE0w9SnOHrauos6yFT4osGE,854
-pycoze-0.1.380.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.380.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.380.dist-info/RECORD,,
+pycoze-0.1.382.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.382.dist-info/METADATA,sha256=JrRAP5KhJiZflVCZhLideI9CF4blKLvYA0tqJa5OaTg,854
+pycoze-0.1.382.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.382.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.382.dist-info/RECORD,,