beswarm 0.2.82__py3-none-any.whl → 0.2.84__py3-none-any.whl

beswarm/prompt.py

@@ -1,4 +1,34 @@
-worker_system_prompt = """
+import os
+import platform
+from datetime import datetime
+from typing import Optional, Union, Callable
+
+from .aient.aient.architext.architext import (
+   Messages, SystemMessage, UserMessage, AssistantMessage, ToolCalls, ToolResults, Texts, RoleMessage, Images, Files, Tools
+)
+from .core import kgm
+
+class Goal(Texts):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "goal"):
+        super().__init__(text=text, name=name)
+
+    async def render(self) -> Optional[str]:
+        content = await super().render()
+        if content is None:
+            return None
+        return f"<goal>{content}</goal>"
+
+class KnowledgeGraph(Texts):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "knowledge_graph"):
+        super().__init__(text=text, name=name)
+
+    async def render(self) -> Optional[str]:
+        content = await super().render()
+        if content is None:
+            return None
+        return f"<knowledge_graph>{content}</knowledge_graph>"
+
+worker_system_prompt = SystemMessage(f"""
 <communication>
 1. Format your responses in markdown. Use backticks to format file, directory, function, and class names.
 2. Your message **must** end with [done] to signify the end of your output.
@@ -34,10 +64,10 @@ When making code changes, NEVER output code to the USER, unless requested. Inste
 </calling_external_apis>
 
 <user_info>
-The user's OS version is {os_version}. The absolute path of the user's workspace is {workspace_path} which is also the project root directory. The user's shell is {shell}.
+The user's OS version is {Texts(lambda: platform.platform())}. The absolute path of the user's workspace is {Texts(name="workspace_path")} which is also the project root directory. The user's shell is {Texts(lambda: os.getenv('SHELL', 'Unknown'))}.
 请在指令中使用绝对路径。所有操作必须基于工作目录。禁止在工作目录之外进行任何操作。你当前运行目录不一定就是工作目录。禁止默认你当前就在工作目录。
 
-当前时间：{current_time}
+当前时间：{Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
 </user_info>
 
 <instructions for tool use>
@@ -92,12 +122,10 @@ Always adhere to this format for all tool uses to ensure proper parsing and exec
 
 You can use tools as follows:
 
-<tools>
-{tools_list}
-</tools>
-"""
+{Tools()}
+""")
 
-instruction_system_prompt = """
+instruction_system_prompt = SystemMessage(f"""
 你是一个指令生成器，负责指导另一个智能体完成任务。
 你需要分析工作智能体的对话历史，并生成下一步指令。
 根据任务目标和当前进度，提供清晰明确的指令。
@@ -106,11 +134,11 @@ instruction_system_prompt = """
 
 你需要称呼工作智能体为"你"，指令禁止使用疑问句，必须使用祈使句。
 所有回复必须使用中文。
-运行工作智能体的系统信息：{os_version}
-你的工作目录为：{workspace_path}，请在指令中使用绝对路径。所有操作必须基于工作目录。
+运行工作智能体的系统信息：{Texts(lambda: platform.platform())}
+你的工作目录为：{Texts(name="workspace_path")}，请在指令中使用绝对路径。所有操作必须基于工作目录。
 除了任务目标里面明确提到的目录，禁止在工作目录之外进行任何操作。你当前运行目录不一定就是工作目录。禁止默认你当前就在工作目录。
 
-当前时间：{current_time}
+当前时间：{Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
 
 你的输出必须符合以下步骤，以生成最终指令：
 
@@ -212,13 +240,12 @@ git clone https://github.com/username/project-name.git
 </excute_command>
 
 工作智能体仅可以使用如下工具：
-<tools>
-{tools_list}
-</tools>
+{Tools()}
 
-<work_agent_conversation_start>
-"""
+{Files()}
 
