chore: cleanup

Author: phil65

src/llmling_agent/prompts/builtin_provider.py

@@ -22,12 +22,8 @@ class BuiltinPromptProvider(BasePromptProvider):
     def __init__(self, manifest_prompts: dict[str, SystemPrompt]):
         from jinjarope import Environment
 
-        from llmling_agent_functional.run import run_agent, run_agent_sync
-
         self.prompts = manifest_prompts
         self.env = Environment(autoescape=False, enable_async=True)
-        self.env.globals["run_agent"] = run_agent
-        self.env.globals["run_agent_sync"] = run_agent_sync
 
     async def get_prompt(
         self,

src/llmling_agent/tools/manager.py

@@ -159,22 +159,10 @@ def _validate_item(self, item: Tool | ToolType | dict[str, Any]) -> Tool:
                 return Tool.from_callable(item)
             case Callable():
                 return Tool.from_callable(item)
-            case {"callable": callable_item, **config} if callable(
-                callable_item
-            ) or isinstance(callable_item, LLMCallableTool):
-                # First convert callable to LLMCallableTool if needed
-                tool = (
-                    callable_item
-                    if isinstance(callable_item, LLMCallableTool)
-                    else LLMCallableTool.from_callable(callable_item)
-                )
-
-                # Get valid fields from Tool dataclass (excluding 'callable')
+            case {"callable": callable_item, **config} if callable(callable_item):
                 valid_keys = {f.name for f in fields(Tool)} - {"callable"}
                 tool_config = {k: v for k, v in config.items() if k in valid_keys}
-
-                return Tool(callable=tool, **tool_config)  # type: ignore
-
+                return Tool.from_callable(callable_item, **tool_config)  # type: ignore
             case _:
                 typ = type(item)
                 msg = f"Item must be Tool or callable. Got {typ}"

src/llmling_agent_cli/history.py

@@ -187,10 +187,8 @@ def reset_history(
             if input(msg).lower() != "y":
                 print("Operation cancelled.")
                 return
-
-        conv_count, msg_count = provider.run_task_sync(
-            provider.reset(agent_name=agent_name, hard=hard)
-        )
+        coro = provider.reset(agent_name=agent_name, hard=hard)
+        conv_count, msg_count = provider.run_task_sync(coro)
 
         what = f" for {agent_name}" if agent_name else ""
         print(f"Deleted {conv_count} conversations and {msg_count} messages{what}.")