SigmaFlow 0.0.74__tar.gz → 0.0.76__tar.gz

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SigmaFlow
-Version: 0.0.74
+Version: 0.0.76
 Summary: SigmaFlow is a Python package designed to optimize the performance of task-flow related to LLMs/MLLMs or Multi-agent
 Author-email: Kangkun Mao <maokangkun@pjlab.org.cn>
 License-Expression: MIT

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/SigmaFlow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SigmaFlow
-Version: 0.0.74
+Version: 0.0.76
 Summary: SigmaFlow is a Python package designed to optimize the performance of task-flow related to LLMs/MLLMs or Multi-agent
 Author-email: Kangkun Mao <maokangkun@pjlab.org.cn>
 License-Expression: MIT

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/sigmaflow/agent/agent.py

@@ -151,6 +151,7 @@ class Agent:
                                 tools=usable_tools,
                                 max_tokens=MAX_TOKENS,
                             )
+                            response.content = sorted(response.content, key=lambda x: 0 if x.type == "thinking" else 1)
                             info["cost_tokens"] += response.usage.input_tokens + response.usage.output_tokens
                             messages.append((m := {"role": "assistant", "content": response.content}))
                             info["messages"].append(m)
@@ -191,11 +192,11 @@ class Agent:
             match self.method:
                 case "anthropic":
                     if response.stop_reason != "tool_use":
-                        if 'qwen' in self.model.lower() and (t := response.content[0].text.strip()) and '<tool_call>' in t and '</tool_call>' in t:
+                        if 'qwen' in self.model.lower() and (t := response.content[-1].text.strip()) and '<tool_call>' in t and '</tool_call>' in t:
                             response.content = self._parse_to_anthropic_toolcall(t)
                             response.stop_reason = "tool_use"
                         else:
-                            for block in response.content[::-1]:
+                            for block in response.content:
                                 if block.type == "text":
                                     md = Markdown(block.text)
                                     print(f"{Prompt.Assistant}")
@@ -224,7 +225,7 @@ class Agent:
                         print(f"{Prompt.Assistant}[dim][italic]thinking[/]\n{r}[/]")
 
                     if not msg.tool_calls:
-                        if 'qwen' in self.model.lower() and msg.content and msg.content.startswith('<tool_call>') and msg.content.endswith('</tool_call>'):
+                        if 'qwen' in self.model.lower() and msg.content and '<tool_call>' in msg.content and msg.content.endswith('</tool_call>'):
                             msg.tool_calls = self._parse_to_openai_toolcall(msg.content)
                         elif 'intern' in self.model.lower() and msg.content and ('```tool' in msg.content or '"tool_calls": [' in msg.content):
                             msg.tool_calls = self._parse_intern_to_openai_toolcall(msg.content)
@@ -234,7 +235,7 @@ class Agent:
                             print(f"{Prompt.Tokens}inp: {response.usage.prompt_tokens}, out: {response.usage.completion_tokens}, time: {cost_time:.2f}s, {(response.usage.completion_tokens or 0) / cost_time:.2f} tokens/s, tools: {sum(not i[-1].startswith('Error:') for i in info['used_tools'])}/{len(info['used_tools'])}, skills: {sum(not i[-1].startswith('Error:') for i in info['used_skills'])}/{len(info['used_skills'])}")
                             break
                     else:
-                        if msg.content: print(f"{Prompt.Assistant}{msg.content}")
+                        if msg.content.strip(): print(f"{Prompt.Assistant}{msg.content}")
 
             results = []
             for block in response.content if self.method == 'anthropic' else msg.tool_calls:
@@ -288,6 +289,7 @@ class Agent:
                         info['used_skills'].append((inp.get('name'), output))
                     else:
                         info['used_tools'].append((func, inp, output))
+
             match self.method:
                 case "anthropic":
                     messages.append((m := {"role": "user", "content": results}))
@@ -295,6 +297,7 @@ class Agent:
                 case "openai":
                     messages.extend(results)
                     info["messages"].extend(results)
+
             cur_turn += 1
             if cur_turn == max_turn -1:
                 console.print(f"{Prompt.Warning}Max turn {max_turn} will be reached in the next turn, stopping to avoid infinite loop.")

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/sigmaflow/agent/cli.py

@@ -4,8 +4,8 @@ from .logo import print_logo
 from .input import session
 from .conf import *
 
-def cli(query, method='anthropic'):
-    agent = Agent(method)
+def cli(query, method='anthropic', available_tools=None):
+    agent = Agent(method, available_tools=available_tools)
 
     print_logo()
     agent.print_info()

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/sigmaflow/agent/conf.py

@@ -1,10 +1,12 @@
 import os
+import json
+import shutil
 from pathlib import Path
 from dotenv import load_dotenv
 from dataclasses import dataclass
 from typing import Dict, List, Any
 from prompt_toolkit.formatted_text import HTML
-load_dotenv(override=True)
+load_dotenv()
 
 class Prompt:
     # Version   = "[black on #cb7375]  VERSION  [/] "