+{KnowledgeGraph(name="knowledge_graph", text=lambda: kgm.render_tree())}
+<work_agent_conversation_start>""")
 
 definition = """
 1. 输入分析
@@ -408,4 +435,4 @@ The user's OS version is win32 10.0.22631. The absolute path of the user's works
 <tools>
 [{"type": "function", "function": {"name": "codebase_search", "description": "Find snippets of code from the codebase most relevant to the search query.\nThis is a semantic search tool, so the query should ask for something semantically matching what is needed.\nIf it makes sense to only search in particular directories, please specify them in the target_directories field.\nUnless there is a clear reason to use your own search query, please just reuse the user's exact query with their wording.\nTheir exact wording/phrasing can often be helpful for the semantic search query. Keeping the same exact question format can also be helpful.", "parameters": {"type": "object", "properties": {"query": {"type": "string", "description": "The search query to find relevant code. You should reuse the user's exact query/most recent message with their wording unless there is a clear reason not to."}, "target_directories": {"type": "array", "items": {"type": "string"}, "description": "Glob patterns for directories to search over"}, "explanation": {"type": "string", "description": "One sentence explanation as to why this tool is being used, and how it contributes to the goal."}}, "required": ["query"]}}}, {"type": "function", "function": {"name": "read_file", "description": "Read the contents of a file. the output of this tool call will be the 1-indexed file contents from start_line_one_indexed to end_line_one_indexed_inclusive, together with a summary of the lines outside start_line_one_indexed and end_line_one_indexed_inclusive.\nNote that this call can view at most 250 lines at a time.\n\nWhen using this tool to gather information, it's your responsibility to ensure you have the COMPLETE context. Specifically, each time you call this command you should:\n1) Assess if the contents you viewed are sufficient to proceed with your task.\n2) Take note of where there are lines not shown.\n3) If the file contents you have viewed are insufficient, and you suspect they may be in lines not shown, proactively call the tool again to view those lines.\n4) When in doubt, call this tool again to gather more information. Remember that partial file views may miss critical dependencies, imports, or functionality.\n\nIn some cases, if reading a range of lines is not enough, you may choose to read the entire file.\nReading entire files is often wasteful and slow, especially for large files (i.e. more than a few hundred lines). So you should use this option sparingly.\nReading the entire file is not allowed in most cases. You are only allowed to read the entire file if it has been edited or manually attached to the conversation by the user.", "parameters": {"type": "object", "properties": {"relative_workspace_path": {"type": "string", "description": "The path of the file to read, relative to the workspace root."}, "should_read_entire_file": {"type": "boolean", "description": "Whether to read the entire file. Defaults to false."}, "start_line_one_indexed": {"type": "integer", "description": "The one-indexed line number to start reading from (inclusive)."}, "end_line_one_indexed_inclusive": {"type": "integer", "description": "The one-indexed line number to end reading at (inclusive)."}, "explanation": {"type": "string", "description": "One sentence explanation as to why this tool is being used, and how it contributes to the goal."}}, "required": ["relative_workspace_path", "should_read_entire_file", "start_line_one_indexed", "end_line_one_indexed_inclusive"]}}}, {"type": "function", "function": {"name": "run_terminal_cmd", "description": "Propose a command to run on behalf of the user.\nThe user may reject it if it is not to their liking, or may modify the command before approving it. If they do change it, take those changes into account.\nThe actual command will not execute until the user approves it. The user may not approve it immediately. Do not assume the command has started running.\nIf the step is waiting for user approval, it has not started running.\nAdhere to the following guidelines:\n1. Based on the contents of the conversation, you will be told if you are in the same shell as a previous step or a different shell.\n2. If in a new shell, you should `cd` to the appropriate directory and do necessary setup in addition to running the command.\n3. If in the same shell, the state will persist (eg. if you cd in one step, that cwd is persisted next time you invoke this tool).\n4. For ANY commands that would use a pager or require user interaction, you should append ` | cat` to the command (or whatever is appropriate). Otherwise, the command will break. You MUST do this for: git, less, head, tail, more, etc.\n5. For commands that are long running/expected to run indefinitely until interruption, please run them in the background. To run jobs in the background, set `is_background` to true rather than changing the details of the command.\n6. Dont include any newlines in the command.", "parameters": {"type": "object", "properties": {"command": {"type": "string", "description": "The terminal command to execute"}, "is_background": {"type": "boolean", "description": "Whether the command should be run in the background"}, "explanation": {"type": "string", "description": "One sentence explanation as to why this command needs to be run and how it contributes to the goal."}, "require_user_approval": {"type": "boolean", "description": "Whether the user must approve the command before it is executed. Only set this to false if the command is safe and if it matches the user's requirements for commands that should be executed automatically."}}, "required": ["command", "is_background", "require_user_approval"]}}}, {"type": "function", "function": {"name": "list_dir", "description": "List the contents of a directory.", "parameters": {"type": "object", "properties": {"relative_workspace_path": {"type": "string", "description": "Path to list contents of, relative to the workspace root."}, "explanation": {"type": "string", "description": "One sentence explanation as to why this tool is being used, and how it contributes to the goal."}}, "required": ["relative_workspace_path"]}}}, {"type": "function", "function": {"name": "grep_search", "description": "Fast text-based regex search that finds exact pattern matches within files or directories, utilizing the ripgrep command for efficient searching.\nTo avoid overwhelming output, the results are capped at 50 matches.\nUse the include or exclude patterns to filter the search scope by file type or specific paths.\nThis is best for finding exact text matches or regex patterns. This is preferred over semantic search when we know the exact symbol/function name/etc. to search in some set of directories/file types.", "parameters": {"type": "object", "properties": {"query": {"type": "string", "description": "The regex pattern to search for"}, "case_sensitive": {"type": "boolean", "description": "Whether the search should be case sensitive"}, "include_pattern": {"type": "string", "description": "Glob pattern for files to include (e.g. '*.ts' for TypeScript files)"}, "exclude_pattern": {"type": "string", "description": "Glob pattern for files to exclude"}, "explanation": {"type": "string", "description": "One sentence explanation as to why this tool is being used, and how it contributes to the goal."}}, "required": ["query"]}}}, {"type": "function", "function": {"name": "edit_file", "description": "Use this tool to propose an edit to an existing file.\n\nThis will be read by a less intelligent model, which will quickly apply the edit. You should make it clear what the edit is, while also minimizing the unchanged code you write.\nWhen writing the edit, you should specify each edit in sequence, with the special comment `// ... existing code ...` to represent unchanged code in between edited lines.\n\nFor example:\n\n```\n// ... existing code ...\nFIRST_EDIT\n// ... existing code ...\nSECOND_EDIT\n// ... existing code ...\nTHIRD_EDIT\n// ... existing code ...\n```\n\nYou should still bias towards repeating as few lines of the original file as possible to convey the change.\nBut, each edit should contain sufficient context of unchanged lines around the code you're editing to resolve ambiguity.\nDO NOT omit spans of pre-existing code (or comments) without using the `// ... existing code ...` comment to indicate its absence. If you omit the existing code comment, the model may inadvertently delete these lines.\nMake sure it is clear what the edit should be, and where it should be applied.\n\nYou should specify the following arguments before the others: [target_file]", "parameters": {"type": "object", "properties": {"target_file": {"type": "string", "description": "The target file to modify. Always specify the target file as the first argument and use the relative path in the workspace of the file to edit"}, "instructions": {"type": "string", "description": "A single sentence instruction describing what you am going to do for the sketched edit. This is used to assist the less intelligent model in applying the edit. Please use the first person to describe what you am going to do. Dont repeat what you have said previously in normal messages. And use it to disambiguate uncertainty in the edit."}, "code_edit": {"type": "string", "description": "Specify ONLY the precise lines of code that you wish to edit. **NEVER specify or write out unchanged code**. Instead, represent all unchanged code using the comment of the language you're editing in - example: `// ... existing code ...`"}}, "required": ["target_file", "instructions", "code_edit"]}}}, {"type": "function", "function": {"name": "delete_file", "description": "Deletes a file at the specified path. The operation will fail gracefully if:\n - The file doesn't exist\n - The operation is rejected for security reasons\n - The file cannot be deleted", "parameters": {"type": "object", "properties": {"target_file": {"type": "string", "description": "The path of the file to delete, relative to the workspace root."}, "explanation": {"type": "string", "description": "One sentence explanation as to why this tool is being used, and how it contributes to the goal."}}, "required": ["target_file"]}}}]
 </tools>
