swarmauri_tool_skill_execution 0.11.0.dev5__tar.gz → 0.11.0.dev6__tar.gz

{swarmauri_tool_skill_execution-0.11.0.dev5 → swarmauri_tool_skill_execution-0.11.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarmauri_tool_skill_execution
-Version: 0.11.0.dev5
+Version: 0.11.0.dev6
 Summary: Skill-aware subprocess execution tool for Swarmauri agents.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -16,9 +16,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: swarmauri_base
-Requires-Dist: swarmauri_core
-Requires-Dist: swarmauri_standard
+Requires-Dist: swarmauri_base (>=0.11.0.dev6,<0.12)
+Requires-Dist: swarmauri_core (>=0.11.0.dev6,<0.12)
+Requires-Dist: swarmauri_standard (>=0.11.0.dev8,<0.12)
 Description-Content-Type: text/markdown
 
 # Swarmauri Skill Execution Tool

{swarmauri_tool_skill_execution-0.11.0.dev5 → swarmauri_tool_skill_execution-0.11.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "swarmauri_tool_skill_execution"
-version = "0.11.0.dev5"
+version = "0.11.0.dev6"
 description = "Skill-aware subprocess execution tool for Swarmauri agents."
 license = "Apache-2.0"
 readme = "README.md"
@@ -18,9 +18,9 @@ classifiers = [
 ]
 authors = [{ name = "Jacob Stewart", email = "jacob@swarmauri.com" }]
 dependencies = [
-    "swarmauri_core",
-    "swarmauri_base",
-    "swarmauri_standard",
+    "swarmauri_core>=0.11.0.dev6,<0.12",
+    "swarmauri_base>=0.11.0.dev6,<0.12",
+    "swarmauri_standard>=0.11.0.dev8,<0.12",
 ]
 keywords = ["swarmauri", "sdk", "standards", "skills", "tools", "subprocess"]
 

{swarmauri_tool_skill_execution-0.11.0.dev5 → swarmauri_tool_skill_execution-0.11.0.dev6}/swarmauri_tool_skill_execution/SkillExecutionTool.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
 import subprocess
+
+from swarmauri_base.processes.collect_process import collect_process
+from swarmauri_core.processes import IProcessBackend, ProcessRequest
 import time
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
@@ -63,6 +66,9 @@ class SkillExecutionTool(ToolBase):
         ]
     )
     skills: List[SubclassUnion[SkillBase]] = Field(default_factory=list)
+    backend: IProcessBackend | None = Field(default=None, exclude=True)
+    workspace: str | None = None
+    workspace_skill_roots: dict[str, str] = Field(default_factory=dict)
     default_timeout: float = 60.0
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
     type: Literal["SkillExecutionTool"] = "SkillExecutionTool"
@@ -91,6 +97,10 @@ class SkillExecutionTool(ToolBase):
     ) -> Dict[str, Any]:
         skill = self._get_skill(skill_name)
         root = self._skill_root(skill)
+        if self.backend is not None and self.workspace is not None:
+            process_root = self.workspace_skill_roots[skill.name]
+        else:
+            process_root = str(root)
         normalized_commands = self._normalize_commands(commands)
         effective_timeout = (
             timeout if timeout is not None else self.default_timeout
@@ -103,14 +113,16 @@ class SkillExecutionTool(ToolBase):
                 results = list(
                     pool.map(
                         lambda argv: self._run_command(
-                            argv, root, input_text, effective_timeout
+                            argv, process_root, input_text, effective_timeout
                         ),
                         normalized_commands,
                     )
                 )
         else:
             results = [
-                self._run_command(argv, root, input_text, effective_timeout)
+                self._run_command(
+                    argv, process_root, input_text, effective_timeout
+                )
                 for argv in normalized_commands
             ]
 
@@ -158,15 +170,35 @@ class SkillExecutionTool(ToolBase):
                 raise ValueError("Each command must be a non-empty argv array")
         return normalized
 
-    @staticmethod
     def _run_command(
+        self,
         argv: List[str],
-        root: Path,
+        root: str,
         input_text: str | None,
         timeout: float,
     ) -> Dict[str, Any]:
         started = time.perf_counter()
         try:
+            if self.backend is not None:
+                stdout_bytes, stderr_bytes, event = collect_process(
+                    self.backend,
+                    ProcessRequest(
+                        tuple(argv),
+                        cwd=root,
+                        workspace=self.workspace,
+                        timeout=timeout,
+                    ),
+                    (input_text or "").encode(),
+                )
+                return {
+                    "argv": argv,
+                    "exit_code": "timeout"
+                    if event.outcome == "timed_out"
+                    else event.exit_code,
+                    "stdout": stdout_bytes.decode(errors="replace"),
+                    "stderr": stderr_bytes.decode(errors="replace"),
+                    "duration_ms": int((time.perf_counter() - started) * 1000),
+                }
             completed = subprocess.run(
                 argv,
                 cwd=root,