@@ -51,6 +53,8 @@ KEEP_RECENT = 10000
 THRESHOLD = 5000000000
 RAG_ENDPOINT = os.getenv("RAG_ENDPOINT")
 
+CMD_TIMEOUT = 600
+
 VALID_MSG_TYPES = {
     "message",
     "broadcast",
@@ -59,18 +63,46 @@ VALID_MSG_TYPES = {
     "plan_approval_response",
 }
 
-SYSTEM = f"""You are a team lead and coding agent at {WORKDIR}.
-Use load_skill to access specialized knowledge before tackling unfamiliar topics. Use task tools to plan and track work. Use background_run for long-running commands. Spawn teammates and communicate via inboxes.
+GREP_TOOL_CANDIDATES = [
+    "rg",
+    "rga",
+    "grep",
+    "ag",
+    "ack",
+    "ug",
+    "pt",
+    "sift",
+]
+GREP_TOOL_DESCRIPTION = {
+    "rg": "ripgrep (rg) - A line-oriented search tool that recursively searches the current directory for a regex pattern. Known for its speed and efficiency.",
+    "rga": "ripgrep-all (rga) - An extension of ripgrep that supports searching within various file types, including PDFs, Word documents, and more.",
+    "grep": "GNU grep - A widely used command-line utility for searching plain-text data sets for lines that match a regular expression.",
+    "ag": "The Silver Searcher (ag) - A code-searching tool similar to ack, but faster. It ignores files in .gitignore and other VCS ignore files by default.",
+    "ack": "Ack - A tool like grep, optimized for programmers. It searches source code and ignores files that aren't likely to be relevant.",
+    "ug": "ugrep - An ultra-fast grep tool with additional features like context-aware search and support for various encodings.",
+    "pt": "The Platinum Searcher (pt) - A code search tool similar to ag, designed to be fast and user-friendly.",
+    "sift": "Sift - A fast and powerful alternative to grep, designed for searching codebases with support for various file types and encodings."
+}
+AVAILABLE_GREP_TOOLS = [tool for tool in GREP_TOOL_CANDIDATES if shutil.which(tool)]
 
-Skills available:
+SYSTEM = f"""You are a team lead and coding agent at {WORKDIR}.
+Use `task` tools to plan and track work. Use background_run for long-running commands. Spawn teammates and communicate via inboxes.
 """
 SUBAGENT_SYSTEM = f"""You are a coding subagent at {WORKDIR}. Complete the given task, then summarize your findings.
-
-Skills available:
 """
 
 
 CHILD_TOOLS = [
+    {
+        "name": "ls", 
+        "description": "List files in a directory.",
+        "input_schema": {
+            "type": "object", 
+            "properties": {
+                "param": {"type": "string", "description": "Directory path or ls parameters"}
+            }
+        }
+    },
     {
         "name": "bash", 
         "description": "Run a shell command.",
@@ -82,6 +114,25 @@ CHILD_TOOLS = [
             "required": ["command"]
         }
     },
+    {
+        "name": "grep",
+        "description": "Search text with an installed grep-like tool.",
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "tool": {
+                    "type": "string",
+                    "enum": AVAILABLE_GREP_TOOLS,
+                    "description": "The grep-like command to use.\n" + "\n".join([GREP_TOOL_DESCRIPTION[t] for t in AVAILABLE_GREP_TOOLS])
+                },
+                "args": {
+                    "type": "string",
+                    "description": "Arguments passed after the grep-like command, for example: -n \"pattern\" ."
+                }
+            },
+            "required": ["tool", "args"]
+        }
+    },
     {
         "name": "read_file", 
         "description": "Read file contents.",
@@ -327,7 +378,7 @@ HEADERS = {
 }
 
 MCP_CONF = {
-    "mcpServers": os.getenv("MCP_ENDPOINT", {})
+    "mcpServers": json.loads(os.getenv("MCP_ENDPOINT", "{}"))
 }
 
 API_ERRORS = [
@@ -374,4 +425,4 @@ class SLASH_CMD:
                 for item in attr_value:
                     if isinstance(item, str) and item.startswith('/'):
                         commands.append(item)
-        return commands
+        return commands

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/sigmaflow/agent/tools.py

@@ -1,4 +1,5 @@
 import re
+import shlex
 import yaml
 import time
 import json
@@ -9,6 +10,7 @@ import aiohttp
 import requests
 import threading
 import subprocess
+import shutil
 from rich import print
 from pathlib import Path
 from collections import defaultdict
@@ -22,20 +24,58 @@ def safe_path(p: str) -> Path:
         raise ValueError(f"Path escapes workspace: {p}")
     return path
 
+def run_ls(param: str) -> str:
+    command = f"ls {param}" if param else "ls"
+    try:
+        r = subprocess.run(command, shell=True, cwd=WORKDIR,
+                            capture_output=True, text=True, timeout=30)
+        out = (r.stdout + r.stderr).strip()
+        return out or "(no files)"
+    except Exception as e:
+        return f"Error: {e}"
+
 def run_bash(command: str) -> str:
     if command == "":
         return "Error: command cannot be empty"
-    timeout = 600
     dangerous = ["rm -rf /", "sudo", "shutdown", "reboot", "> /dev/"]
     if any(d in command for d in dangerous):
         return "Error: Dangerous command blocked"
     try:
         r = subprocess.run(command, shell=True, cwd=WORKDIR,
-                           capture_output=True, text=True, timeout=timeout)
+                           capture_output=True, text=True, timeout=CMD_TIMEOUT)
         out = (r.stdout + r.stderr).strip()
         return out or "(no output)"
     except subprocess.TimeoutExpired:
-        return f"Error: Timeout ({timeout}s)"
+        return f"Error: Timeout ({CMD_TIMEOUT}s)"
+    except Exception as e:
+        return f"Error: {e}"
+
+def run_grep(tool: str, args: str) -> str:
+    if not tool:
+        return f"Error: tool is required. Available: {', '.join(AVAILABLE_GREP_TOOLS) or '(none)'}"
+    if not args:
+        return "Error: args cannot be empty"
+    if tool not in AVAILABLE_GREP_TOOLS or not shutil.which(tool):
+        return f"Error: unavailable grep tool '{tool}'. Available: {', '.join(AVAILABLE_GREP_TOOLS) or '(none)'}"
+    try:
+        argv = shlex.split(args)
+        if argv[0] == tool: argv = argv[1:]
+    except ValueError as e:
+        return f"Error: failed to parse args: {e}"
+    if not argv:
+        return "Error: args cannot be empty"
+    try:
+        r = subprocess.run(
+            [tool, *argv],
+            cwd=WORKDIR,
+            capture_output=True,
+            text=True,
+            timeout=CMD_TIMEOUT,
+        )
+        out = (r.stdout + r.stderr).strip()
+        return (out or "(no matches)")[:50000]
+    except subprocess.TimeoutExpired:
+        return f"Error: Timeout ({CMD_TIMEOUT}s)"
     except Exception as e:
         return f"Error: {e}"
 
@@ -140,9 +180,11 @@ class SkillLoader:
         return meta, match.group(2).strip()
 
     def get_descriptions(self) -> str:
+        skill_prompt = f"Use `load_skill` to access specialized knowledge before tackling unfamiliar topics.\nSkills dir: {self.skills_dir}\nSkills available:\n"
+
         """Layer 1: short descriptions for the system prompt."""
         if not self.skills:
-            return "(no skills available)"
+            return skill_prompt + "(no skills available)"
         lines = []
         for name, skill in self.skills.items():
             desc = skill["meta"].get("description", "No description")
@@ -151,7 +193,7 @@ class SkillLoader:
             if tags:
                 line += f" [{tags}]"
             lines.append(line.strip())
-        return "\n".join(lines)
+        return skill_prompt + "\n".join(lines)
 
     def get_content(self, name: str) -> str:
         """Layer 2: full skill body returned in tool_result."""
@@ -577,6 +619,7 @@ class MCPClient:
 # -- The dispatch map: {tool_name: handler} --
 TOOL_HANDLERS = {
     "bash":       lambda **kw: run_bash(kw.get("command", "")),
+    "grep":       lambda **kw: run_grep(kw.get("tool", ""), kw.get("args", "")),
     "read_file":  lambda **kw: run_read(kw["path"], kw.get("limit")),
     "write_file": lambda **kw: run_write(kw["path"], kw.get("content", "")),
     "edit_file":  lambda **kw: run_edit(kw["path"], kw.get("old_text", ""), kw.get("new_text", "")),
@@ -594,6 +637,7 @@ TOOL_HANDLERS = {
     "read_inbox":      lambda **kw: json.dumps(BUS.read_inbox("lead"), indent=2),
     "broadcast":       lambda **kw: BUS.broadcast("lead", kw["content"], TEAM.member_names()),
     "rag":             lambda **kw: rag(kw.get("query", "")),
+    "ls":              lambda **kw: run_ls(kw.get("param", "")),
 }
 
 MCP = MCPClient()

{sigmaflow-0.0.74 → sigmaflow-0.0.76}/src/sigmaflow/cmd.py

@@ -76,6 +76,11 @@ def setup_args():
         default="anthropic",
         help="api interface",
     )
+    agent_parser.add_argument(
+        "--tool",
+        type=str,
+        help="specify tools to use (e.g. bash, read, etc.)",
+    )
 
     # env
     subparsers.add_parser('env', help='Environment mode')
@@ -184,7 +189,8 @@ def main():
             )
         case 'agent':
             from .agent import cli
-            cli(args.query, args.method)
+            tools = [t.strip() for t in args.tool.split(",")] if args.tool else None
+            cli(args.query, args.method, available_tools=tools)
         case _:
             pass