pycoze 0.1.393__py3-none-any.whl → 0.1.394__py3-none-any.whl

pycoze/bot/chat.py

@@ -59,6 +59,7 @@ async def run_with_interrupt_check(
     abilities,
     has_any_tool,
     bot_setting,
+    bot_setting_file:str,
     interrupt_file,
 ):
     clear_chat_data()
@@ -71,6 +72,7 @@ async def run_with_interrupt_check(
                 abilities,
                 has_any_tool,
                 bot_setting,
+                bot_setting_file
             )
         )
         check_task = asyncio.create_task(
@@ -138,6 +140,7 @@ def chat(bot_setting_file: str):
                     abilities,
                     has_any_tool,
                     bot_setting,
+                    bot_setting_file,
                     params["interruptFile"],
                 )
             )
@@ -150,6 +153,7 @@ def chat(bot_setting_file: str):
                     abilities,
                     has_any_tool,
                     bot_setting,
+                    bot_setting_file,
                 )
             )
         output("assistant", CHAT_DATA["info"])
@@ -185,7 +189,7 @@ def get_chat_response(bot_setting_file: str, user_input: str):
     ]
     asyncio.run(
         handle_user_inputs(
-            conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting
+            conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting, bot_setting_file
         )
     )
 

pycoze/bot/chat_base.py

@@ -36,7 +36,14 @@ def format_content(cwd, potential_paths, conversation_history):
         else ""
     )
 
-def generate_user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode: bool, active_file:str, opened_files: List[str]):
+def generate_user_task_prompt(conversation_history, cwd, user_input: str, bot_setting_file:str):
+    # 需要重新读取openedFiles和activeFile
+    with open(bot_setting_file, encoding="utf-8") as f: 
+        bot_setting = json.load(f)
+    programmer_mode = bot_setting["programmerMode"]
+    opened_files = bot_setting["openedFiles"]
+    active_file = bot_setting["activeFile"]
+
     if programmer_mode:
         potential_paths = guess_files_in_message(cwd, user_input)
 
@@ -151,14 +158,11 @@ async def stream_openai_response(conversation_history, start_new_stream):
 
 
 async def handle_user_inputs(
-    conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting
+    conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting, bot_setting_file:str
 ):
     no_exit_if_incomplete = bot_setting["systemAbility"]["no_exit_if_incomplete"]
-    programmer_mode = bot_setting["programmerMode"]
     show_tool_results = bot_setting["showToolResults"]
-    opened_files = bot_setting["openedFiles"]
-    active_file = bot_setting["activeFile"]
-
+    
     start_new_stream = {
         "value": False
     }  # 当遇到AI准备执行JSON，即需要新信息的时候，用于强制停止当前stream，减少后续无效的tokens
@@ -171,7 +175,7 @@ async def handle_user_inputs(
         {
             "role": "user",
             "content": generate_user_task_prompt(
-                conversation_history, cwd, user_input, programmer_mode, active_file, opened_files
+                conversation_history, cwd, user_input, bot_setting_file
             ),
         }
     )

{pycoze-0.1.393.dist-info → pycoze-0.1.394.dist-info}/METADATA

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

{pycoze-0.1.393.dist-info → pycoze-0.1.394.dist-info}/RECORD

@@ -11,8 +11,8 @@ pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=4RGMwg2TjFERd-4LTIpQ6ilaRx4eP566KaQma2jg2O4,6296
-pycoze/bot/chat_base.py,sha256=wDPSGuIr4osM-LP0Np3TnNI1hsGWhtX0BE_RJupqUgU,10218
+pycoze/bot/chat.py,sha256=PGjW1_dzck_OU_YwGhr1xfQFz3gLiZnPC_Objx_IZ9E,6449
+pycoze/bot/chat_base.py,sha256=pAfvFqOJNC8a2pF28TeouI5HtTILyftzbnD8UJqaqxk,10317
 pycoze/bot/lib.py,sha256=WMVhyKFXvNoLrS2wvNOakIJXyUmVE6ujCV6XVDV0M6A,7213
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=YafQyrBhRGny_RrOWW0kk1IVf_MUxcdDH1dAh_-eHmM,13948
@@ -32,8 +32,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.393.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.393.dist-info/METADATA,sha256=5Yuivz2A3xItLwWrlFR9tfrKDzsmUirV37TVfeGT9mY,854
-pycoze-0.1.393.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.393.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.393.dist-info/RECORD,,
+pycoze-0.1.394.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.394.dist-info/METADATA,sha256=d9-r-wpNgk0aq0qsh8Onb5TF1or1kAH5YMH7CMAyxL0,854
+pycoze-0.1.394.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.394.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.394.dist-info/RECORD,,