better agent instructions, easier to understand for small models

Modules/Agent_Terminal.py

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 import os
 import sys
+import ast
 from io import StringIO
 from typing import Annotated
+import importlib.metadata
 
 import gradio as gr
 from ._docstrings import autodoc
@@ -21,6 +23,19 @@ from .Code_Interpreter import Code_Interpreter
 
 from app import _log_call_end, _log_call_start, _truncate_for_log
 
+def search_packages(query: str = "") -> str:
+    """Search for installed Python packages by name. If query is empty, lists all."""
+    packages = []
+    query = query.lower()
+    for dist in importlib.metadata.distributions():
+        name = dist.metadata['Name']
+        if query in name.lower():
+            packages.append(f"{name} ({dist.version})")
+    packages.sort()
+    if not packages:
+        return f"No packages found matching '{query}'."
+    return "\n".join(packages)
+
 def _get_tools_map():
     return {
         "Web_Fetch": Web_Fetch,
@@ -74,10 +89,7 @@ TOOL_SUMMARY = (
     "Executes Python code as the unified interface for the entire tools ecosystem. "
     "All tool interactions must happen through this code-execution gateway. "
     "Use Agent Terminal repeatedly whenever you need to chain or combine tool operations. "
-    "Available tools: `Web_Fetch`, `Web_Search`, `Code_Interpreter`, `Shell_Command`, `File_System`, `Obsidian_Vault`, `Memory_Manager`, `Generate_Speech`, `Generate_Image`, `Generate_Video`, `Deep_Research`. "
-    "Helpful commands: "
-    "`print(search_tools('query'))` to search for tools by name or capability; "
-    "`print(usage('ToolName'))` to inspect a tool’s expected input parameters."
+    "Available tools: `Web_Fetch`, `Web_Search`, `Code_Interpreter`, `Shell_Command`, `File_System`, `Obsidian_Vault`, `Memory_Manager`, `Generate_Speech`, `Generate_Image`, `Generate_Video`, `Deep_Research`."
 )
 
 
@@ -85,7 +97,14 @@ TOOL_SUMMARY = (
 @autodoc(
     summary=TOOL_SUMMARY,
 )
-def Agent_Terminal(code: Annotated[str, "Python source code to run; stdout is captured and returned."]) -> str:
+def Agent_Terminal(code: Annotated[str, (
+    "Python source code to run; stdout is captured and returned. "
+    "Execute these commands: "
+    "`search_tools('query')` to search for tools by name or capability; "
+    "`list_tools()` to list all available tools; "
+    "`usage('ToolName')` to inspect a tool’s expected input parameters; "
+    "`search_packages('query')` to search for installed Python libraries."
+)]) -> str:
     _log_call_start("Agent_Terminal", code=_truncate_for_log(code or "", 300))
     if code is None:
         result = "No code provided."
@@ -112,13 +131,31 @@ def Agent_Terminal(code: Annotated[str, "Python source code to run; stdout is ca
         "list_tools": list_tools,
         "search_tools": search_tools,
         "usage": usage,
+        "search_packages": search_packages,
         "print": print,  # Ensure print is available
         "__builtins__": __builtins__,
     }
     
     try:
         os.chdir(ROOT_DIR)
-        exec(code, tools_env)
+        
+        # Parse code to check if the last statement is an expression
+        tree = ast.parse(code)
+        if tree.body and isinstance(tree.body[-1], ast.Expr):
+            last_node = tree.body.pop()
+            
+            # Execute preceding statements
+            if tree.body:
+                exec(compile(tree, filename="<string>", mode="exec"), tools_env)
+            
+            # Evaluate and print the last expression
+            expr = compile(ast.Expression(last_node.value), filename="<string>", mode="eval")
+            result_val = eval(expr, tools_env)
+            if result_val is not None:
+                print(result_val)
+        else:
+            exec(code, tools_env)
+            
         result = redirected_output.getvalue()
     except Exception as exc:  # pylint: disable=broad-except
         result = str(exc)