-"""
+"""

{beswarm-0.2.82.dist-info → beswarm-0.2.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.82
+Version: 0.2.84
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.2.82.dist-info → beswarm-0.2.84.dist-info}/RECORD

@@ -2,16 +2,16 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
 beswarm/core.py,sha256=jKStpTTOu6Ojond_i-okTZLrvSAJ4yUoTZwtDfFTiRs,553
 beswarm/knowledge_graph.py,sha256=oiOMknAJzGrOHc2AyQgvrCcZAkGLhFnsnvSBdfFBWMw,14831
-beswarm/prompt.py,sha256=qlH-yYCGv9j9-5grnMXl0B53CDZgfTpe4ncwBwgWg7o,32816
+beswarm/prompt.py,sha256=MCv9H20-2l7acG4lNuPRFJ8MO2-WTKwXL5GqyLT_Ns8,34131
 beswarm/taskmanager.py,sha256=vMmcoZ4FlNvjEliRkv3AniPji50NcY4Q1_2HETzR0DU,12226
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=d5j0tX0-CNtwisqIJep8K3rXPgsLqROq3nWyq8qtqw0,21001
+beswarm/agents/planact.py,sha256=3Fu1fd7byZ1_wsK1KntMSfU-BnMgn5mjHLGnX59yGIs,18205
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-beswarm/aient/aient/architext/architext/core.py,sha256=i8UGEwoAS7Cwat3wB-jU8EC23gSwAXjFiwEc8QknE-k,17875
+beswarm/aient/aient/architext/architext/core.py,sha256=lMXqjpSr7J80xuuWv5IHy04kcHbTwHWtRoIcsr6MR3o,28433
 beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-beswarm/aient/aient/architext/test/test.py,sha256=CeFyloj-RJRk8hr6QDLjnRETG-KylD2bo3MVq5GVKPA,40597
+beswarm/aient/aient/architext/test/test.py,sha256=XOSbDD-hlBnZiu5-500T-sy0m61zsq2SqQgFIoK6TJ0,61137
 beswarm/aient/aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 beswarm/aient/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -26,7 +26,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=EqvIcB6R_JGmvD5kEfR1ZRQYLfyGpmy4PvfRx8hMIKE,42019
+beswarm/aient/aient/models/chatgpt.py,sha256=Krs9Fk07XmYiiRFrCuhh_tiQWcUUdJT2dh0Ei6zRhmo,42214
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -121,7 +121,7 @@ beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,1
 beswarm/tools/subtasks.py,sha256=4wJWNAqRFgvwmDOP12SddYo_OteWBU5cLhLBh6xILk8,10492
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.82.dist-info/METADATA,sha256=kvRhwbSZxAC17S180fQp-ZNxIe3DXe1Jns4jdaRgJ5Q,3878
-beswarm-0.2.82.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.82.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.82.dist-info/RECORD,,
+beswarm-0.2.84.dist-info/METADATA,sha256=oR7SqoL_8n3XFE6iEAwM48IunLOuRd21e96xD_HIr70,3878
+beswarm-0.2.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.84.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.84.dist-info/RECORD,,