pycoze 0.1.342__py3-none-any.whl → 0.1.344__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -244,7 +244,6 @@ async def handle_user_inputs(
                         {"role": "assistant", "content": assistant_content}
                     )
                     if tool_name in ["complete_all_tasks", "ask_follow_up_question"]:
-                        print("need_break", need_break)
                         need_break = True
                         break
                     else:

pycoze/bot/tools.py

@@ -53,7 +53,7 @@ class ExecuteCommandTool(Tool):
                 shell=True,
                 capture_output=True,
                 text=True,
-                cwd=self.cwd
+                cwd=self.cwd,
             )
             if result.returncode != 0:
                 raise subprocess.CalledProcessError(
@@ -73,7 +73,9 @@ class ReadFileTool(Tool):
     """读取文件工具"""
 
     def validate(self) -> bool:
-        return "path" in self.params and os.path.exists(resolve_relative_path(self.cwd, self.params["path"]))
+        return "path" in self.params and os.path.exists(
+            resolve_relative_path(self.cwd, self.params["path"])
+        )
 
     def execute(self) -> str:
         path = resolve_relative_path(self.cwd, self.params["path"])
@@ -196,13 +198,15 @@ class WebAccessTool(Tool):
         try:
             content = web.get_simplified_webpage(url)[: 32 * 1024]
             result = ai.chat(
-                [{
-                    "role": "user",
-                    "content": f"""Please answer user question based on web page content. The user's question is:
+                [
+                    {
+                        "role": "user",
+                        "content": f"""Please answer user question based on web page content. The user's question is:
 {question}
 Web page content is:
-{content}"""
-                }],
+{content}""",
+                    }
+                ],
             )
             return f"Web page access completed, result is: {result}"
         except Exception as e:
@@ -214,10 +218,10 @@ class AskFollowUpQuestionTool(Tool):
     """询问后续问题工具"""
 
     def validate(self) -> bool:
-        return 'question' in self.params
+        return "question" in self.params
 
     def execute(self) -> str:
-        info("assistant", self.params['question'])
+        info("assistant", self.params["question"])
         return f"Asked user: {self.params['question']}, Waiting for user replied.\n\n"
 
 
@@ -225,13 +229,25 @@ class AttemptTaskCompletionTool(Tool):
     """完成所有任务工具"""
 
     def validate(self) -> bool:
-        return 'result' in self.params
+        return "result" in self.params
 
     def execute(self) -> str:
-        result = self.params['result']
-        info("assistant", 'Completed:' + result + "\n")
-        if 'command' in self.params:
-            result = subprocess.run(self.params['command'], shell=True, capture_output=True, text=True, cwd=self.cwd)
+        result = self.params["result"]
+        info("assistant", "Completed:" + result + "\n")
+        if (
+            "command" in self.params
+            and self.params["command"] is not None
+            and type(self.params["command"]) == str
+            and len(type(self.params["command"])) > 0
+        ):
+            print("run command")
+            result = subprocess.run(
+                self.params["command"],
+                shell=True,
+                capture_output=True,
+                text=True,
+                cwd=self.cwd,
+            )
             return f"Task completed: {result}, executed command: {self.params['command']}, execution result: {result.stdout + result.stderr}"
         else:
             return f"Task completed: {result}"
@@ -249,12 +265,12 @@ class ToolExecutor:
         "search_files": SearchFilesTool,
         "list_files": ListFilesTool,
         "access_webpage": WebAccessTool,
-        'ask_follow_up_question': AskFollowUpQuestionTool,
-        'complete_all_tasks': AttemptTaskCompletionTool,
+        "ask_follow_up_question": AskFollowUpQuestionTool,
+        "complete_all_tasks": AttemptTaskCompletionTool,
     }
 
     @classmethod
-    def execute_tool(cls, cwd:str, tool_request, abilities) -> Tuple[bool, bool, any]:
+    def execute_tool(cls, cwd: str, tool_request, abilities) -> Tuple[bool, bool, any]:
         """执行工具"""
         try:
             tool_name = list(tool_request.keys())[0]
@@ -274,9 +290,13 @@ class ToolExecutor:
                     result = json.dumps(result, indent=4, ensure_ascii=False)
                 except:
                     return True, False, str(result)
-                return True, True,str(result)
+                return True, True, str(result)
             else:
-                return False, False, f"Unknown tool: {tool_name}, the first key of output json ({tool_name}) will be recognized as a tool, so do not output other json except for executing tools."
+                return (
+                    False,
+                    False,
+                    f"Unknown tool: {tool_name}, the first key of output json ({tool_name}) will be recognized as a tool, so do not output other json except for executing tools.",
+                )
             tool = tool_class(params, cwd)
             if not tool.validate():
                 return False, False, "Tool parameter validation failed."

{pycoze-0.1.342.dist-info → pycoze-0.1.344.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.342
+Version: 0.1.344
 Summary: Package for pycoze only!
 Home-page: UNKNOWN
 Author: Yuan Jie Xiong

{pycoze-0.1.342.dist-info → pycoze-0.1.344.dist-info}/RECORD

@@ -13,11 +13,11 @@ 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=d7rsp_E1woC8UFBsqPExicNfwMHAB0e50vsodL8ISGA,9722
+pycoze/bot/chat_base.py,sha256=ll9ulBPfKtsrJYLqBsrgaFKU7WjIPRDa-LjwCS6xM_M,9666
 pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
 pycoze/bot/prompt.md,sha256=OBxwUY6yiwEmusnUHhwixWYByrWX3BpwfxG_Gfas8UM,15783
-pycoze/bot/tools.py,sha256=23iDk0_myJcQDOErKm4LRGr1Foane1n_RNNKJPAmgdY,9953
+pycoze/bot/tools.py,sha256=twKBmaWiVB8kwEpSn50YsUN8ghwhi7pWrlPQZYPy_14,10419
 pycoze/reference/__init__.py,sha256=zgqGqvmA9HaqytEM33B6vi0kQVk8IiCwJaXa22xsFz8,114
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
 pycoze/reference/lib.py,sha256=T-oBOKxkus5dTouc0oDgfRzUyi6aTyY-FF4yX7SzF5M,3755
@@ -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.342.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.342.dist-info/METADATA,sha256=n0QSg_AqHoz9DnUvyQOYb6qErvMiKX1lcq4mAWjLfwo,755
-pycoze-0.1.342.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-pycoze-0.1.342.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.342.dist-info/RECORD,,
+pycoze-0.1.344.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.344.dist-info/METADATA,sha256=8QzoWSDoddsmCYZZrABnfy2I8Axhj5QxHe6po9J7Q40,755
+pycoze-0.1.344.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+pycoze-0.1.344.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.344.dist-info/RECORD,,